Maintain a pointer to the current BSS table entry

[libeap.git] / wpa_supplicant / wpa_supplicant_i.h

diff --git a/wpa_supplicant/wpa_supplicant_i.h b/wpa_supplicant/wpa_supplicant_i.h
index 377f4c8..f86a172 100644 (file)
--- a/wpa_supplicant/wpa_supplicant_i.h
+++ b/wpa_supplicant/wpa_supplicant_i.h
@@ -1,6 +1,6 @@
 /*
  * wpa_supplicant - Internal definitions
- * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2003-2009, Jouni Malinen <j@w1.fi>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
@@ -15,6 +15,7 @@
 #ifndef WPA_SUPPLICANT_I_H
 #define WPA_SUPPLICANT_I_H
 
+#include "utils/list.h"
 #include "common/defs.h"
 
 extern const char *wpa_supplicant_version;
@@ -27,11 +28,11 @@ extern const char *wpa_supplicant_full_license4;
 extern const char *wpa_supplicant_full_license5;
 #endif /* CONFIG_NO_STDOUT_DEBUG */
 
-struct wpa_scan_result;
-struct wpa_scan_res;
 struct wpa_sm;
 struct wpa_supplicant;
 struct ibss_rsn;
+struct scan_info;
+struct wpa_bss;
 
 /*
  * Forward declarations of private structures used within the ctrl_iface
@@ -40,7 +41,7 @@ struct ibss_rsn;
  */
 struct ctrl_iface_priv;
 struct ctrl_iface_global_priv;
-struct ctrl_iface_dbus_priv;
+struct wpas_dbus_priv;
 
 /**
  * struct wpa_interface - Parameters for wpa_supplicant_add_iface()
@@ -190,10 +191,7 @@ struct wpa_global {
        struct wpa_supplicant *ifaces;
        struct wpa_params params;
        struct ctrl_iface_global_priv *ctrl_iface;
-       /* old DBus API data */
-       struct ctrl_iface_dbus_priv *dbus_ctrl_iface;
-       /* new DBus API data */
-       struct ctrl_iface_dbus_new_priv *dbus_new_ctrl_iface;
+       struct wpas_dbus_priv *dbus;
        void **drv_priv;
        size_t drv_count;
 };
@@ -215,7 +213,7 @@ struct wpa_client_mlme {
        size_t extra_ie_len;
        u8 *extra_probe_ie; /* to be added to the end of ProbeReq */
        size_t extra_probe_ie_len;
-       wpa_key_mgmt key_mgmt;
+       enum wpa_key_mgmt key_mgmt;
 
        /* The last AssocReq/Resp IEs */
        u8 *assocreq_ies, *assocresp_ies;
@@ -261,6 +259,7 @@ struct wpa_client_mlme {
        u8 scan_ssid[32];
        size_t scan_ssid_len;
        int scan_skip_11b;
+       int *scan_freqs;
 
        struct ieee80211_sta_bss *sta_bss_list;
 #define STA_HASH_SIZE 256
@@ -269,7 +268,7 @@ struct wpa_client_mlme {
 
        int cts_protect_erp_frames;
 
-       hostapd_hw_mode phymode; /* current mode */
+       enum hostapd_hw_mode phymode; /* current mode */
        struct hostapd_hw_modes *modes;
        size_t num_modes;
        unsigned int hw_modes; /* bitfield of allowed hardware modes;
@@ -324,7 +323,9 @@ struct wpa_supplicant {
        int disconnected; /* all connections disabled; i.e., do no reassociate
                           * before this has been cleared */
        struct wpa_ssid *current_ssid;
+       struct wpa_bss *current_bss;
        int ap_ies_from_associnfo;
+       unsigned int assoc_freq;
 
        /* Selected configuration (based on Beacon/ProbeResp WPA IE) */
        int pairwise_cipher;
@@ -343,7 +344,11 @@ struct wpa_supplicant {
                                          */
 #define WILDCARD_SSID_SCAN ((struct wpa_ssid *) 1)
 
-       struct wpa_scan_results *scan_res;
+       struct dl_list bss; /* struct wpa_bss::list */
+       struct dl_list bss_id; /* struct wpa_bss::list_id */
+       size_t num_bss;
+       unsigned int bss_update_idx;
+       unsigned int bss_next_id;
 
        struct wpa_driver_ops *driver;
        int interface_removed; /* whether the network interface has been
@@ -353,7 +358,7 @@ struct wpa_supplicant {
 
        struct ctrl_iface_priv *ctrl_iface;
 
-       wpa_states wpa_state;
+       enum wpa_states wpa_state;
        int scanning;
        int new_connection;
        int reassociated_connection;
@@ -428,23 +433,26 @@ int wpa_set_wep_keys(struct wpa_supplicant *wpa_s, struct wpa_ssid *ssid);
 
 int wpa_supplicant_reload_configuration(struct wpa_supplicant *wpa_s);
 
-const char * wpa_supplicant_state_txt(int state);
+const char * wpa_supplicant_state_txt(enum wpa_states state);
 int wpa_supplicant_driver_init(struct wpa_supplicant *wpa_s);
 int wpa_supplicant_set_suites(struct wpa_supplicant *wpa_s,
-                             struct wpa_scan_res *bss,
-                             struct wpa_ssid *ssid,
+                             struct wpa_bss *bss, struct wpa_ssid *ssid,
                              u8 *wpa_ie, size_t *wpa_ie_len);
 void wpa_supplicant_associate(struct wpa_supplicant *wpa_s,
-                             struct wpa_scan_res *bss,
+                             struct wpa_bss *bss,
                              struct wpa_ssid *ssid);
 void wpa_supplicant_set_non_wpa_policy(struct wpa_supplicant *wpa_s,
                                       struct wpa_ssid *ssid);
 void wpa_supplicant_initiate_eapol(struct wpa_supplicant *wpa_s);
-int wpa_supplicant_get_scan_results(struct wpa_supplicant *wpa_s);
+struct wpa_scan_results *
+wpa_supplicant_get_scan_results(struct wpa_supplicant *wpa_s,
+                               struct scan_info *info, int new_scan);
+int wpa_supplicant_update_scan_results(struct wpa_supplicant *wpa_s);
 void wpa_clear_keys(struct wpa_supplicant *wpa_s, const u8 *addr);
 void wpa_supplicant_req_auth_timeout(struct wpa_supplicant *wpa_s,
                                     int sec, int usec);
-void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s, wpa_states state);
+void wpa_supplicant_set_state(struct wpa_supplicant *wpa_s,
+                             enum wpa_states state);
 struct wpa_ssid * wpa_supplicant_get_ssid(struct wpa_supplicant *wpa_s);
 void wpa_supplicant_cancel_auth_timeout(struct wpa_supplicant *wpa_s);
 void wpa_supplicant_deauthenticate(struct wpa_supplicant *wpa_s,
@@ -478,6 +486,7 @@ void wpa_supplicant_deinit(struct wpa_global *global);
 
 int wpa_supplicant_scard_init(struct wpa_supplicant *wpa_s,
                              struct wpa_ssid *ssid);
+void wpa_supplicant_terminate_proc(struct wpa_global *global);
 
 /* scan.c */
 int wpa_supplicant_enabled_networks(struct wpa_config *conf);