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 1b9753c..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;
@@ -366,6 +366,8 @@ 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 {
@@ -518,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;
@@ -609,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;
@@ -639,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;
@@ -737,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];
@@ -815,6 +820,7 @@ struct wpa_supplicant {
        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;
@@ -1117,13 +1123,13 @@ 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);