]> git.ipfire.org Git - thirdparty/hostap.git/blobdiff - wpa_supplicant/wpa_supplicant_i.h
WNM: Add option to disable keep-alive frames for testing purposes
[thirdparty/hostap.git] / wpa_supplicant / wpa_supplicant_i.h
index 281c5f6717eacf7e688836df9b28638cf692f274..3a56064b056c05ed92d27f680ea5bf1e24d23c19 100644 (file)
@@ -1,15 +1,9 @@
 /*
  * wpa_supplicant - Internal definitions
- * Copyright (c) 2003-2010, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2003-2012, 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 WPA_SUPPLICANT_I_H
@@ -17,6 +11,7 @@
 
 #include "utils/list.h"
 #include "common/defs.h"
+#include "config_ssid.h"
 
 extern const char *wpa_supplicant_version;
 extern const char *wpa_supplicant_license;
@@ -35,6 +30,7 @@ struct scan_info;
 struct wpa_bss;
 struct wpa_scan_results;
 struct hostapd_hw_modes;
+struct wpa_driver_associate_params;
 
 /*
  * Forward declarations of private structures used within the ctrl_iface
@@ -164,6 +160,11 @@ struct wpa_params {
         */
        int wpa_debug_syslog;
 
+       /**
+        * wpa_debug_tracing - Enable log output through Linux tracing
+        */
+       int wpa_debug_tracing;
+
        /**
         * override_driver - Optional driver parameter override
         *
@@ -203,6 +204,12 @@ struct p2p_srv_upnp {
        char *service;
 };
 
+struct wpa_freq_range {
+       unsigned int min;
+       unsigned int max;
+};
+
+
 /**
  * struct wpa_global - Internal, global data for all %wpa_supplicant interfaces
  *
@@ -218,107 +225,51 @@ struct wpa_global {
        size_t drv_count;
        struct os_time suspend_time;
        struct p2p_data *p2p;
+       struct wpa_supplicant *p2p_init_wpa_s;
        struct wpa_supplicant *p2p_group_formation;
        u8 p2p_dev_addr[ETH_ALEN];
        struct dl_list p2p_srv_bonjour; /* struct p2p_srv_bonjour */
        struct dl_list p2p_srv_upnp; /* struct p2p_srv_upnp */
        int p2p_disabled;
        int cross_connection;
+       struct wpa_freq_range *p2p_disallow_freq;
+       unsigned int num_p2p_disallow_freq;
+       enum wpa_conc_pref {
+               WPA_CONC_PREF_NOT_SET,
+               WPA_CONC_PREF_STA,
+               WPA_CONC_PREF_P2P
+       } conc_pref;
+       unsigned int p2p_cb_on_scan_complete:1;
+
+#ifdef CONFIG_WIFI_DISPLAY
+       int wifi_display;
+#define MAX_WFD_SUBELEMS 10
+       struct wpabuf *wfd_subelem[MAX_WFD_SUBELEMS];
+#endif /* CONFIG_WIFI_DISPLAY */
 };
 
 
-struct wpa_client_mlme {
-#ifdef CONFIG_CLIENT_MLME
-       enum {
-               IEEE80211_DISABLED, IEEE80211_AUTHENTICATE,
-               IEEE80211_ASSOCIATE, IEEE80211_ASSOCIATED,
-               IEEE80211_IBSS_SEARCH, IEEE80211_IBSS_JOINED
-       } state;
-       u8 prev_bssid[ETH_ALEN];
+enum offchannel_send_action_result {
+       OFFCHANNEL_SEND_ACTION_SUCCESS /* Frame was send and acknowledged */,
+       OFFCHANNEL_SEND_ACTION_NO_ACK /* Frame was sent, but not acknowledged
+                                      */,
+       OFFCHANNEL_SEND_ACTION_FAILED /* Frame was not sent due to a failure */
+};
+
+struct wps_ap_info {
+       u8 bssid[ETH_ALEN];
+       enum wps_ap_info_type {
+               WPS_AP_NOT_SEL_REG,
+               WPS_AP_SEL_REG,
+               WPS_AP_SEL_REG_OUR
+       } type;
+       unsigned int tries;
+       struct os_time last_attempt;
+};
+
+struct wpa_ssid_value {
        u8 ssid[32];
        size_t ssid_len;
-       u16 aid;
-       u16 ap_capab, capab;
-       u8 *extra_ie; /* to be added to the end of AssocReq */
-       size_t extra_ie_len;
-       u8 *extra_probe_ie; /* to be added to the end of ProbeReq */
-       size_t extra_probe_ie_len;
-       enum wpa_key_mgmt key_mgmt;
-
-       /* The last AssocReq/Resp IEs */
-       u8 *assocreq_ies, *assocresp_ies;
-       size_t assocreq_ies_len, assocresp_ies_len;
-
-       int auth_tries, assoc_tries;
-
-       unsigned int ssid_set:1;
-       unsigned int bssid_set:1;
-       unsigned int prev_bssid_set:1;
-       unsigned int authenticated:1;
-       unsigned int associated:1;
-       unsigned int probereq_poll:1;
-       unsigned int use_protection:1;
-       unsigned int create_ibss:1;
-       unsigned int mixed_cell:1;
-       unsigned int wmm_enabled:1;
-
-       struct os_time last_probe;
-
-       unsigned int auth_algs; /* bitfield of allowed auth algs
-                                * (WPA_AUTH_ALG_*) */
-       int auth_alg; /* currently used IEEE 802.11 authentication algorithm */
-       int auth_transaction;
-
-       struct os_time ibss_join_req;
-       u8 *probe_resp; /* ProbeResp template for IBSS */
-       size_t probe_resp_len;
-       u32 supp_rates_bits;
-
-       int wmm_last_param_set;
-
-       int sta_scanning;
-       int scan_hw_mode_idx;
-       int scan_channel_idx;
-       enum { SCAN_SET_CHANNEL, SCAN_SEND_PROBE } scan_state;
-       struct os_time last_scan_completed;
-       int scan_oper_channel;
-       int scan_oper_freq;
-       int scan_oper_phymode;
-       u8 scan_ssid[32];
-       size_t scan_ssid_len;
-       int scan_skip_11b;
-       int *scan_freqs;
-
-       struct ieee80211_sta_bss *sta_bss_list;
-#define STA_HASH_SIZE 256
-#define STA_HASH(sta) (sta[5])
-       struct ieee80211_sta_bss *sta_bss_hash[STA_HASH_SIZE];
-
-       int cts_protect_erp_frames;
-
-       enum 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 << HOSTAPD_MODE_*) */
-       int num_curr_rates;
-       int *curr_rates;
-       int freq; /* The current frequency in MHz */
-       int channel; /* The current IEEE 802.11 channel number */
-
-#ifdef CONFIG_IEEE80211R
-       u8 current_md[6];
-       u8 *ft_ies;
-       size_t ft_ies_len;
-#endif /* CONFIG_IEEE80211R */
-
-       void (*public_action_cb)(void *ctx, const u8 *buf, size_t len,
-                                int freq);
-       void *public_action_cb_ctx;
-
-#else /* CONFIG_CLIENT_MLME */
-       int dummy; /* to keep MSVC happy */
-#endif /* CONFIG_CLIENT_MLME */
 };
 
 /**
@@ -343,6 +294,9 @@ struct wpa_supplicant {
 #ifdef CONFIG_CTRL_IFACE_DBUS_NEW
        char *dbus_new_path;
        char *dbus_groupobj_path;
+#ifdef CONFIG_AP
+       char *preq_notify_peer;
+#endif /* CONFIG_AP */
 #endif /* CONFIG_CTRL_IFACE_DBUS_NEW */
        char bridge_ifname[16];
 
@@ -352,7 +306,7 @@ struct wpa_supplicant {
        os_time_t last_michael_mic_error;
        u8 bssid[ETH_ALEN];
        u8 pending_bssid[ETH_ALEN]; /* If wpa_state == WPA_ASSOCIATING, this
-                                    * field contains the targer BSSID. */
+                                    * field contains the target BSSID. */
        int reassociate; /* reassociation requested */
        int disconnected; /* all connections disabled; i.e., do no reassociate
                           * before this has been cleared */
@@ -365,11 +319,23 @@ struct wpa_supplicant {
        int pairwise_cipher;
        int group_cipher;
        int key_mgmt;
+       int wpa_proto;
        int mgmt_group_cipher;
 
        void *drv_priv; /* private data used by driver_ops */
        void *global_drv_priv;
 
+       u8 *bssid_filter;
+       size_t bssid_filter_count;
+
+       u8 *disallow_aps_bssid;
+       size_t disallow_aps_bssid_count;
+       struct wpa_ssid_value *disallow_aps_ssid;
+       size_t disallow_aps_ssid_count;
+
+       /* previous scan was wildcard when interleaving between
+        * wildcard scans and specific SSID scan when max_ssids=1 */
+       int prev_scan_wildcard;
        struct wpa_ssid *prev_scan_ssid; /* previously scanned SSID;
                                          * NULL = not yet initialized (start
                                          * with wildcard SSID)
@@ -378,6 +344,12 @@ struct wpa_supplicant {
                                          */
 #define WILDCARD_SSID_SCAN ((struct wpa_ssid *) 1)
 
+       struct wpa_ssid *prev_sched_ssid; /* last SSID used in sched scan */
+       int sched_scan_timeout;
+       int sched_scan_interval;
+       int first_sched_scan;
+       int sched_scan_timed_out;
+
        void (*scan_res_handler)(struct wpa_supplicant *wpa_s,
                                 struct wpa_scan_results *scan_res);
        struct dl_list bss; /* struct wpa_bss::list */
@@ -386,6 +358,16 @@ struct wpa_supplicant {
        unsigned int bss_update_idx;
        unsigned int bss_next_id;
 
+        /*
+         * Pointers to BSS entries in the order they were in the last scan
+         * results.
+         */
+       struct wpa_bss **last_scan_res;
+       unsigned int last_scan_res_used;
+       unsigned int last_scan_res_size;
+       int last_scan_full;
+       struct os_time last_scan;
+
        struct wpa_driver_ops *driver;
        int interface_removed; /* whether the network interface has been
                                * removed */
@@ -396,6 +378,7 @@ struct wpa_supplicant {
 
        enum wpa_states wpa_state;
        int scanning;
+       int sched_scanning;
        int new_connection;
        int reassociated_connection;
 
@@ -403,6 +386,10 @@ struct wpa_supplicant {
                             * previous association event */
 
        struct scard_data *scard;
+#ifdef PCSC_FUNCS
+       char imsi[20];
+       int mnc_len;
+#endif /* PCSC_FUNCS */
 
        unsigned char last_eapol_src[ETH_ALEN];
 
@@ -410,15 +397,68 @@ struct wpa_supplicant {
 
        struct wpa_blacklist *blacklist;
 
-       int scan_req; /* manual scan request; this forces a scan even if there
-                      * are no enabled networks in the configuration */
+       /**
+        * extra_blacklist_count - Sum of blacklist counts after last connection
+        *
+        * This variable is used to maintain a count of temporary blacklisting
+        * failures (maximum number for any BSS) over blacklist clear
+        * operations. This is needed for figuring out whether there has been
+        * failures prior to the last blacklist clear operation which happens
+        * whenever no other not-blacklisted BSS candidates are available. This
+        * gets cleared whenever a connection has been established successfully.
+        */
+       int extra_blacklist_count;
+
+       /**
+        * scan_req - Type of the scan request
+        */
+       enum scan_req_type {
+               /**
+                * NORMAL_SCAN_REQ - Normal scan request
+                *
+                * This is used for scans initiated by wpa_supplicant to find an
+                * AP for a connection.
+                */
+               NORMAL_SCAN_REQ,
+
+               /**
+                * INITIAL_SCAN_REQ - Initial scan request
+                *
+                * This is used for the first scan on an interface to force at
+                * least one scan to be run even if the configuration does not
+                * include any enabled networks.
+                */
+               INITIAL_SCAN_REQ,
+
+               /**
+                * MANUAL_SCAN_REQ - Manual scan request
+                *
+                * This is used for scans where the user request a scan or
+                * a specific wpa_supplicant operation (e.g., WPS) requires scan
+                * to be run.
+                */
+               MANUAL_SCAN_REQ
+       } scan_req;
        int scan_runs; /* number of scan runs since WPS was started */
        int *next_scan_freqs;
        int scan_interval; /* time in sec between scans to find suitable AP */
+       int normal_scans; /* normal scans run before sched_scan */
+       int scan_for_connection; /* whether the scan request was triggered for
+                                 * finding a connection */
 
-       struct wpa_client_mlme mlme;
        unsigned int drv_flags;
+       unsigned int drv_enc;
+
+       /*
+        * A bitmap of supported protocols for probe response offload. See
+        * struct wpa_driver_capa in driver.h
+        */
+       unsigned int probe_resp_offloads;
+
        int max_scan_ssids;
+       int max_sched_scan_ssids;
+       int sched_scan_supported;
+       unsigned int max_match_sets;
        unsigned int max_remain_on_chan;
        unsigned int max_stations;
 
@@ -457,6 +497,7 @@ struct wpa_supplicant {
                u8 prev_bssid[ETH_ALEN];
                int prev_bssid_set;
                int auth_alg;
+               int proto;
 
                int sa_query_count; /* number of pending SA Query requests;
                                     * 0 = no SA Query in progress */
@@ -465,6 +506,15 @@ struct wpa_supplicant {
                                        * sa_query_count octets of pending
                                        * SA Query transaction identifiers */
                struct os_time sa_query_start;
+               u8 sched_obss_scan;
+               u16 obss_scan_int;
+               u16 bss_max_idle_period;
+               enum {
+                       SME_SAE_INIT,
+                       SME_SAE_COMMIT,
+                       SME_SAE_CONFIRM
+               } sae_state;
+               u16 sae_send_confirm;
        } sme;
 #endif /* CONFIG_SME */
 
@@ -475,20 +525,30 @@ struct wpa_supplicant {
        void *ap_configured_cb_data;
 #endif /* CONFIG_AP */
 
-#ifdef CONFIG_P2P
-       struct p2p_go_neg_results *go_params;
-       int create_p2p_iface;
-       u8 pending_interface_addr[ETH_ALEN];
-       char pending_interface_name[100];
-       int pending_interface_type;
-       int p2p_group_idx;
        unsigned int off_channel_freq;
        struct wpabuf *pending_action_tx;
        u8 pending_action_src[ETH_ALEN];
        u8 pending_action_dst[ETH_ALEN];
        u8 pending_action_bssid[ETH_ALEN];
        unsigned int pending_action_freq;
+       int pending_action_no_cck;
        int pending_action_without_roc;
+       void (*pending_action_tx_status_cb)(struct wpa_supplicant *wpa_s,
+                                           unsigned int freq, const u8 *dst,
+                                           const u8 *src, const u8 *bssid,
+                                           const u8 *data, size_t data_len,
+                                           enum offchannel_send_action_result
+                                           result);
+       unsigned int roc_waiting_drv_freq;
+       int action_tx_wait_time;
+
+#ifdef CONFIG_P2P
+       struct p2p_go_neg_results *go_params;
+       int create_p2p_iface;
+       u8 pending_interface_addr[ETH_ALEN];
+       char pending_interface_name[100];
+       int pending_interface_type;
+       int p2p_group_idx;
        unsigned int pending_listen_freq;
        unsigned int pending_listen_duration;
        enum {
@@ -512,9 +572,12 @@ struct wpa_supplicant {
        u8 pending_join_dev_addr[ETH_ALEN];
        int pending_join_wps_method;
        int p2p_join_scan_count;
-       unsigned int roc_waiting_drv_freq;
-       int action_tx_wait_time;
+       int auto_pd_scan_retry;
        int force_long_sd;
+       u16 pending_pd_config_methods;
+       enum {
+               NORMAL_PD, AUTO_PD_GO_NEG, AUTO_PD_JOIN
+       } pending_pd_use;
 
        /*
         * Whether cross connection is disallowed by the AP to which this
@@ -537,22 +600,39 @@ struct wpa_supplicant {
         */
        char cross_connect_uplink[100];
 
-       enum {
-               P2P_GROUP_REMOVAL_UNKNOWN,
-               P2P_GROUP_REMOVAL_REQUESTED,
-               P2P_GROUP_REMOVAL_IDLE_TIMEOUT,
-               P2P_GROUP_REMOVAL_UNAVAILABLE
-       } removal_reason;
+       unsigned int sta_scan_pending:1;
+       unsigned int p2p_auto_join:1;
+       unsigned int p2p_auto_pd:1;
+       unsigned int p2p_persistent_group:1;
+       unsigned int p2p_fallback_to_go_neg:1;
+       unsigned int p2p_pd_before_go_neg:1;
+       unsigned int p2p_go_ht40:1;
+       unsigned int user_initiated_pd:1;
+       int p2p_persistent_go_freq;
+       int p2p_persistent_id;
+       int p2p_go_intent;
+       int p2p_connect_freq;
+       struct os_time p2p_auto_started;
 #endif /* CONFIG_P2P */
 
        struct wpa_ssid *bgscan_ssid;
        const struct bgscan_ops *bgscan;
        void *bgscan_priv;
 
-       int connect_without_scan;
+       const struct autoscan_ops *autoscan;
+       struct wpa_driver_scan_params *autoscan_params;
+       void *autoscan_priv;
+
+       struct wpa_ssid *connect_without_scan;
+
+       struct wps_ap_info *wps_ap;
+       size_t num_wps_ap;
+       int wps_ap_iter;
 
        int after_wps;
+       int known_wps_freq;
        unsigned int wps_freq;
+       u16 wps_ap_channel;
        int wps_fragment_size;
        int auto_reconnect_disabled;
 
@@ -560,15 +640,50 @@ struct wpa_supplicant {
        int best_24_freq;
        int best_5_freq;
        int best_overall_freq;
+
+       struct gas_query *gas;
+
+#ifdef CONFIG_INTERWORKING
+       unsigned int fetch_anqp_in_progress:1;
+       unsigned int network_select:1;
+       unsigned int auto_select:1;
+       unsigned int auto_network_select:1;
+       unsigned int fetch_all_anqp:1;
+#endif /* CONFIG_INTERWORKING */
+       unsigned int drv_capa_known;
+
+       struct {
+               struct hostapd_hw_modes *modes;
+               u16 num_modes;
+               u16 flags;
+       } hw;
+
+       int pno;
+
+       /* WLAN_REASON_* reason codes. Negative if locally generated. */
+       int disconnect_reason;
+
+       struct ext_password_data *ext_pw;
+
+       struct wpabuf *last_gas_resp;
+       u8 last_gas_addr[ETH_ALEN];
+       u8 last_gas_dialog_token;
+
+       unsigned int no_keep_alive:1;
 };
 
 
 /* wpa_supplicant.c */
+void wpa_supplicant_apply_ht_overrides(
+       struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid,
+       struct wpa_driver_associate_params *params);
+
 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(enum wpa_states state);
+int wpa_supplicant_update_mac_addr(struct wpa_supplicant *wpa_s);
 int wpa_supplicant_driver_init(struct wpa_supplicant *wpa_s);
 int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s,
                              struct wpa_bss *bss, struct wpa_ssid *ssid,
@@ -582,6 +697,7 @@ void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s);
 void wpa_clear_keys(struct wpa_supplicant *wpa_s, const u8 *addr);
 void wpa_supplicant_req_auth_timeout(struct wpa_supplicant *wpa_s,
                                     int sec, int usec);
+void wpa_supplicant_reinit_autoscan(struct wpa_supplicant *wpa_s);
 void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
                              enum wpa_states state);
 struct wpa_ssid * wpa_supplicant_get_ssid(struct wpa_supplicant *wpa_s);
@@ -589,8 +705,6 @@ const char * wpa_supplicant_get_eap_mode(struct wpa_supplicant *wpa_s);
 void wpa_supplicant_cancel_auth_timeout(struct wpa_supplicant *wpa_s);
 void wpa_supplicant_deauthenticate(struct wpa_supplicant *wpa_s,
                                   int reason_code);
-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);
@@ -604,16 +718,20 @@ int wpa_supplicant_set_bss_expiration_age(struct wpa_supplicant *wpa_s,
                                          unsigned int expire_age);
 int wpa_supplicant_set_bss_expiration_count(struct wpa_supplicant *wpa_s,
                                            unsigned int expire_count);
+int wpa_supplicant_set_scan_interval(struct wpa_supplicant *wpa_s,
+                                    int scan_interval);
 int wpa_supplicant_set_debug_params(struct wpa_global *global,
                                    int debug_level, int debug_timestamp,
                                    int debug_show_keys);
+void free_hw_features(struct wpa_supplicant *wpa_s);
 
 void wpa_show_license(void);
 
 struct wpa_supplicant * wpa_supplicant_add_iface(struct wpa_global *global,
                                                 struct wpa_interface *iface);
 int wpa_supplicant_remove_iface(struct wpa_global *global,
-                               struct wpa_supplicant *wpa_s);
+                               struct wpa_supplicant *wpa_s,
+                               int terminate);
 struct wpa_supplicant * wpa_supplicant_get_iface(struct wpa_global *global,
                                                 const char *ifname);
 struct wpa_global * wpa_supplicant_init(struct wpa_params *params);
@@ -629,17 +747,57 @@ enum wpa_key_mgmt key_mgmt2driver(int key_mgmt);
 enum wpa_cipher cipher_suite2driver(int cipher);
 void wpa_supplicant_update_config(struct wpa_supplicant *wpa_s);
 void wpa_supplicant_clear_status(struct wpa_supplicant *wpa_s);
-void ieee80211_sta_free_hw_features(struct hostapd_hw_modes *hw_features,
-                                   size_t num_hw_features);
 void wpas_connection_failed(struct wpa_supplicant *wpa_s, const u8 *bssid);
+int wpas_driver_bss_selection(struct wpa_supplicant *wpa_s);
+int wpas_is_p2p_prioritized(struct wpa_supplicant *wpa_s);
+void wpas_auth_failed(struct wpa_supplicant *wpa_s);
+void wpas_clear_temp_disabled(struct wpa_supplicant *wpa_s,
+                             struct wpa_ssid *ssid, int clear_failures);
+int disallowed_bssid(struct wpa_supplicant *wpa_s, const u8 *bssid);
+int disallowed_ssid(struct wpa_supplicant *wpa_s, const u8 *ssid,
+                   size_t ssid_len);
+void wpas_request_connection(struct wpa_supplicant *wpa_s);
+
+/**
+ * wpa_supplicant_ctrl_iface_ctrl_rsp_handle - Handle a control response
+ * @wpa_s: Pointer to wpa_supplicant data
+ * @ssid: Pointer to the network block the reply is for
+ * @field: field the response is a reply for
+ * @value: value (ie, password, etc) for @field
+ * Returns: 0 on success, non-zero on error
+ *
+ * Helper function to handle replies to control interface requests.
+ */
+int wpa_supplicant_ctrl_iface_ctrl_rsp_handle(struct wpa_supplicant *wpa_s,
+                                             struct wpa_ssid *ssid,
+                                             const char *field,
+                                             const char *value);
 
 /* events.c */
 void wpa_supplicant_mark_disassoc(struct wpa_supplicant *wpa_s);
-void wpa_supplicant_connect(struct wpa_supplicant *wpa_s,
-                           struct wpa_bss *selected,
-                           struct wpa_ssid *ssid);
+int wpa_supplicant_connect(struct wpa_supplicant *wpa_s,
+                          struct wpa_bss *selected,
+                          struct wpa_ssid *ssid);
+void wpa_supplicant_stop_countermeasures(void *eloop_ctx, void *sock_ctx);
+void wpa_supplicant_delayed_mic_error_report(void *eloop_ctx, void *sock_ctx);
+void wnm_bss_keep_alive_deinit(struct wpa_supplicant *wpa_s);
+int wpas_select_network_from_last_scan(struct wpa_supplicant *wpa_s);
 
 /* eap_register.c */
 int eap_register_methods(void);
 
+/**
+ * Utility method to tell if a given network is a persistent group
+ * @ssid: Network object
+ * Returns: 1 if network is a persistent group, 0 otherwise
+ */
+static inline int network_is_persistent_group(struct wpa_ssid *ssid)
+{
+       return ((ssid->disabled == 2) || ssid->p2p_persistent_group);
+}
+
+int wpas_network_disabled(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid);
+
+int wpas_init_ext_pw(struct wpa_supplicant *wpa_s);
+
 #endif /* WPA_SUPPLICANT_I_H */