Avoid unnecessary key clearing operations
[mech_eap.git] / wpa_supplicant / driver_i.h
index 2f57af4..0691b6c 100644 (file)
@@ -2,14 +2,8 @@
  * wpa_supplicant - Internal driver interface wrappers
  * Copyright (c) 2003-2009, Jouni Malinen <j@w1.fi>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * Alternatively, this software may be distributed under the terms of BSD
- * license.
- *
- * See README and COPYING for more details.
+ * This software may be distributed under the terms of the BSD license.
+ * See README for more details.
  */
 
 #ifndef DRIVER_I_H
@@ -79,6 +73,23 @@ static inline int wpa_drv_scan(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
+static inline int wpa_drv_sched_scan(struct wpa_supplicant *wpa_s,
+                                    struct wpa_driver_scan_params *params,
+                                    u32 interval)
+{
+       if (wpa_s->driver->sched_scan)
+               return wpa_s->driver->sched_scan(wpa_s->drv_priv,
+                                                params, interval);
+       return -1;
+}
+
+static inline int wpa_drv_stop_sched_scan(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->stop_sched_scan)
+               return wpa_s->driver->stop_sched_scan(wpa_s->drv_priv);
+       return -1;
+}
+
 static inline struct wpa_scan_results * wpa_drv_get_scan_results2(
        struct wpa_supplicant *wpa_s)
 {
@@ -106,11 +117,16 @@ static inline int wpa_drv_get_ssid(struct wpa_supplicant *wpa_s, u8 *ssid)
 static inline int wpa_drv_set_key(struct wpa_supplicant *wpa_s,
                                  enum wpa_alg alg, const u8 *addr,
                                  int key_idx, int set_tx,
-                                  const u8 *seq, size_t seq_len,
-                                  const u8 *key, size_t key_len)
-{
+                                 const u8 *seq, size_t seq_len,
+                                 const u8 *key, size_t key_len)
+{
+       if (alg != WPA_ALG_NONE) {
+               if (key_idx >= 0 && key_idx <= 6)
+                       wpa_s->keys_cleared &= ~BIT(key_idx);
+               else
+                       wpa_s->keys_cleared = 0;
+       }
        if (wpa_s->driver->set_key) {
-               wpa_s->keys_cleared = 0;
                return wpa_s->driver->set_key(wpa_s->ifname, wpa_s->drv_priv,
                                              alg, addr, key_idx, set_tx,
                                              seq, seq_len, key, key_len);
@@ -118,22 +134,23 @@ static inline int wpa_drv_set_key(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_deauthenticate(struct wpa_supplicant *wpa_s,
-                                        const u8 *addr, int reason_code)
+static inline int wpa_drv_sta_deauth(struct wpa_supplicant *wpa_s,
+                                    const u8 *addr, int reason_code)
 {
-       if (wpa_s->driver->deauthenticate) {
-               return wpa_s->driver->deauthenticate(wpa_s->drv_priv, addr,
-                                                    reason_code);
+       if (wpa_s->driver->sta_deauth) {
+               return wpa_s->driver->sta_deauth(wpa_s->drv_priv,
+                                                wpa_s->own_addr, addr,
+                                                reason_code);
        }
        return -1;
 }
 
-static inline int wpa_drv_disassociate(struct wpa_supplicant *wpa_s,
-                                      const u8 *addr, int reason_code)
+static inline int wpa_drv_deauthenticate(struct wpa_supplicant *wpa_s,
+                                        const u8 *addr, int reason_code)
 {
-       if (wpa_s->driver->disassociate) {
-               return wpa_s->driver->disassociate(wpa_s->drv_priv, addr,
-                                                  reason_code);
+       if (wpa_s->driver->deauthenticate) {
+               return wpa_s->driver->deauthenticate(wpa_s->drv_priv, addr,
+                                                    reason_code);
        }
        return -1;
 }
@@ -236,35 +253,6 @@ wpa_drv_get_hw_feature_data(struct wpa_supplicant *wpa_s, u16 *num_modes,
        return NULL;
 }
 
-static inline int wpa_drv_set_channel(struct wpa_supplicant *wpa_s,
-                                     enum hostapd_hw_mode phymode, int chan,
-                                     int freq)
-{
-       if (wpa_s->driver->set_channel)
-               return wpa_s->driver->set_channel(wpa_s->drv_priv, phymode,
-                                                 chan, freq);
-       return -1;
-}
-
-static inline int wpa_drv_set_ssid(struct wpa_supplicant *wpa_s,
-                                  const u8 *ssid, size_t ssid_len)
-{
-       if (wpa_s->driver->set_ssid) {
-               return wpa_s->driver->set_ssid(wpa_s->drv_priv, ssid,
-                                              ssid_len);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_set_bssid(struct wpa_supplicant *wpa_s,
-                                   const u8 *bssid)
-{
-       if (wpa_s->driver->set_bssid) {
-               return wpa_s->driver->set_bssid(wpa_s->drv_priv, bssid);
-       }
-       return -1;
-}
-
 static inline int wpa_drv_set_country(struct wpa_supplicant *wpa_s,
                                      const char *alpha2)
 {
@@ -274,29 +262,11 @@ static inline int wpa_drv_set_country(struct wpa_supplicant *wpa_s,
 }
 
 static inline int wpa_drv_send_mlme(struct wpa_supplicant *wpa_s,
-                                   const u8 *data, size_t data_len)
+                                   const u8 *data, size_t data_len, int noack)
 {
        if (wpa_s->driver->send_mlme)
                return wpa_s->driver->send_mlme(wpa_s->drv_priv,
-                                               data, data_len);
-       return -1;
-}
-
-static inline int wpa_drv_mlme_add_sta(struct wpa_supplicant *wpa_s,
-                                      const u8 *addr, const u8 *supp_rates,
-                                      size_t supp_rates_len)
-{
-       if (wpa_s->driver->mlme_add_sta)
-               return wpa_s->driver->mlme_add_sta(wpa_s->drv_priv, addr,
-                                                  supp_rates, supp_rates_len);
-       return -1;
-}
-
-static inline int wpa_drv_mlme_remove_sta(struct wpa_supplicant *wpa_s,
-                                         const u8 *addr)
-{
-       if (wpa_s->driver->mlme_remove_sta)
-               return wpa_s->driver->mlme_remove_sta(wpa_s->drv_priv, addr);
+                                               data, data_len, noack);
        return -1;
 }
 
@@ -320,15 +290,11 @@ static inline int wpa_drv_send_ft_action(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_set_beacon(struct wpa_supplicant *wpa_s,
-                                    const u8 *head, size_t head_len,
-                                    const u8 *tail, size_t tail_len,
-                                    int dtim_period, int beacon_int)
+static inline int wpa_drv_set_ap(struct wpa_supplicant *wpa_s,
+                                struct wpa_driver_ap_params *params)
 {
-       if (wpa_s->driver->set_beacon)
-               return wpa_s->driver->set_beacon(wpa_s->drv_priv, head,
-                                                head_len, tail, tail_len,
-                                                dtim_period, beacon_int);
+       if (wpa_s->driver->set_ap)
+               return wpa_s->driver->set_ap(wpa_s->drv_priv, params);
        return -1;
 }
 
@@ -351,12 +317,12 @@ static inline int wpa_drv_sta_remove(struct wpa_supplicant *wpa_s,
 static inline int wpa_drv_hapd_send_eapol(struct wpa_supplicant *wpa_s,
                                          const u8 *addr, const u8 *data,
                                          size_t data_len, int encrypt,
-                                         const u8 *own_addr)
+                                         const u8 *own_addr, u32 flags)
 {
        if (wpa_s->driver->hapd_send_eapol)
                return wpa_s->driver->hapd_send_eapol(wpa_s->drv_priv, addr,
                                                      data, data_len, encrypt,
-                                                     own_addr);
+                                                     own_addr, flags);
        return -1;
 }
 
@@ -386,12 +352,13 @@ static inline int wpa_drv_send_action(struct wpa_supplicant *wpa_s,
                                      unsigned int wait,
                                      const u8 *dst, const u8 *src,
                                      const u8 *bssid,
-                                     const u8 *data, size_t data_len)
+                                     const u8 *data, size_t data_len,
+                                     int no_cck)
 {
        if (wpa_s->driver->send_action)
                return wpa_s->driver->send_action(wpa_s->drv_priv, freq,
                                                  wait, dst, src, bssid,
-                                                 data, data_len);
+                                                 data, data_len, no_cck);
        return -1;
 }
 
@@ -418,7 +385,7 @@ static inline int wpa_drv_if_add(struct wpa_supplicant *wpa_s,
        if (wpa_s->driver->if_add)
                return wpa_s->driver->if_add(wpa_s->drv_priv, type, ifname,
                                             addr, bss_ctx, NULL, force_ifname,
-                                            if_addr, bridge);
+                                            if_addr, bridge, 0);
        return -1;
 }
 
@@ -431,14 +398,6 @@ static inline int wpa_drv_if_remove(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_set_intra_bss(struct wpa_supplicant *wpa_s,
-                                       int enabled)
-{
-       if (wpa_s->driver->set_intra_bss)
-               return wpa_s->driver->set_intra_bss(wpa_s->drv_priv, enabled);
-       return -1;
-}
-
 static inline int wpa_drv_remain_on_channel(struct wpa_supplicant *wpa_s,
                                            unsigned int freq,
                                            unsigned int duration)
@@ -467,15 +426,6 @@ static inline int wpa_drv_probe_req_report(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_disable_11b_rates(struct wpa_supplicant *wpa_s,
-                                           int disabled)
-{
-       if (wpa_s->driver->disable_11b_rates)
-               return wpa_s->driver->disable_11b_rates(wpa_s->drv_priv,
-                                                       disabled);
-       return -1;
-}
-
 static inline int wpa_drv_deinit_ap(struct wpa_supplicant *wpa_s)
 {
        if (wpa_s->driver->deinit_ap)
@@ -483,6 +433,13 @@ static inline int wpa_drv_deinit_ap(struct wpa_supplicant *wpa_s)
        return 0;
 }
 
+static inline int wpa_drv_deinit_p2p_cli(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->deinit_p2p_cli)
+               return wpa_s->driver->deinit_p2p_cli(wpa_s->drv_priv);
+       return 0;
+}
+
 static inline void wpa_drv_suspend(struct wpa_supplicant *wpa_s)
 {
        if (wpa_s->driver->suspend)
@@ -504,6 +461,23 @@ static inline int wpa_drv_signal_monitor(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
+static inline int wpa_drv_signal_poll(struct wpa_supplicant *wpa_s,
+                                     struct wpa_signal_info *si)
+{
+       if (wpa_s->driver->signal_poll)
+               return wpa_s->driver->signal_poll(wpa_s->drv_priv, si);
+       return -1;
+}
+
+static inline int wpa_drv_pktcnt_poll(struct wpa_supplicant *wpa_s,
+                                     struct hostap_sta_driver_data *sta)
+{
+       if (wpa_s->driver->read_sta_data)
+               return wpa_s->driver->read_sta_data(wpa_s->drv_priv, sta,
+                                                   wpa_s->bssid);
+       return -1;
+}
+
 static inline int wpa_drv_set_ap_wps_ie(struct wpa_supplicant *wpa_s,
                                        const struct wpabuf *beacon,
                                        const struct wpabuf *proberesp,
@@ -547,153 +521,87 @@ static inline int wpa_drv_ampdu(struct wpa_supplicant *wpa_s, int ampdu)
        return wpa_s->driver->ampdu(wpa_s->drv_priv, ampdu);
 }
 
-static inline int wpa_drv_p2p_find(struct wpa_supplicant *wpa_s,
-                                  unsigned int timeout, int type)
-{
-       if (!wpa_s->driver->p2p_find)
-               return -1;
-       return wpa_s->driver->p2p_find(wpa_s->drv_priv, timeout, type);
-}
-
-static inline int wpa_drv_p2p_stop_find(struct wpa_supplicant *wpa_s)
-{
-       if (!wpa_s->driver->p2p_stop_find)
-               return -1;
-       return wpa_s->driver->p2p_stop_find(wpa_s->drv_priv);
-}
-
-static inline int wpa_drv_p2p_listen(struct wpa_supplicant *wpa_s,
-                                    unsigned int timeout)
-{
-       if (!wpa_s->driver->p2p_listen)
-               return -1;
-       return wpa_s->driver->p2p_listen(wpa_s->drv_priv, timeout);
-}
-
-static inline int wpa_drv_p2p_connect(struct wpa_supplicant *wpa_s,
-                                     const u8 *peer_addr, int wps_method,
-                                     int go_intent,
-                                     const u8 *own_interface_addr,
-                                     unsigned int force_freq,
-                                     int persistent_group)
-{
-       if (!wpa_s->driver->p2p_connect)
-               return -1;
-       return wpa_s->driver->p2p_connect(wpa_s->drv_priv, peer_addr,
-                                         wps_method, go_intent,
-                                         own_interface_addr, force_freq,
-                                         persistent_group);
-}
-
-static inline int wpa_drv_wps_success_cb(struct wpa_supplicant *wpa_s,
-                                        const u8 *peer_addr)
-{
-       if (!wpa_s->driver->wps_success_cb)
-               return -1;
-       return wpa_s->driver->wps_success_cb(wpa_s->drv_priv, peer_addr);
-}
-
-static inline int
-wpa_drv_p2p_group_formation_failed(struct wpa_supplicant *wpa_s)
+static inline int wpa_drv_send_tdls_mgmt(struct wpa_supplicant *wpa_s,
+                                        const u8 *dst, u8 action_code,
+                                        u8 dialog_token, u16 status_code,
+                                        const u8 *buf, size_t len)
 {
-       if (!wpa_s->driver->p2p_group_formation_failed)
-               return -1;
-       return wpa_s->driver->p2p_group_formation_failed(wpa_s->drv_priv);
+       if (wpa_s->driver->send_tdls_mgmt) {
+               return wpa_s->driver->send_tdls_mgmt(wpa_s->drv_priv, dst,
+                                                    action_code, dialog_token,
+                                                    status_code, buf, len);
+       }
+       return -1;
 }
 
-static inline int wpa_drv_p2p_set_params(struct wpa_supplicant *wpa_s,
-                                        const struct p2p_params *params)
+static inline int wpa_drv_tdls_oper(struct wpa_supplicant *wpa_s,
+                                   enum tdls_oper oper, const u8 *peer)
 {
-       if (!wpa_s->driver->p2p_set_params)
+       if (!wpa_s->driver->tdls_oper)
                return -1;
-       return wpa_s->driver->p2p_set_params(wpa_s->drv_priv, params);
+       return wpa_s->driver->tdls_oper(wpa_s->drv_priv, oper, peer);
 }
 
-static inline int wpa_drv_p2p_prov_disc_req(struct wpa_supplicant *wpa_s,
-                                           const u8 *peer_addr,
-                                           u16 config_methods)
+#ifdef ANDROID
+static inline int wpa_drv_driver_cmd(struct wpa_supplicant *wpa_s,
+                                    char *cmd, char *buf, size_t buf_len)
 {
-       if (!wpa_s->driver->p2p_prov_disc_req)
+       if (!wpa_s->driver->driver_cmd)
                return -1;
-       return wpa_s->driver->p2p_prov_disc_req(wpa_s->drv_priv, peer_addr,
-                                               config_methods);
+       return wpa_s->driver->driver_cmd(wpa_s->drv_priv, cmd, buf, buf_len);
 }
+#endif /* ANDROID */
 
-static inline u64 wpa_drv_p2p_sd_request(struct wpa_supplicant *wpa_s,
-                                        const u8 *dst,
-                                        const struct wpabuf *tlvs)
+static inline void wpa_drv_set_rekey_info(struct wpa_supplicant *wpa_s,
+                                         const u8 *kek, const u8 *kck,
+                                         const u8 *replay_ctr)
 {
-       if (!wpa_s->driver->p2p_sd_request)
-               return 0;
-       return wpa_s->driver->p2p_sd_request(wpa_s->drv_priv, dst, tlvs);
+       if (!wpa_s->driver->set_rekey_info)
+               return;
+       wpa_s->driver->set_rekey_info(wpa_s->drv_priv, kek, kck, replay_ctr);
 }
 
-static inline int wpa_drv_p2p_sd_cancel_request(struct wpa_supplicant *wpa_s,
-                                               u64 req)
+static inline int wpa_drv_radio_disable(struct wpa_supplicant *wpa_s,
+                                       int disabled)
 {
-       if (!wpa_s->driver->p2p_sd_cancel_request)
+       if (!wpa_s->driver->radio_disable)
                return -1;
-       return wpa_s->driver->p2p_sd_cancel_request(wpa_s->drv_priv, req);
+       return wpa_s->driver->radio_disable(wpa_s->drv_priv, disabled);
 }
 
-static inline int wpa_drv_p2p_sd_response(struct wpa_supplicant *wpa_s,
-                                         int freq, const u8 *dst,
-                                         u8 dialog_token,
-                                         const struct wpabuf *resp_tlvs)
+static inline int wpa_drv_switch_channel(struct wpa_supplicant *wpa_s,
+                                        struct csa_settings *settings)
 {
-       if (!wpa_s->driver->p2p_sd_response)
+       if (!wpa_s->driver->switch_channel)
                return -1;
-       return wpa_s->driver->p2p_sd_response(wpa_s->drv_priv, freq, dst,
-                                             dialog_token, resp_tlvs);
+       return wpa_s->driver->switch_channel(wpa_s->drv_priv, settings);
 }
 
-static inline int wpa_drv_p2p_service_update(struct wpa_supplicant *wpa_s)
+static inline int wpa_drv_wnm_oper(struct wpa_supplicant *wpa_s,
+                                  enum wnm_oper oper, const u8 *peer,
+                                  u8 *buf, u16 *buf_len)
 {
-       if (!wpa_s->driver->p2p_service_update)
+       if (!wpa_s->driver->wnm_oper)
                return -1;
-       return wpa_s->driver->p2p_service_update(wpa_s->drv_priv);
+       return wpa_s->driver->wnm_oper(wpa_s->drv_priv, oper, peer, buf,
+                                      buf_len);
 }
 
-static inline int wpa_drv_p2p_reject(struct wpa_supplicant *wpa_s,
-                                    const u8 *addr)
+static inline int wpa_drv_status(struct wpa_supplicant *wpa_s,
+                                char *buf, size_t buflen)
 {
-       if (!wpa_s->driver->p2p_reject)
+       if (!wpa_s->driver->status)
                return -1;
-       return wpa_s->driver->p2p_reject(wpa_s->drv_priv, addr);
-}
-
-static inline int wpa_drv_p2p_invite(struct wpa_supplicant *wpa_s,
-                                    const u8 *peer, int role, const u8 *bssid,
-                                    const u8 *ssid, size_t ssid_len,
-                                    const u8 *go_dev_addr,
-                                    int persistent_group)
-{
-       if (!wpa_s->driver->p2p_invite)
-               return -1;
-       return wpa_s->driver->p2p_invite(wpa_s->drv_priv, peer, role, bssid,
-                                        ssid, ssid_len, go_dev_addr,
-                                        persistent_group);
-}
-
-static inline int wpa_drv_send_tdls_mgmt(struct wpa_supplicant *wpa_s,
-                                        const u8 *dst, u8 action_code,
-                                        u8 dialog_token, u16 status_code,
-                                        const u8 *buf, size_t len)
-{
-       if (wpa_s->driver->send_tdls_mgmt) {
-               return wpa_s->driver->send_tdls_mgmt(wpa_s->drv_priv, dst,
-                                                    action_code, dialog_token,
-                                                    status_code, buf, len);
-       }
-       return -1;
+       return wpa_s->driver->status(wpa_s->drv_priv, buf, buflen);
 }
 
-static inline int wpa_drv_tdls_oper(struct wpa_supplicant *wpa_s,
-                                   enum tdls_oper oper, const u8 *peer)
+static inline int wpa_drv_set_qos_map(struct wpa_supplicant *wpa_s,
+                                     const u8 *qos_map_set, u8 qos_map_set_len)
 {
-       if (!wpa_s->driver->tdls_oper)
+       if (!wpa_s->driver->set_qos_map)
                return -1;
-       return wpa_s->driver->tdls_oper(wpa_s->drv_priv, oper, peer);
+       return wpa_s->driver->set_qos_map(wpa_s->drv_priv, qos_map_set,
+                                         qos_map_set_len);
 }
 
 #endif /* DRIVER_I_H */