WPS: Add initial part of External Registrar functionality
[libeap.git] / wpa_supplicant / wpa_supplicant_i.h
index c629a7e..e47ac74 100644 (file)
@@ -15,7 +15,7 @@
 #ifndef WPA_SUPPLICANT_I_H
 #define WPA_SUPPLICANT_I_H
 
-#include "drivers/driver.h"
+#include "common/defs.h"
 
 extern const char *wpa_supplicant_version;
 extern const char *wpa_supplicant_license;
@@ -27,10 +27,8 @@ extern const char *wpa_supplicant_full_license4;
 extern const char *wpa_supplicant_full_license5;
 #endif /* CONFIG_NO_STDOUT_DEBUG */
 
-extern struct wpa_driver_ops *wpa_supplicant_drivers[];
-
-
 struct wpa_scan_result;
+struct wpa_scan_res;
 struct wpa_sm;
 struct wpa_supplicant;
 struct ibss_rsn;
@@ -157,6 +155,29 @@ struct wpa_params {
         * wpa_debug_file_path - Path of debug file or %NULL to use stdout
         */
        const char *wpa_debug_file_path;
+
+       /**
+        * wpa_debug_syslog - Enable log output through syslog
+        */
+       int wpa_debug_syslog;
+
+       /**
+        * override_driver - Optional driver parameter override
+        *
+        * This parameter can be used to override the driver parameter in
+        * dynamic interface addition to force a specific driver wrapper to be
+        * used instead.
+        */
+       char *override_driver;
+
+       /**
+        * override_ctrl_interface - Optional ctrl_interface override
+        *
+        * This parameter can be used to override the ctrl_interface parameter
+        * in dynamic interface addition to force a control interface to be
+        * created.
+        */
+       char *override_ctrl_interface;
 };
 
 /**
@@ -245,13 +266,13 @@ struct wpa_client_mlme {
 
        int cts_protect_erp_frames;
 
-       int phymode; /* current mode; WPA_MODE_IEEE80211A, .. */
-       struct wpa_hw_modes *modes;
+       hostapd_hw_mode phymode; /* current mode */
+       struct hostapd_hw_modes *modes;
        size_t num_modes;
        unsigned int hw_modes; /* bitfield of allowed hardware modes;
-                               * (1 << MODE_*) */
+                               * (1 << HOSTAPD_MODE_*) */
        int num_curr_rates;
-       struct wpa_rate_data *curr_rates;
+       struct hostapd_rate_data *curr_rates;
        int freq; /* The current frequency in MHz */
        int channel; /* The current IEEE 802.11 channel number */
 
@@ -309,11 +330,11 @@ struct wpa_supplicant {
 
        struct wpa_ssid *prev_scan_ssid; /* previously scanned SSID;
                                          * NULL = not yet initialized (start
-                                         * with broadcast SSID)
-                                         * BROADCAST_SSID_SCAN = broadcast
+                                         * with wildcard SSID)
+                                         * WILDCARD_SSID_SCAN = wildcard
                                          * SSID was used in the previous scan
                                          */
-#define BROADCAST_SSID_SCAN ((struct wpa_ssid *) 1)
+#define WILDCARD_SSID_SCAN ((struct wpa_ssid *) 1)
 
        struct wpa_scan_results *scan_res;
 
@@ -326,6 +347,7 @@ struct wpa_supplicant {
        struct ctrl_iface_priv *ctrl_iface;
 
        wpa_states wpa_state;
+       int scanning;
        int new_connection;
        int reassociated_connection;
 
@@ -346,22 +368,55 @@ struct wpa_supplicant {
                             * results without a new scan request; this is used
                             * to speed up the first association if the driver
                             * has already available scan results. */
+       int scan_runs; /* number of scan runs since WPS was started */
 
        struct wpa_client_mlme mlme;
-       int use_client_mlme;
-       int driver_4way_handshake;
+       unsigned int drv_flags;
+       int max_scan_ssids;
 
        int pending_mic_error_report;
        int pending_mic_error_pairwise;
        int mic_errors_seen; /* Michael MIC errors with the current PTK */
 
        struct wps_context *wps;
+       int wps_success; /* WPS success event received */
+       struct wps_er *wps_er;
+       int blacklist_cleared;
+
+       struct wpabuf *pending_eapol_rx;
+       struct os_time pending_eapol_rx_time;
+       u8 pending_eapol_rx_src[ETH_ALEN];
 
        struct ibss_rsn *ibss_rsn;
+
+#ifdef CONFIG_SME
+       struct {
+               u8 ssid[32];
+               size_t ssid_len;
+               int freq;
+               u8 assoc_req_ie[80];
+               size_t assoc_req_ie_len;
+               int mfp;
+               int ft_used;
+               u8 mobility_domain[2];
+               u8 *ft_ies;
+               size_t ft_ies_len;
+       } sme;
+#endif /* CONFIG_SME */
+
+#ifdef CONFIG_AP
+       struct hostapd_iface *ap_iface;
+#endif /* CONFIG_AP */
+
+       struct wpa_ssid *bgscan_ssid;
+       const struct bgscan_ops *bgscan;
+       void *bgscan_priv;
 };
 
 
 /* wpa_supplicant.c */
+int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid);
+
 int wpa_supplicant_reload_configuration(struct wpa_supplicant *wpa_s);
 
 const char * wpa_supplicant_state_txt(int state);
@@ -388,6 +443,18 @@ void wpa_supplicant_deauthenticate(struct wpa_supplicant *wpa_s,
 void wpa_supplicant_disassociate(struct wpa_supplicant *wpa_s,
                                 int reason_code);
 
+void wpa_supplicant_enable_network(struct wpa_supplicant *wpa_s,
+                                  struct wpa_ssid *ssid);
+void wpa_supplicant_disable_network(struct wpa_supplicant *wpa_s,
+                                   struct wpa_ssid *ssid);
+void wpa_supplicant_select_network(struct wpa_supplicant *wpa_s,
+                                  struct wpa_ssid *ssid);
+int wpa_supplicant_set_ap_scan(struct wpa_supplicant *wpa_s,
+                              int ap_scan);
+int wpa_supplicant_set_debug_params(struct wpa_global *global,
+                                   int debug_level, int debug_timestamp,
+                                   int debug_show_keys);
+
 void wpa_show_license(void);
 
 struct wpa_supplicant * wpa_supplicant_add_iface(struct wpa_global *global,
@@ -404,360 +471,16 @@ int wpa_supplicant_scard_init(struct wpa_supplicant *wpa_s,
                              struct wpa_ssid *ssid);
 
 /* scan.c */
+int wpa_supplicant_enabled_networks(struct wpa_config *conf);
 void wpa_supplicant_req_scan(struct wpa_supplicant *wpa_s, int sec, int usec);
 void wpa_supplicant_cancel_scan(struct wpa_supplicant *wpa_s);
+void wpa_supplicant_notify_scanning(struct wpa_supplicant *wpa_s,
+                                   int scanning);
+struct wpa_driver_scan_params;
+int wpa_supplicant_trigger_scan(struct wpa_supplicant *wpa_s,
+                               struct wpa_driver_scan_params *params);
 
 /* events.c */
 void wpa_supplicant_mark_disassoc(struct wpa_supplicant *wpa_s);
 
-/* driver_ops */
-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);
-       if (wpa_s->driver->init) {
-               return wpa_s->driver->init(wpa_s, ifname);
-       }
-       return NULL;
-}
-
-static inline void wpa_drv_deinit(struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->driver->deinit)
-               wpa_s->driver->deinit(wpa_s->drv_priv);
-}
-
-static inline int wpa_drv_set_param(struct wpa_supplicant *wpa_s,
-                                   const char *param)
-{
-       if (wpa_s->driver->set_param)
-               return wpa_s->driver->set_param(wpa_s->drv_priv, param);
-       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)
-{
-       if (wpa_s->driver->set_countermeasures) {
-               return wpa_s->driver->set_countermeasures(wpa_s->drv_priv,
-                                                         enabled);
-       }
-       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_associate(struct wpa_supplicant *wpa_s,
-                                   struct wpa_driver_associate_params *params)
-{
-       if (wpa_s->driver->associate) {
-               return wpa_s->driver->associate(wpa_s->drv_priv, params);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_scan(struct wpa_supplicant *wpa_s, const u8 *ssid,
-                              size_t ssid_len)
-{
-       if (wpa_s->driver->scan) {
-               return wpa_s->driver->scan(wpa_s->drv_priv, ssid, 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)
-{
-       if (wpa_s->driver->get_scan_results) {
-               return wpa_s->driver->get_scan_results(wpa_s->drv_priv,
-                                                      results, max_size);
-       }
-       return -1;
-}
-
-static inline struct wpa_scan_results * wpa_drv_get_scan_results2(
-       struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->driver->get_scan_results2)
-               return wpa_s->driver->get_scan_results2(wpa_s->drv_priv);
-       return NULL;
-}
-
-static inline int wpa_drv_get_bssid(struct wpa_supplicant *wpa_s, u8 *bssid)
-{
-       if (wpa_s->driver->get_bssid) {
-               return wpa_s->driver->get_bssid(wpa_s->drv_priv, bssid);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_get_ssid(struct wpa_supplicant *wpa_s, u8 *ssid)
-{
-       if (wpa_s->driver->get_ssid) {
-               return wpa_s->driver->get_ssid(wpa_s->drv_priv, 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)
-{
-       if (wpa_s->driver->set_key) {
-               wpa_s->keys_cleared = 0;
-               return wpa_s->driver->set_key(wpa_s->drv_priv, alg, addr,
-                                             key_idx, set_tx, seq, seq_len,
-                                             key, key_len);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_deauthenticate(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);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_disassociate(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);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_add_pmkid(struct wpa_supplicant *wpa_s,
-                                   const u8 *bssid, const u8 *pmkid)
-{
-       if (wpa_s->driver->add_pmkid) {
-               return wpa_s->driver->add_pmkid(wpa_s->drv_priv, bssid, pmkid);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_remove_pmkid(struct wpa_supplicant *wpa_s,
-                                      const u8 *bssid, const u8 *pmkid)
-{
-       if (wpa_s->driver->remove_pmkid) {
-               return wpa_s->driver->remove_pmkid(wpa_s->drv_priv, bssid,
-                                                  pmkid);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_flush_pmkid(struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->driver->flush_pmkid) {
-               return wpa_s->driver->flush_pmkid(wpa_s->drv_priv);
-       }
-       return -1;
-}
-
-static inline int wpa_drv_get_capa(struct wpa_supplicant *wpa_s,
-                                  struct wpa_driver_capa *capa)
-{
-       if (wpa_s->driver->get_capa) {
-               return wpa_s->driver->get_capa(wpa_s->drv_priv, capa);
-       }
-       return -1;
-}
-
-static inline void wpa_drv_poll(struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->driver->poll) {
-               wpa_s->driver->poll(wpa_s->drv_priv);
-       }
-}
-
-static inline const char * wpa_drv_get_ifname(struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->driver->get_ifname) {
-               return wpa_s->driver->get_ifname(wpa_s->drv_priv);
-       }
-       return NULL;
-}
-
-static inline const u8 * wpa_drv_get_mac_addr(struct wpa_supplicant *wpa_s)
-{
-       if (wpa_s->driver->get_mac_addr) {
-               return wpa_s->driver->get_mac_addr(wpa_s->drv_priv);
-       }
-       return NULL;
-}
-
-static inline int wpa_drv_send_eapol(struct wpa_supplicant *wpa_s,
-                                    const u8 *dst, u16 proto,
-                                    const u8 *data, size_t data_len)
-{
-       if (wpa_s->driver->send_eapol)
-               return wpa_s->driver->send_eapol(wpa_s->drv_priv, dst, proto,
-                                                data, data_len);
-       return -1;
-}
-
-static inline int wpa_drv_set_operstate(struct wpa_supplicant *wpa_s,
-                                       int state)
-{
-       if (wpa_s->driver->set_operstate)
-               return wpa_s->driver->set_operstate(wpa_s->drv_priv, state);
-       return 0;
-}
-
-static inline int wpa_drv_mlme_setprotection(struct wpa_supplicant *wpa_s,
-                                            const u8 *addr, int protect_type,
-                                            int key_type)
-{
-       if (wpa_s->driver->mlme_setprotection)
-               return wpa_s->driver->mlme_setprotection(wpa_s->drv_priv, addr,
-                                                        protect_type,
-                                                        key_type);
-       return 0;
-}
-
-static inline struct wpa_hw_modes *
-wpa_drv_get_hw_feature_data(struct wpa_supplicant *wpa_s, u16 *num_modes,
-                           u16 *flags)
-{
-       if (wpa_s->driver->get_hw_feature_data)
-               return wpa_s->driver->get_hw_feature_data(wpa_s->drv_priv,
-                                                         num_modes, flags);
-       return NULL;
-}
-
-static inline int wpa_drv_set_channel(struct wpa_supplicant *wpa_s,
-                                     wpa_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)
-{
-       if (wpa_s->driver->set_country)
-               return wpa_s->driver->set_country(wpa_s->drv_priv, alpha2);
-       return 0;
-}
-
-static inline int wpa_drv_send_mlme(struct wpa_supplicant *wpa_s,
-                                   const u8 *data, size_t data_len)
-{
-       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);
-       return -1;
-}
-
-static inline int wpa_drv_update_ft_ies(struct wpa_supplicant *wpa_s,
-                                       const u8 *md,
-                                       const u8 *ies, size_t ies_len)
-{
-       if (wpa_s->driver->update_ft_ies)
-               return wpa_s->driver->update_ft_ies(wpa_s->drv_priv, md,
-                                                   ies, ies_len);
-       return -1;
-}
-
-static inline int wpa_drv_send_ft_action(struct wpa_supplicant *wpa_s,
-                                        u8 action, const u8 *target_ap,
-                                        const u8 *ies, size_t ies_len)
-{
-       if (wpa_s->driver->send_ft_action)
-               return wpa_s->driver->send_ft_action(wpa_s->drv_priv, action,
-                                                    target_ap, ies, ies_len);
-       return -1;
-}
-
-static inline int wpa_drv_set_probe_req_ie(struct wpa_supplicant *wpa_s,
-                                          const u8 *ies, size_t ies_len)
-{
-       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;
-}
-
 #endif /* WPA_SUPPLICANT_I_H */