Avoid unnecessary key clearing operations
[mech_eap.git] / wpa_supplicant / driver_i.h
index 4a7707a..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
@@ -22,7 +16,8 @@ static inline void * wpa_drv_init(struct wpa_supplicant *wpa_s,
                                  const char *ifname)
 {
        if (wpa_s->driver->init2)
-               return wpa_s->driver->init2(wpa_s, ifname, wpa_s->global);
+               return wpa_s->driver->init2(wpa_s, ifname,
+                                           wpa_s->global_drv_priv);
        if (wpa_s->driver->init) {
                return wpa_s->driver->init(wpa_s, ifname);
        }
@@ -43,16 +38,6 @@ static inline int wpa_drv_set_param(struct wpa_supplicant *wpa_s,
        return 0;
 }
 
-static inline int wpa_drv_set_drop_unencrypted(struct wpa_supplicant *wpa_s,
-                                              int enabled)
-{
-       if (wpa_s->driver->set_drop_unencrypted) {
-               return wpa_s->driver->set_drop_unencrypted(wpa_s->drv_priv,
-                                                          enabled);
-       }
-       return -1;
-}
-
 static inline int wpa_drv_set_countermeasures(struct wpa_supplicant *wpa_s,
                                              int enabled)
 {
@@ -63,32 +48,6 @@ static inline int wpa_drv_set_countermeasures(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_set_auth_alg(struct wpa_supplicant *wpa_s,
-                                      int auth_alg)
-{
-       if (wpa_s->driver->set_auth_alg) {
-               return wpa_s->driver->set_auth_alg(wpa_s->drv_priv,
-                                                  auth_alg);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_set_wpa(struct wpa_supplicant *wpa_s, int enabled)
-{
-       if (wpa_s->driver->set_wpa) {
-               return wpa_s->driver->set_wpa(wpa_s->drv_priv, enabled);
-       }
-       return 0;
-}
-
-static inline int wpa_drv_set_mode(struct wpa_supplicant *wpa_s, int mode)
-{
-       if (wpa_s->driver->set_mode) {
-               return wpa_s->driver->set_mode(wpa_s->drv_priv, mode);
-       }
-       return 0;
-}
-
 static inline int wpa_drv_authenticate(struct wpa_supplicant *wpa_s,
                                       struct wpa_driver_auth_params *params)
 {
@@ -111,21 +70,23 @@ static inline int wpa_drv_scan(struct wpa_supplicant *wpa_s,
 {
        if (wpa_s->driver->scan2)
                return wpa_s->driver->scan2(wpa_s->drv_priv, params);
-       if (wpa_s->driver->scan)
-               return wpa_s->driver->scan(wpa_s->drv_priv,
-                                          params->ssids[0].ssid,
-                                          params->ssids[0].ssid_len);
        return -1;
 }
 
-static inline int wpa_drv_get_scan_results(struct wpa_supplicant *wpa_s,
-                                          struct wpa_scan_result *results,
-                                          size_t max_size)
+static inline int wpa_drv_sched_scan(struct wpa_supplicant *wpa_s,
+                                    struct wpa_driver_scan_params *params,
+                                    u32 interval)
 {
-       if (wpa_s->driver->get_scan_results) {
-               return wpa_s->driver->get_scan_results(wpa_s->drv_priv,
-                                                      results, max_size);
-       }
+       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;
 }
 
@@ -153,13 +114,19 @@ static inline int wpa_drv_get_ssid(struct wpa_supplicant *wpa_s, u8 *ssid)
        return -1;
 }
 
-static inline int wpa_drv_set_key(struct wpa_supplicant *wpa_s, 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)
+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)
 {
+       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);
@@ -167,22 +134,23 @@ static inline int wpa_drv_set_key(struct wpa_supplicant *wpa_s, wpa_alg alg,
        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;
 }
@@ -285,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,
-                                     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)
 {
@@ -323,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;
 }
 
@@ -369,25 +290,11 @@ static inline int wpa_drv_send_ft_action(struct wpa_supplicant *wpa_s,
        return -1;
 }
 
-static inline int wpa_drv_set_probe_req_ie(struct wpa_supplicant *wpa_s,
-                                          const u8 *ies, size_t ies_len)
+static inline int wpa_drv_set_ap(struct wpa_supplicant *wpa_s,
+                                struct wpa_driver_ap_params *params)
 {
-       if (wpa_s->driver->set_probe_req_ie)
-               return wpa_s->driver->set_probe_req_ie(wpa_s->drv_priv, ies,
-                                                      ies_len);
-       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)
-{
-       if (wpa_s->driver->set_beacon)
-               return wpa_s->driver->set_beacon(wpa_s->ifname,
-                                                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;
 }
 
@@ -395,8 +302,7 @@ static inline int wpa_drv_sta_add(struct wpa_supplicant *wpa_s,
                                  struct hostapd_sta_add_params *params)
 {
        if (wpa_s->driver->sta_add)
-               return wpa_s->driver->sta_add(wpa_s->ifname, wpa_s->drv_priv,
-                                             params);
+               return wpa_s->driver->sta_add(wpa_s->drv_priv, params);
        return -1;
 }
 
@@ -411,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;
 }
 
@@ -441,4 +347,261 @@ static inline int wpa_drv_set_supp_port(struct wpa_supplicant *wpa_s,
        return 0;
 }
 
+static inline int wpa_drv_send_action(struct wpa_supplicant *wpa_s,
+                                     unsigned int freq,
+                                     unsigned int wait,
+                                     const u8 *dst, const u8 *src,
+                                     const u8 *bssid,
+                                     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, no_cck);
+       return -1;
+}
+
+static inline void wpa_drv_send_action_cancel_wait(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->send_action_cancel_wait)
+               wpa_s->driver->send_action_cancel_wait(wpa_s->drv_priv);
+}
+
+static inline int wpa_drv_set_freq(struct wpa_supplicant *wpa_s,
+                                  struct hostapd_freq_params *freq)
+{
+       if (wpa_s->driver->set_freq)
+               return wpa_s->driver->set_freq(wpa_s->drv_priv, freq);
+       return -1;
+}
+
+static inline int wpa_drv_if_add(struct wpa_supplicant *wpa_s,
+                                enum wpa_driver_if_type type,
+                                const char *ifname, const u8 *addr,
+                                void *bss_ctx, char *force_ifname,
+                                u8 *if_addr, const char *bridge)
+{
+       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, 0);
+       return -1;
+}
+
+static inline int wpa_drv_if_remove(struct wpa_supplicant *wpa_s,
+                                   enum wpa_driver_if_type type,
+                                   const char *ifname)
+{
+       if (wpa_s->driver->if_remove)
+               return wpa_s->driver->if_remove(wpa_s->drv_priv, type, ifname);
+       return -1;
+}
+
+static inline int wpa_drv_remain_on_channel(struct wpa_supplicant *wpa_s,
+                                           unsigned int freq,
+                                           unsigned int duration)
+{
+       if (wpa_s->driver->remain_on_channel)
+               return wpa_s->driver->remain_on_channel(wpa_s->drv_priv, freq,
+                                                       duration);
+       return -1;
+}
+
+static inline int wpa_drv_cancel_remain_on_channel(
+       struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->cancel_remain_on_channel)
+               return wpa_s->driver->cancel_remain_on_channel(
+                       wpa_s->drv_priv);
+       return -1;
+}
+
+static inline int wpa_drv_probe_req_report(struct wpa_supplicant *wpa_s,
+                                          int report)
+{
+       if (wpa_s->driver->probe_req_report)
+               return wpa_s->driver->probe_req_report(wpa_s->drv_priv,
+                                                      report);
+       return -1;
+}
+
+static inline int wpa_drv_deinit_ap(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->deinit_ap)
+               return wpa_s->driver->deinit_ap(wpa_s->drv_priv);
+       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)
+               wpa_s->driver->suspend(wpa_s->drv_priv);
+}
+
+static inline void wpa_drv_resume(struct wpa_supplicant *wpa_s)
+{
+       if (wpa_s->driver->resume)
+               wpa_s->driver->resume(wpa_s->drv_priv);
+}
+
+static inline int wpa_drv_signal_monitor(struct wpa_supplicant *wpa_s,
+                                        int threshold, int hysteresis)
+{
+       if (wpa_s->driver->signal_monitor)
+               return wpa_s->driver->signal_monitor(wpa_s->drv_priv,
+                                                    threshold, hysteresis);
+       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,
+                                       const struct wpabuf *assocresp)
+{
+       if (!wpa_s->driver->set_ap_wps_ie)
+               return -1;
+       return wpa_s->driver->set_ap_wps_ie(wpa_s->drv_priv, beacon,
+                                           proberesp, assocresp);
+}
+
+static inline int wpa_drv_shared_freq(struct wpa_supplicant *wpa_s)
+{
+       if (!wpa_s->driver->shared_freq)
+               return -1;
+       return wpa_s->driver->shared_freq(wpa_s->drv_priv);
+}
+
+static inline int wpa_drv_get_noa(struct wpa_supplicant *wpa_s,
+                                 u8 *buf, size_t buf_len)
+{
+       if (!wpa_s->driver->get_noa)
+               return -1;
+       return wpa_s->driver->get_noa(wpa_s->drv_priv, buf, buf_len);
+}
+
+static inline int wpa_drv_set_p2p_powersave(struct wpa_supplicant *wpa_s,
+                                           int legacy_ps, int opp_ps,
+                                           int ctwindow)
+{
+       if (!wpa_s->driver->set_p2p_powersave)
+               return -1;
+       return wpa_s->driver->set_p2p_powersave(wpa_s->drv_priv, legacy_ps,
+                                               opp_ps, ctwindow);
+}
+
+static inline int wpa_drv_ampdu(struct wpa_supplicant *wpa_s, int ampdu)
+{
+       if (!wpa_s->driver->ampdu)
+               return -1;
+       return wpa_s->driver->ampdu(wpa_s->drv_priv, ampdu);
+}
+
+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;
+}
+
+static inline int wpa_drv_tdls_oper(struct wpa_supplicant *wpa_s,
+                                   enum tdls_oper oper, const u8 *peer)
+{
+       if (!wpa_s->driver->tdls_oper)
+               return -1;
+       return wpa_s->driver->tdls_oper(wpa_s->drv_priv, oper, peer);
+}
+
+#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->driver_cmd)
+               return -1;
+       return wpa_s->driver->driver_cmd(wpa_s->drv_priv, cmd, buf, buf_len);
+}
+#endif /* ANDROID */
+
+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->set_rekey_info)
+               return;
+       wpa_s->driver->set_rekey_info(wpa_s->drv_priv, kek, kck, replay_ctr);
+}
+
+static inline int wpa_drv_radio_disable(struct wpa_supplicant *wpa_s,
+                                       int disabled)
+{
+       if (!wpa_s->driver->radio_disable)
+               return -1;
+       return wpa_s->driver->radio_disable(wpa_s->drv_priv, disabled);
+}
+
+static inline int wpa_drv_switch_channel(struct wpa_supplicant *wpa_s,
+                                        struct csa_settings *settings)
+{
+       if (!wpa_s->driver->switch_channel)
+               return -1;
+       return wpa_s->driver->switch_channel(wpa_s->drv_priv, settings);
+}
+
+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->wnm_oper)
+               return -1;
+       return wpa_s->driver->wnm_oper(wpa_s->drv_priv, oper, peer, buf,
+                                      buf_len);
+}
+
+static inline int wpa_drv_status(struct wpa_supplicant *wpa_s,
+                                char *buf, size_t buflen)
+{
+       if (!wpa_s->driver->status)
+               return -1;
+       return wpa_s->driver->status(wpa_s->drv_priv, buf, buflen);
+}
+
+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->set_qos_map)
+               return -1;
+       return wpa_s->driver->set_qos_map(wpa_s->drv_priv, qos_map_set,
+                                         qos_map_set_len);
+}
+
 #endif /* DRIVER_I_H */