P2P: Iterate through full pref_chan list in search of a valid channel

[thirdparty/hostap.git] / wpa_supplicant / wpa_supplicant_i.h

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index b8f41c8155592ed8f2205466d7e199d7696c687d..a57f962de7baa8e9589ce19b81d3470380696882 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -12,6 +12,7 @@
 #include "utils/list.h"
 #include "common/defs.h"
 #include "common/sae.h"
+#include "wps/wps_defs.h"
 #include "config_ssid.h"
 
 extern const char *wpa_supplicant_version;
@@ -63,6 +64,17 @@ struct wpa_interface {
         */
        const char *confanother;
 
+#ifdef CONFIG_P2P
+       /**
+        * conf_p2p_dev - Additional configuration file used to hold the
+        * P2P Device configuration parameters.
+        *
+        * This can also be %NULL. In such a case, if a P2P Device dedicated
+        * interfaces is created, the main configuration file will be used.
+        */
+       const char *conf_p2p_dev;
+#endif /* CONFIG_P2P */
+
        /**
         * ctrl_interface - Control interface parameter
         *
@@ -252,12 +264,14 @@ struct wpa_global {
        int p2p_disabled;
        int cross_connection;
        struct wpa_freq_range_list p2p_disallow_freq;
+       struct wpa_freq_range_list p2p_go_avoid_freq;
        enum wpa_conc_pref {
                WPA_CONC_PREF_NOT_SET,
                WPA_CONC_PREF_STA,
                WPA_CONC_PREF_P2P
        } conc_pref;
        unsigned int p2p_per_sta_psk:1;
+       unsigned int p2p_fail_on_wps_complete:1;
 
 #ifdef CONFIG_WIFI_DISPLAY
        int wifi_display;
@@ -302,8 +316,10 @@ int radio_add_work(struct wpa_supplicant *wpa_s, unsigned int freq,
                   void (*cb)(struct wpa_radio_work *work, int deinit),
                   void *ctx);
 void radio_work_done(struct wpa_radio_work *work);
-void radio_remove_unstarted_work(struct wpa_supplicant *wpa_s,
-                                const char *type);
+void radio_remove_works(struct wpa_supplicant *wpa_s,
+                       const char *type, int remove_all);
+void radio_work_check_next(struct wpa_supplicant *wpa_s);
+int radio_work_pending(struct wpa_supplicant *wpa_s, const char *type);
 
 struct wpa_connect_work {
        unsigned int sme:1;
@@ -316,6 +332,12 @@ int wpas_valid_bss_ssid(struct wpa_supplicant *wpa_s, struct wpa_bss *test_bss,
 void wpas_connect_work_free(struct wpa_connect_work *cwork);
 void wpas_connect_work_done(struct wpa_supplicant *wpa_s);
 
+struct wpa_external_work {
+       unsigned int id;
+       char type[100];
+       unsigned int timeout;
+};
+
 /**
  * offchannel_send_action_result - Result of offchannel send Action frame
  */
@@ -375,6 +397,11 @@ struct wpa_supplicant {
 
        char *confname;
        char *confanother;
+
+#ifdef CONFIG_P2P
+       char *conf_p2p_dev;
+#endif /* CONFIG_P2P */
+
        struct wpa_config *conf;
        int countermeasures;
        struct os_reltime last_michael_mic_error;
@@ -409,6 +436,9 @@ struct wpa_supplicant {
 
        enum { WPA_SETBAND_AUTO, WPA_SETBAND_5G, WPA_SETBAND_2G } setband;
 
+       /* Preferred network for the next connection attempt */
+       struct wpa_ssid *next_ssid;
+
        /* previous scan was wildcard when interleaving between
         * wildcard scans and specific SSID scan when max_ssids=1 */
        int prev_scan_wildcard;
@@ -517,6 +547,7 @@ struct wpa_supplicant {
        int scan_runs; /* number of scan runs since WPS was started */
        int *next_scan_freqs;
        int *manual_scan_freqs;
+       int *manual_sched_scan_freqs;
        unsigned int manual_scan_passive:1;
        unsigned int manual_scan_use_id:1;
        unsigned int manual_scan_only_new:1;
@@ -563,6 +594,8 @@ struct wpa_supplicant {
        struct os_reltime pending_eapol_rx_time;
        u8 pending_eapol_rx_src[ETH_ALEN];
        unsigned int last_eapol_matches_bssid:1;
+       unsigned int eap_expected_failure:1;
+       unsigned int reattach:1; /* reassociation to the same BSS requested */
 
        struct ibss_rsn *ibss_rsn;
 
@@ -654,6 +687,8 @@ struct wpa_supplicant {
        u8 p2p_auth_invite[ETH_ALEN];
        int p2p_sd_over_ctrl_iface;
        int p2p_in_provisioning;
+       int p2p_in_invitation;
+       int p2p_invite_go_freq;
        int pending_invite_ssid_id;
        int show_group_started;
        u8 go_dev_addr[ETH_ALEN];
@@ -661,6 +696,8 @@ struct wpa_supplicant {
        u8 pending_join_iface_addr[ETH_ALEN];
        u8 pending_join_dev_addr[ETH_ALEN];
        int pending_join_wps_method;
+       u8 p2p_join_ssid[32];
+       size_t p2p_join_ssid_len;
        int p2p_join_scan_count;
        int auto_pd_scan_retry;
        int force_long_sd;
@@ -701,6 +738,9 @@ struct wpa_supplicant {
        unsigned int p2p_go_group_formation_completed:1;
        unsigned int waiting_presence_resp;
        int p2p_first_connection_timeout;
+       unsigned int p2p_nfc_tag_enabled:1;
+       unsigned int p2p_peer_oob_pk_hash_known:1;
+       unsigned int p2p_disable_ip_addr_req:1;
        int p2p_persistent_go_freq;
        int p2p_persistent_id;
        int p2p_go_intent;
@@ -710,6 +750,12 @@ struct wpa_supplicant {
        struct wpa_radio_work *p2p_scan_work;
        struct wpa_radio_work *p2p_listen_work;
        struct wpa_radio_work *p2p_send_action_work;
+
+       u16 p2p_oob_dev_pw_id; /* OOB Device Password Id for group formation */
+       struct wpabuf *p2p_oob_dev_pw; /* OOB Device Password for group
+                                       * formation */
+       u8 p2p_peer_oob_pubkey_hash[WPS_OOB_PUBKEY_HASH_LEN];
+       u8 p2p_ip_addr_info[3 * 4];
 #endif /* CONFIG_P2P */
 
        struct wpa_ssid *bgscan_ssid;
@@ -729,7 +775,6 @@ struct wpa_supplicant {
        int after_wps;
        int known_wps_freq;
        unsigned int wps_freq;
-       u16 wps_ap_channel;
        int wps_fragment_size;
        int auto_reconnect_disabled;
 
@@ -746,7 +791,15 @@ struct wpa_supplicant {
        unsigned int auto_select:1;
        unsigned int auto_network_select:1;
        unsigned int fetch_all_anqp:1;
+       unsigned int fetch_osu_info:1;
+       unsigned int fetch_osu_icon_in_progress:1;
        struct wpa_bss *interworking_gas_bss;
+       unsigned int osu_icon_id;
+       struct osu_provider *osu_prov;
+       size_t osu_prov_count;
+       struct os_reltime osu_icon_fetch_start;
+       unsigned int num_osu_scans;
+       unsigned int num_prov_found;
 #endif /* CONFIG_INTERWORKING */
        unsigned int drv_capa_known;
 
@@ -755,19 +808,24 @@ struct wpa_supplicant {
                u16 num_modes;
                u16 flags;
        } hw;
+#ifdef CONFIG_MACSEC
+       struct ieee802_1x_kay *kay;
+#endif /* CONFIG_MACSEC */
 
        int pno;
+       int pno_sched_pending;
 
        /* 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;
+       struct wpabuf *last_gas_resp, *prev_gas_resp;
+       u8 last_gas_addr[ETH_ALEN], prev_gas_addr[ETH_ALEN];
+       u8 last_gas_dialog_token, prev_gas_dialog_token;
 
        unsigned int no_keep_alive:1;
+       unsigned int ext_mgmt_frame_handling:1;
 
 #ifdef CONFIG_WNM
        u8 wnm_dialog_token;
@@ -787,6 +845,8 @@ struct wpa_supplicant {
 
        unsigned int num_multichan_concurrent;
        struct wpa_radio_work *connect_work;
+
+       unsigned int ext_work_id;
 };
 
 
@@ -881,7 +941,6 @@ int disallowed_ssid(struct wpa_supplicant *wpa_s, const u8 *ssid,
                    size_t ssid_len);
 void wpas_request_connection(struct wpa_supplicant *wpa_s);
 int wpas_build_ext_capab(struct wpa_supplicant *wpa_s, u8 *buf);
-int wpas_wpa_is_in_progress(struct wpa_supplicant *wpa_s, int include_current);
 
 /**
  * wpa_supplicant_ctrl_iface_ctrl_rsp_handle - Handle a control response