Changeset 053fc2b in mainline for uspace/lib/ieee80211/src/ieee80211_iface_impl.c

Timestamp:

2015-04-10T13:52:11Z (9 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

File:

• uspace/lib/ieee80211/src/ieee80211_iface_impl.c (modified) (12 diffs)

uspace/lib/ieee80211/src/ieee80211_iface_impl.c

@@ -48 +48 @@
  * @param results Structure where should be stored scan results.
  * 
- * @return EOK. 
+ * @return EOK if everything went OK, EREFUSED when device is not ready yet.
  */
 int ieee80211_get_scan_results_impl(ddf_fun_t *fun, 
@@ -59 +59 @@
                 return EREFUSED;
         
-        fibril_mutex_lock(&ieee80211_dev->ap_list.scan_mutex);
-        time_t scan_span = time(NULL) - ieee80211_dev->ap_list.last_scan;
-        fibril_mutex_unlock(&ieee80211_dev->ap_list.scan_mutex);
-        
-        if(now || scan_span > MAX_SCAN_SPAN_SEC) {
+        if(now) {
                 ieee80211_dev->ops->scan(ieee80211_dev);
         }
         
-        fibril_mutex_lock(&ieee80211_dev->ap_list.scan_mutex);
+        fibril_mutex_lock(&ieee80211_dev->ap_list.results_mutex);
         if(results) {
                 ieee80211_scan_result_list_t *result_list =
@@ -82 +78 @@
                 results->length = i;
         }
-        fibril_mutex_unlock(&ieee80211_dev->ap_list.scan_mutex);
+        fibril_mutex_unlock(&ieee80211_dev->ap_list.results_mutex);
         
         return EOK;
@@ -103 +99 @@
         ieee80211_scan_result_link_t *auth_data, char *password)
 {
-        int rc;
-        
         ieee80211_dev->bssid_info.res_link = auth_data;
         
         /* Set channel. */
-        rc = ieee80211_dev->ops->set_freq(ieee80211_dev, 
+        int rc = ieee80211_dev->ops->set_freq(ieee80211_dev, 
                 ieee80211_channel_to_freq(auth_data->scan_result.channel));
         if(rc != EOK)
@@ -122 +116 @@
         if(rc != EOK)
                 return rc;
-        if(ieee80211_dev->current_auth_phase != IEEE80211_AUTH_AUTHENTICATED)
+        if(ieee80211_get_auth_phase(ieee80211_dev) != 
+                IEEE80211_AUTH_AUTHENTICATED) {
+                ieee80211_set_auth_phase(ieee80211_dev, 
+                        IEEE80211_AUTH_DISCONNECTED);
                 return EINVAL;
+        }
         
         /* Try to associate. */
@@ -134 +132 @@
         if(rc != EOK)
                 return rc;
-        if(ieee80211_dev->current_auth_phase != IEEE80211_AUTH_ASSOCIATED)
+        if(ieee80211_get_auth_phase(ieee80211_dev) != 
+                IEEE80211_AUTH_ASSOCIATED) {
+                ieee80211_set_auth_phase(ieee80211_dev, 
+                        IEEE80211_AUTH_DISCONNECTED);
                 return EINVAL;
+        }
         
         /* On open network, we are finished. */
-        if(auth_data->scan_result.security.type == IEEE80211_SECURITY_OPEN)
-                return EOK;
-        
-        /* Otherwise wait for 4-way handshake to complete. */
-        fibril_mutex_lock(&ieee80211_dev->gen_mutex);
-        rc = fibril_condvar_wait_timeout(&ieee80211_dev->gen_cond,
-                        &ieee80211_dev->gen_mutex,
-                        HANDSHAKE_TIMEOUT);
-        fibril_mutex_unlock(&ieee80211_dev->gen_mutex);
-        if(rc != EOK)
-                return rc;
-        if(ieee80211_dev->current_auth_phase != IEEE80211_AUTH_ASSOCIATED)
-                return EINVAL;
+        if(auth_data->scan_result.security.type != IEEE80211_SECURITY_OPEN) {
+                /* Otherwise wait for 4-way handshake to complete. */
+                fibril_mutex_lock(&ieee80211_dev->gen_mutex);
+                rc = fibril_condvar_wait_timeout(&ieee80211_dev->gen_cond,
+                                &ieee80211_dev->gen_mutex,
+                                HANDSHAKE_TIMEOUT);
+                fibril_mutex_unlock(&ieee80211_dev->gen_mutex);
+                if(rc != EOK) {
+                        ieee80211_deauthenticate(ieee80211_dev);
+                        return rc;
+                }
+        }
+        
+        ieee80211_set_auth_phase(ieee80211_dev, IEEE80211_AUTH_CONNECTED);
         
         return EOK;
@@ -163 +166 @@
  * @return EOK if everything OK, ETIMEOUT when timeout during authenticating,
  * EINVAL when SSID not in scan results list, EPERM when incorrect password
- * passed.
+ * passed, EREFUSED when device is not ready yet.
  */
 int ieee80211_connect_impl(ddf_fun_t *fun, char *ssid_start, char *password)
@@ -170 +173 @@
         assert(password);
         
+        int rc;
+        
         nic_t *nic_data = nic_get_from_ddf_fun(fun);
         ieee80211_dev_t *ieee80211_dev = nic_get_specific(nic_data);
@@ -177 +182 @@
         
         if(ieee80211_is_connected(ieee80211_dev)) {
-                int rc = ieee80211_dev->iface->disconnect(fun);
+                rc = ieee80211_dev->iface->disconnect(fun);
                 if(rc != EOK)
                         return rc;
         }
         
-        fibril_mutex_lock(&ieee80211_dev->ap_list.scan_mutex);
+        ieee80211_set_connect_request(ieee80211_dev);
+        
+        rc = ENOENT;
+        fibril_mutex_lock(&ieee80211_dev->scan_mutex);
+        
+        ieee80211_dev->pending_conn_req = false;
 
         ieee80211_scan_result_list_foreach(ieee80211_dev->ap_list, result) {
@@ -188 +198 @@
                         result->scan_result.ssid, 
                         str_size(ssid_start))) {
-                        fibril_mutex_unlock(&ieee80211_dev->ap_list.scan_mutex);
-                        return ieee80211_connect_proc(ieee80211_dev, result,
+                        rc = ieee80211_connect_proc(ieee80211_dev, result,
                                 password);
+                        break;
                 }
         }
         
-        fibril_mutex_unlock(&ieee80211_dev->ap_list.scan_mutex);
-        
-        return EINVAL;
+        fibril_mutex_unlock(&ieee80211_dev->scan_mutex);
+        
+        return rc;
 }
 
@@ -204 +214 @@
  * @param fun Device function.
  * 
- * @return EOK if everything OK, EINVAL when not connected to any network.
+ * @return EOK if everything OK, EREFUSED if device is not ready yet.
  */
 int ieee80211_disconnect_impl(ddf_fun_t *fun)
@@ -215 +225 @@
         
         if(!ieee80211_is_connected(ieee80211_dev)) {
-                return EINVAL;
+                return EOK;
         } else {
-                return ieee80211_deauthenticate(ieee80211_dev);
+                fibril_mutex_lock(&ieee80211_dev->ap_list.results_mutex);
+                int rc = ieee80211_deauthenticate(ieee80211_dev);
+                fibril_mutex_unlock(&ieee80211_dev->ap_list.results_mutex);
+                return rc;
         }
 }