Changeset 053fc2b in mainline for uspace/lib/ieee80211/include

Timestamp:

2015-04-10T13:52:11Z (10 years ago)

Author:

Jan Kolarik <kolarik@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a931b7b

Parents:

d7dadcb4

Message:

Locking, correctly disconnecting device, sending DHCP address discover after connecting to WiFi network

Location:

uspace/lib/ieee80211/include

Files:

• ieee80211.h (modified) (3 diffs)
• ieee80211_impl.h (modified) (1 diff)
• ieee80211_private.h (modified) (7 diffs)

uspace/lib/ieee80211/include/ieee80211.h

@@ -60 +60 @@
 #define IEEE80211_MAX_AMPDU_FACTOR 13
 
-/* Max passphrase length in WPA/WPA2 protocols. */
-#define IEEE80211_WPA_MAX_PASSWORD_LENGTH 64
+/* Max authentication password length. */
+#define IEEE80211_MAX_PASSW_LEN 64
 
 /** IEEE 802.11 b/g supported data rates in units of 500 kb/s. */
@@ -139 +139 @@
          * 
          * @param ieee80211_dev Pointer to IEEE 802.11 device structure.
-         * 
-         * @return EOK if succeed, negative error code otherwise.
-         */
-        int (*bssid_change)(struct ieee80211_dev *);
+         * @param connected True if connected to new BSSID, otherwise false.
+         * 
+         * @return EOK if succeed, negative error code otherwise.
+         */
+        int (*bssid_change)(struct ieee80211_dev *, bool);
         
         /**
@@ -181 +182 @@
         uint16_t freq);
 extern uint16_t ieee80211_get_aid(ieee80211_dev_t* ieee80211_dev);
-extern int ieee80211_get_security_suite(ieee80211_dev_t* ieee80211_dev);
+extern int ieee80211_get_pairwise_security(ieee80211_dev_t* ieee80211_dev);
 extern bool ieee80211_is_ready(ieee80211_dev_t* ieee80211_dev);
 extern void ieee80211_set_ready(ieee80211_dev_t* ieee80211_dev, bool ready);

uspace/lib/ieee80211/include/ieee80211_impl.h

@@ -47 +47 @@
 extern int ieee80211_set_freq_impl(ieee80211_dev_t *ieee80211_dev, 
         uint16_t freq);
-extern int ieee80211_bssid_change_impl(ieee80211_dev_t *ieee80211_dev);
+extern int ieee80211_bssid_change_impl(ieee80211_dev_t *ieee80211_dev,
+        bool connected);
 extern int ieee80211_key_config_impl(ieee80211_dev_t *ieee80211_dev,
         ieee80211_key_config_t *key_conf, bool insert);

uspace/lib/ieee80211/include/ieee80211_private.h

@@ -54 +54 @@
 #define HANDSHAKE_TIMEOUT 3000000
 
-/* Max period to rerun scan. */
-#define MAX_SCAN_SPAN_SEC 30
+/* Scanning period. */
+#define SCAN_PERIOD_USEC 35000000
+
+/* Time to wait for beacons on channel. */
+#define SCAN_CHANNEL_WAIT_USEC 200000
 
 /* Max time to keep scan result. */
@@ -187 +190 @@
         IEEE80211_AUTH_DISCONNECTED,
         IEEE80211_AUTH_AUTHENTICATED,
-        IEEE80211_AUTH_ASSOCIATED
+        IEEE80211_AUTH_ASSOCIATED,
+        IEEE80211_AUTH_CONNECTED
 } ieee80211_auth_phase_t;
 
@@ -202 +206 @@
 typedef struct {
         list_t list;
-        time_t last_scan;
-        fibril_mutex_t scan_mutex;
+        fibril_mutex_t results_mutex;
         size_t size;
 } ieee80211_scan_result_list_t;
@@ -210 +213 @@
 typedef struct {
         uint16_t aid;
-        char password[IEEE80211_WPA_MAX_PASSWORD_LENGTH];
+        char password[IEEE80211_MAX_PASSW_LEN];
         uint8_t ptk[MAX_PTK_LENGTH];
         uint8_t gtk[MAX_GTK_LENGTH];
@@ -256 +259 @@
         /** Current authentication phase. */
         ieee80211_auth_phase_t current_auth_phase;
+        
+        /** Flag indicating whether client wants connect to network. */
+        bool pending_conn_req;
+        
+        /** Scanning guard. */
+        fibril_mutex_t scan_mutex;
         
         /** General purpose guard. */
@@ -368 +377 @@
 {
         list_initialize(&results->list);
-        fibril_mutex_initialize(&results->scan_mutex);
+        fibril_mutex_initialize(&results->results_mutex);
 }
 
@@ -387 +396 @@
 }
 
+extern void ieee80211_set_connect_request(ieee80211_dev_t *ieee80211_dev);
+extern bool ieee80211_pending_connect_request(ieee80211_dev_t *ieee80211_dev);
+extern ieee80211_auth_phase_t ieee80211_get_auth_phase(ieee80211_dev_t 
+        *ieee80211_dev);
+extern void ieee80211_set_auth_phase(ieee80211_dev_t *ieee80211_dev,
+        ieee80211_auth_phase_t auth_phase);
 extern int ieee80211_probe_request(ieee80211_dev_t *ieee80211_dev, 
         char *ssid);