Remove deprecated text for ap_scan=0

[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 32f390fd9864b89854661171f6004c409e91c382..7ab6ca377779c483c0bad6bf0308dc5d50807130 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -47,6 +47,9 @@ struct ctrl_iface_global_priv;
 struct wpas_dbus_priv;
 struct wpas_binder_priv;
 
+/* How many seconds to consider old scan results valid for association. */
+#define SCAN_RES_VALID_FOR_CONNECT 5
+
 /**
  * struct wpa_interface - Parameters for wpa_supplicant_add_iface()
  */
@@ -280,6 +283,7 @@ struct wpa_global {
        struct dl_list p2p_srv_upnp; /* struct p2p_srv_upnp */
        int p2p_disabled;
        int cross_connection;
+       int p2p_long_listen; /* remaining time in long Listen state in ms */
        struct wpa_freq_range_list p2p_disallow_freq;
        struct wpa_freq_range_list p2p_go_avoid_freq;
        enum wpa_conc_pref {
@@ -477,6 +481,16 @@ struct fils_hlp_req {
        struct wpabuf *pkt;
 };
 
+struct driver_signal_override {
+       struct dl_list list;
+       u8 bssid[ETH_ALEN];
+       int si_current_signal;
+       int si_avg_signal;
+       int si_avg_beacon_signal;
+       int si_current_noise;
+       int scan_level;
+};
+
 /**
  * struct wpa_supplicant - Internal data for wpa_supplicant interface
  *
@@ -614,6 +628,9 @@ struct wpa_supplicant {
        int eapol_received; /* number of EAPOL packets received after the
                             * previous association event */
 
+       u8 rsnxe[20];
+       size_t rsnxe_len;
+
        struct scard_data *scard;
        char imsi[20];
        int mnc_len;
@@ -700,6 +717,10 @@ struct wpa_supplicant {
 
        struct wpa_ssid_value *ssids_from_scan_req;
        unsigned int num_ssids_from_scan_req;
+       int *last_scan_freqs;
+       unsigned int num_last_scan_freqs;
+       unsigned int suitable_network;
+       unsigned int no_suitable_network;
 
        u64 drv_flags;
        unsigned int drv_enc;
@@ -752,6 +773,7 @@ struct wpa_supplicant {
        unsigned int connection_ht:1;
        unsigned int connection_vht:1;
        unsigned int connection_he:1;
+       unsigned int disable_mbo_oce:1;
 
        struct os_reltime last_mac_addr_change;
        int last_mac_addr_style;
@@ -805,6 +827,7 @@ struct wpa_supplicant {
                u8 ext_auth_bssid[ETH_ALEN];
                u8 ext_auth_ssid[SSID_MAX_LEN];
                size_t ext_auth_ssid_len;
+               int *sae_rejected_groups;
 #endif /* CONFIG_SAE */
        } sme;
 #endif /* CONFIG_SME */
@@ -868,7 +891,6 @@ struct wpa_supplicant {
                P2P_GROUP_INTERFACE_CLIENT
        } p2p_group_interface;
        struct p2p_group *p2p_group;
-       int p2p_long_listen; /* remaining time in long Listen state in ms */
        char p2p_pin[10];
        int p2p_wps_method;
        u8 p2p_auth_invite[ETH_ALEN];
@@ -922,6 +944,7 @@ struct wpa_supplicant {
        unsigned int p2p_pd_before_go_neg:1;
        unsigned int p2p_go_ht40:1;
        unsigned int p2p_go_vht:1;
+       unsigned int p2p_go_edmg:1;
        unsigned int p2p_go_he:1;
        unsigned int user_initiated_pd:1;
        unsigned int p2p_go_group_formation_completed:1;
@@ -1108,6 +1131,7 @@ struct wpa_supplicant {
        unsigned int ignore_auth_resp:1;
        unsigned int ignore_assoc_disallow:1;
        unsigned int testing_resend_assoc:1;
+       unsigned int ignore_sae_h2e_only:1;
        struct wpabuf *sae_commit_override;
        enum wpa_alg last_tk_alg;
        u8 last_tk_addr[ETH_ALEN];
@@ -1115,6 +1139,10 @@ struct wpa_supplicant {
        u8 last_tk[WPA_TK_MAX_LEN];
        size_t last_tk_len;
        struct wpabuf *last_assoc_req_wpa_ie;
+       int *extra_sae_rejected_groups;
+       struct wpabuf *rsnxe_override_assoc;
+       struct wpabuf *rsnxe_override_eapol;
+       struct dl_list drv_signal_override;
 #endif /* CONFIG_TESTING_OPTIONS */
 
        struct wmm_ac_assoc_data *wmm_ac_assoc_info;
@@ -1217,7 +1245,7 @@ struct wpa_supplicant {
        unsigned int dpp_listen_freq;
        u8 dpp_allowed_roles;
        int dpp_qr_mutual;
-       int dpp_netrole_ap;
+       int dpp_netrole;
        int dpp_auth_ok_on_ack;
        int dpp_in_response_listen;
        int dpp_gas_client;
@@ -1237,6 +1265,8 @@ struct wpa_supplicant {
        unsigned int dpp_resp_wait_time;
        unsigned int dpp_resp_max_tries;
        unsigned int dpp_resp_retry_time;
+       u8 dpp_last_ssid[SSID_MAX_LEN];
+       size_t dpp_last_ssid_len;
 #ifdef CONFIG_DPP2
        struct dpp_pfs *dpp_pfs;
 #endif /* CONFIG_DPP2 */
@@ -1383,6 +1413,7 @@ int wpas_beacon_rep_scan_process(struct wpa_supplicant *wpa_s,
                                 struct scan_info *info);
 void wpas_clear_beacon_rep_data(struct wpa_supplicant *wpa_s);
 void wpas_flush_fils_hlp_req(struct wpa_supplicant *wpa_s);
+void wpas_clear_disabled_interface(void *eloop_ctx, void *timeout_ctx);
 
 
 /* MBO functions */
@@ -1390,6 +1421,8 @@ int wpas_mbo_ie(struct wpa_supplicant *wpa_s, u8 *buf, size_t len,
                int add_oce_capa);
 const u8 * mbo_attr_from_mbo_ie(const u8 *mbo_ie, enum mbo_attr_id attr);
 const u8 * wpas_mbo_get_bss_attr(struct wpa_bss *bss, enum mbo_attr_id attr);
+void wpas_mbo_check_pmf(struct wpa_supplicant *wpa_s, struct wpa_bss *bss,
+                       struct wpa_ssid *ssid);
 const u8 * mbo_get_attr_from_ies(const u8 *ies, size_t ies_len,
                                 enum mbo_attr_id attr);
 int wpas_mbo_update_non_pref_chan(struct wpa_supplicant *wpa_s,
@@ -1413,11 +1446,12 @@ enum chan_allowed {
        NOT_ALLOWED, NO_IR, ALLOWED
 };
 
-enum chan_allowed verify_channel(struct hostapd_hw_modes *mode, u8 channel,
-                                u8 bw);
+enum chan_allowed verify_channel(struct hostapd_hw_modes *mode, u8 op_class,
+                                u8 channel, u8 bw);
 size_t wpas_supp_op_class_ie(struct wpa_supplicant *wpa_s,
                             struct wpa_ssid *ssid,
                             int freq, u8 *pos, size_t len);
+int * wpas_supp_op_classes(struct wpa_supplicant *wpa_s);
 
 int wpas_enable_mac_addr_randomization(struct wpa_supplicant *wpa_s,
                                       unsigned int type, const u8 *addr,
@@ -1547,4 +1581,6 @@ int wpas_ctrl_iface_get_pref_freq_list_override(struct wpa_supplicant *wpa_s,
 int wpa_is_fils_supported(struct wpa_supplicant *wpa_s);
 int wpa_is_fils_sk_pfs_supported(struct wpa_supplicant *wpa_s);
 
+void wpas_clear_driver_signal_override(struct wpa_supplicant *wpa_s);
+
 #endif /* WPA_SUPPLICANT_I_H */