P2P: Fix PBC overlap detection

[mech_eap.git] / wpa_supplicant / wpa_supplicant_i.h

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index c541ccb..8ace44f 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -17,14 +17,14 @@
 #include "config_ssid.h"
 #include "wmm_ac.h"
 
-extern const char *wpa_supplicant_version;
-extern const char *wpa_supplicant_license;
+extern const char *const wpa_supplicant_version;
+extern const char *const wpa_supplicant_license;
 #ifndef CONFIG_NO_STDOUT_DEBUG
-extern const char *wpa_supplicant_full_license1;
-extern const char *wpa_supplicant_full_license2;
-extern const char *wpa_supplicant_full_license3;
-extern const char *wpa_supplicant_full_license4;
-extern const char *wpa_supplicant_full_license5;
+extern const char *const wpa_supplicant_full_license1;
+extern const char *const wpa_supplicant_full_license2;
+extern const char *const wpa_supplicant_full_license3;
+extern const char *const wpa_supplicant_full_license4;
+extern const char *const wpa_supplicant_full_license5;
 #endif /* CONFIG_NO_STDOUT_DEBUG */
 
 struct wpa_sm;
@@ -275,6 +275,8 @@ struct wpa_global {
        unsigned int p2p_per_sta_psk:1;
        unsigned int p2p_fail_on_wps_complete:1;
        unsigned int p2p_24ghz_social_channels:1;
+       unsigned int pending_p2ps_group:1;
+       unsigned int pending_group_iface_for_p2ps:1;
 
 #ifdef CONFIG_WIFI_DISPLAY
        int wifi_display;
@@ -296,6 +298,7 @@ struct wpa_global {
 struct wpa_radio {
        char name[16]; /* from driver_ops get_radio_name() or empty if not
                        * available */
+       unsigned int external_scan_running:1;
        struct dl_list ifaces; /* struct wpa_supplicant::radio_list entries */
        struct dl_list work; /* struct wpa_radio_work::list entries */
 };
@@ -363,10 +366,12 @@ struct wps_ap_info {
        } type;
        unsigned int tries;
        struct os_reltime last_attempt;
+       unsigned int pbc_active;
+       u8 uuid[WPS_UUID_LEN];
 };
 
 struct wpa_ssid_value {
-       u8 ssid[32];
+       u8 ssid[SSID_MAX_LEN];
        size_t ssid_len;
 };
 
@@ -403,6 +408,11 @@ struct rrm_data {
        u8 next_neighbor_rep_token;
 };
 
+enum wpa_supplicant_test_failure {
+       WPAS_TEST_FAILURE_NONE,
+       WPAS_TEST_FAILURE_SCAN_TRIGGER,
+};
+
 /**
  * struct wpa_supplicant - Internal data for wpa_supplicant interface
  *
@@ -510,7 +520,7 @@ struct wpa_supplicant {
        unsigned int last_scan_res_size;
        struct os_reltime last_scan;
 
-       struct wpa_driver_ops *driver;
+       const struct wpa_driver_ops *driver;
        int interface_removed; /* whether the network interface has been
                                * removed */
        struct wpa_sm *wpa;
@@ -580,6 +590,7 @@ struct wpa_supplicant {
                 */
                MANUAL_SCAN_REQ
        } scan_req, last_scan_req;
+       enum wpa_states scan_prev_wpa_state;
        struct os_reltime scan_trigger_time, scan_start_time;
        int scan_runs; /* number of scan runs since WPS was started */
        int *next_scan_freqs;
@@ -590,7 +601,6 @@ struct wpa_supplicant {
        unsigned int manual_scan_only_new:1;
        unsigned int own_scan_requested:1;
        unsigned int own_scan_running:1;
-       unsigned int external_scan_running:1;
        unsigned int clear_driver_scan_cache:1;
        unsigned int manual_scan_id;
        int scan_interval; /* time in sec between scans to find suitable AP */
@@ -601,6 +611,9 @@ struct wpa_supplicant {
        int scan_id[MAX_SCAN_ID];
        unsigned int scan_id_count;
 
+       struct wpa_ssid_value *ssids_from_scan_req;
+       unsigned int num_ssids_from_scan_req;
+
        u64 drv_flags;
        unsigned int drv_enc;
        unsigned int drv_smps_modes;
@@ -631,6 +644,7 @@ struct wpa_supplicant {
        int wps_success; /* WPS success event received */
        struct wps_er *wps_er;
        unsigned int wps_run;
+       struct os_reltime wps_pin_start_time;
        int blacklist_cleared;
 
        struct wpabuf *pending_eapol_rx;
@@ -640,6 +654,7 @@ struct wpa_supplicant {
        unsigned int eap_expected_failure:1;
        unsigned int reattach:1; /* reassociation to the same BSS requested */
        unsigned int mac_addr_changed:1;
+       unsigned int added_vif:1;
 
        struct os_reltime last_mac_addr_change;
        int last_mac_addr_style;
@@ -653,7 +668,7 @@ struct wpa_supplicant {
 
 #ifdef CONFIG_SME
        struct {
-               u8 ssid[32];
+               u8 ssid[SSID_MAX_LEN];
                size_t ssid_len;
                int freq;
                u8 assoc_req_ie[200];
@@ -703,6 +718,8 @@ struct wpa_supplicant {
        struct mesh_rsn *mesh_rsn;
        int mesh_if_idx;
        unsigned int mesh_if_created:1;
+       unsigned int mesh_ht_enabled:1;
+       int mesh_auth_block_duration; /* sec */
 #endif /* CONFIG_MESH */
 
        unsigned int off_channel_freq;
@@ -726,7 +743,6 @@ struct wpa_supplicant {
        int p2p_mgmt;
 
 #ifdef CONFIG_P2P
-       struct wpa_supplicant *p2p_dev;
        struct p2p_go_neg_results *go_params;
        int create_p2p_iface;
        u8 pending_interface_addr[ETH_ALEN];
@@ -757,14 +773,14 @@ 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];
+       u8 p2p_join_ssid[SSID_MAX_LEN];
        size_t p2p_join_ssid_len;
        int p2p_join_scan_count;
        int auto_pd_scan_retry;
        int force_long_sd;
        u16 pending_pd_config_methods;
        enum {
-               NORMAL_PD, AUTO_PD_GO_NEG, AUTO_PD_JOIN
+               NORMAL_PD, AUTO_PD_GO_NEG, AUTO_PD_JOIN, AUTO_PD_ASP
        } pending_pd_use;
 
        /*
@@ -803,6 +819,8 @@ struct wpa_supplicant {
        unsigned int p2p_nfc_tag_enabled:1;
        unsigned int p2p_peer_oob_pk_hash_known:1;
        unsigned int p2p_disable_ip_addr_req:1;
+       unsigned int p2ps_join_addr_valid:1;
+       unsigned int p2p_cli_probe:1;
        int p2p_persistent_go_freq;
        int p2p_persistent_id;
        int p2p_go_intent;
@@ -822,6 +840,7 @@ struct wpa_supplicant {
        /* group common frequencies */
        int *p2p_group_common_freqs;
        unsigned int p2p_group_common_freqs_num;
+       u8 p2ps_join_addr[ETH_ALEN];
 #endif /* CONFIG_P2P */
 
        struct wpa_ssid *bgscan_ssid;
@@ -856,6 +875,7 @@ struct wpa_supplicant {
        unsigned int network_select:1;
        unsigned int auto_select:1;
        unsigned int auto_network_select:1;
+       unsigned int interworking_fast_assoc_tried:1;
        unsigned int fetch_all_anqp:1;
        unsigned int fetch_osu_info:1;
        unsigned int fetch_osu_waiting_scan:1;
@@ -875,6 +895,12 @@ struct wpa_supplicant {
                u16 num_modes;
                u16 flags;
        } hw;
+       enum local_hw_capab {
+               CAPAB_NO_HT_VHT,
+               CAPAB_HT,
+               CAPAB_HT40,
+               CAPAB_VHT,
+       } hw_capab;
 #ifdef CONFIG_MACSEC
        struct ieee802_1x_kay *kay;
 #endif /* CONFIG_MACSEC */
@@ -896,6 +922,7 @@ struct wpa_supplicant {
        unsigned int ext_eapol_frame_io:1;
        unsigned int wmm_ac_supported:1;
        unsigned int ext_work_in_progress:1;
+       unsigned int own_disconnect_req:1;
 
 #define MAC_ADDR_RAND_SCAN       BIT(0)
 #define MAC_ADDR_RAND_SCHED_SCAN BIT(1)
@@ -938,6 +965,7 @@ struct wpa_supplicant {
 #ifdef CONFIG_TESTING_OPTIONS
        struct l2_packet_data *l2_test;
        unsigned int extra_roc_dur;
+       enum wpa_supplicant_test_failure test_failure;
 #endif /* CONFIG_TESTING_OPTIONS */
 
        struct wmm_ac_assoc_data *wmm_ac_assoc_info;
@@ -1014,7 +1042,8 @@ 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);
+                                                struct wpa_interface *iface,
+                                                struct wpa_supplicant *parent);
 int wpa_supplicant_remove_iface(struct wpa_global *global,
                                struct wpa_supplicant *wpa_s,
                                int terminate);
@@ -1074,6 +1103,10 @@ int wpa_supplicant_ctrl_iface_ctrl_rsp_handle(struct wpa_supplicant *wpa_s,
                                              const char *field,
                                              const char *value);
 
+void ibss_mesh_setup_freq(struct wpa_supplicant *wpa_s,
+                         const struct wpa_ssid *ssid,
+                         struct hostapd_freq_params *freq);
+
 /* events.c */
 void wpa_supplicant_mark_disassoc(struct wpa_supplicant *wpa_s);
 int wpa_supplicant_connect(struct wpa_supplicant *wpa_s,
@@ -1090,16 +1123,17 @@ struct wpa_bss * wpa_supplicant_pick_network(struct wpa_supplicant *wpa_s,
 int eap_register_methods(void);
 
 /**
- * Utility method to tell if a given network is a persistent group
+ * Utility method to tell if a given network is for persistent group storage
  * @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);
+       return ssid->disabled == 2 && ssid->p2p_persistent_group;
 }
 
 int wpas_network_disabled(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid);
+int wpas_get_ssid_pmf(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid);
 
 int wpas_init_ext_pw(struct wpa_supplicant *wpa_s);
 
@@ -1113,4 +1147,5 @@ int get_shared_radio_freqs_data(struct wpa_supplicant *wpa_s,
 int get_shared_radio_freqs(struct wpa_supplicant *wpa_s,
                           int *freq_array, unsigned int len);
 
+void wpas_network_reenabled(void *eloop_ctx, void *timeout_ctx);
 #endif /* WPA_SUPPLICANT_I_H */