scan: Add MAC address randomization in scan handling

[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 e122b74..c541ccb 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -15,6 +15,7 @@
 #include "common/wpa_ctrl.h"
 #include "wps/wps_defs.h"
 #include "config_ssid.h"
+#include "wmm_ac.h"
 
 extern const char *wpa_supplicant_version;
 extern const char *wpa_supplicant_license;
@@ -321,10 +322,12 @@ void radio_work_done(struct wpa_radio_work *work);
 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_radio_work *
+radio_work_pending(struct wpa_supplicant *wpa_s, const char *type);
 
 struct wpa_connect_work {
        unsigned int sme:1;
+       unsigned int bss_removed:1;
        struct wpa_bss *bss;
        struct wpa_ssid *ssid;
 };
@@ -375,6 +378,31 @@ struct wpa_used_freq_data {
        unsigned int flags;
 };
 
+#define RRM_NEIGHBOR_REPORT_TIMEOUT 1 /* 1 second for AP to send a report */
+
+/*
+ * struct rrm_data - Data used for managing RRM features
+ */
+struct rrm_data {
+       /* rrm_used - indication regarding the current connection */
+       unsigned int rrm_used:1;
+
+       /*
+        * notify_neighbor_rep - Callback for notifying report requester
+        */
+       void (*notify_neighbor_rep)(void *ctx, struct wpabuf *neighbor_rep);
+
+       /*
+        * neighbor_rep_cb_ctx - Callback context
+        * Received in the callback registration, and sent to the callback
+        * function as a parameter.
+        */
+       void *neighbor_rep_cb_ctx;
+
+       /* next_neighbor_rep_token - Next request's dialog token */
+       u8 next_neighbor_rep_token;
+};
+
 /**
  * struct wpa_supplicant - Internal data for wpa_supplicant interface
  *
@@ -416,6 +444,7 @@ struct wpa_supplicant {
        u8 pending_bssid[ETH_ALEN]; /* If wpa_state == WPA_ASSOCIATING, this
                                     * field contains the target BSSID. */
        int reassociate; /* reassociation requested */
+       int reassoc_same_bss; /* reassociating to the same bss */
        int disconnected; /* all connections disabled; i.e., do no reassociate
                           * before this has been cleared */
        struct wpa_ssid *current_ssid;
@@ -575,6 +604,7 @@ struct wpa_supplicant {
        u64 drv_flags;
        unsigned int drv_enc;
        unsigned int drv_smps_modes;
+       unsigned int drv_rrm_flags;
 
        /*
         * A bitmap of supported protocols for probe response offload. See
@@ -646,6 +676,9 @@ struct wpa_supplicant {
                                        * SA Query transaction identifiers */
                struct os_reltime sa_query_start;
                struct os_reltime last_unprot_disconnect;
+               enum { HT_SEC_CHAN_UNKNOWN,
+                      HT_SEC_CHAN_ABOVE,
+                      HT_SEC_CHAN_BELOW } ht_sec_chan;
                u8 sched_obss_scan;
                u16 obss_scan_int;
                u16 bss_max_idle_period;
@@ -666,6 +699,11 @@ struct wpa_supplicant {
 #endif /* CONFIG_AP */
 
        struct hostapd_iface *ifmsh;
+#ifdef CONFIG_MESH
+       struct mesh_rsn *mesh_rsn;
+       int mesh_if_idx;
+       unsigned int mesh_if_created:1;
+#endif /* CONFIG_MESH */
 
        unsigned int off_channel_freq;
        struct wpabuf *pending_action_tx;
@@ -820,6 +858,7 @@ struct wpa_supplicant {
        unsigned int auto_network_select:1;
        unsigned int fetch_all_anqp:1;
        unsigned int fetch_osu_info:1;
+       unsigned int fetch_osu_waiting_scan:1;
        unsigned int fetch_osu_icon_in_progress:1;
        struct wpa_bss *interworking_gas_bss;
        unsigned int osu_icon_id;
@@ -855,6 +894,22 @@ struct wpa_supplicant {
        unsigned int no_keep_alive:1;
        unsigned int ext_mgmt_frame_handling:1;
        unsigned int ext_eapol_frame_io:1;
+       unsigned int wmm_ac_supported:1;
+       unsigned int ext_work_in_progress:1;
+
+#define MAC_ADDR_RAND_SCAN       BIT(0)
+#define MAC_ADDR_RAND_SCHED_SCAN BIT(1)
+#define MAC_ADDR_RAND_PNO        BIT(2)
+#define MAC_ADDR_RAND_ALL        (MAC_ADDR_RAND_SCAN | \
+                                 MAC_ADDR_RAND_SCHED_SCAN | \
+                                 MAC_ADDR_RAND_PNO)
+       unsigned int mac_addr_rand_supported;
+       unsigned int mac_addr_rand_enable;
+
+       /* MAC Address followed by mask (2 * ETH_ALEN) */
+       u8 *mac_addr_scan;
+       u8 *mac_addr_sched_scan;
+       u8 *mac_addr_pno;
 
 #ifdef CONFIG_WNM
        u8 wnm_dialog_token;
@@ -862,9 +917,10 @@ struct wpa_supplicant {
        u8 wnm_num_neighbor_report;
        u8 wnm_mode;
        u16 wnm_dissoc_timer;
-       u8 wnm_validity_interval;
        u8 wnm_bss_termination_duration[12];
        struct neighbor_report *wnm_neighbor_report_elements;
+       struct os_reltime wnm_cand_valid_until;
+       u8 wnm_cand_from_bss[ETH_ALEN];
 #endif /* CONFIG_WNM */
 
 #ifdef CONFIG_TESTING_GET_GTK
@@ -883,6 +939,15 @@ struct wpa_supplicant {
        struct l2_packet_data *l2_test;
        unsigned int extra_roc_dur;
 #endif /* CONFIG_TESTING_OPTIONS */
+
+       struct wmm_ac_assoc_data *wmm_ac_assoc_info;
+       struct wmm_tspec_element *tspecs[WMM_AC_NUM][TS_DIR_IDX_COUNT];
+       struct wmm_ac_addts_request *addts_request;
+       u8 wmm_ac_last_dialog_token;
+       struct wmm_tspec_element *last_tspecs;
+       u8 last_tspecs_count;
+
+       struct rrm_data rrm;
 };
 
 
@@ -979,6 +1044,20 @@ void wpas_request_connection(struct wpa_supplicant *wpa_s);
 int wpas_build_ext_capab(struct wpa_supplicant *wpa_s, u8 *buf, size_t buflen);
 int wpas_update_random_addr(struct wpa_supplicant *wpa_s, int style);
 int wpas_update_random_addr_disassoc(struct wpa_supplicant *wpa_s);
+void add_freq(int *freqs, int *num_freqs, int freq);
+
+void wpas_rrm_reset(struct wpa_supplicant *wpa_s);
+void wpas_rrm_process_neighbor_rep(struct wpa_supplicant *wpa_s,
+                                  const u8 *report, size_t report_len);
+int wpas_rrm_send_neighbor_rep_request(struct wpa_supplicant *wpa_s,
+                                      const struct wpa_ssid *ssid,
+                                      void (*cb)(void *ctx,
+                                                 struct wpabuf *neighbor_rep),
+                                      void *cb_ctx);
+void wpas_rrm_handle_link_measurement_request(struct wpa_supplicant *wpa_s,
+                                             const u8 *src,
+                                             const u8 *frame, size_t len,
+                                             int rssi);
 
 /**
  * wpa_supplicant_ctrl_iface_ctrl_rsp_handle - Handle a control response