Changeset 053fc2b in mainline for uspace/app/wifi_supplicant/wifi_supplicant.c

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

File:

• uspace/app/wifi_supplicant/wifi_supplicant.c (modified) (5 diffs)

uspace/app/wifi_supplicant/wifi_supplicant.c

@@ -36 +36 @@
 #include <ieee80211_iface.h>
 
+#include <inet/inetcfg.h>
+#include <inet/dhcp.h>
 #include <errno.h>
 #include <stdio.h>
@@ -173 +175 @@
         }
         
-        int rc = ieee80211_connect(sess, ssid_start, password);
+        int rc = ieee80211_disconnect(sess);
+        if(rc != EOK) {
+                if(rc == EREFUSED) {
+                        printf("Device is not ready yet.\n");                   
+                } else {
+                        printf("Error when disconnecting device. "
+                                "Error: %d\n", rc);
+                }
+                
+                return rc;
+        }
+        
+        ieee80211_connect(sess, ssid_start, password);
         if(rc != EOK) {
                 if(rc == EREFUSED) {
@@ -179 +193 @@
                 } else if(rc == ETIMEOUT) {
                         printf("Timeout when authenticating to network.\n");
-                } else if(rc == EPERM) {
-                        printf("Bad password provided.\n");
+                } else if(rc == ENOENT) {
+                        printf("Given SSID not in scan results.\n");
                 } else {
                         printf("Error when connecting to network. "
@@ -188 +202 @@
                 return rc;
         }
+        
+        // TODO: Wait for DHCP address ?
         
         printf("Successfully connected to network!\n");
@@ -274 +290 @@
         int rc;
         uint32_t index;
+        
+        rc = inetcfg_init();
+        if (rc != EOK) {
+                printf(NAME ": Failed connecting to inetcfg service (%d).\n",
+                    rc);
+                return 1;
+        }
+        
+        rc = dhcp_init();
+        if (rc != EOK) {
+                printf(NAME ": Failed connecting to dhcp service (%d).\n", rc);
+                return 1;
+        }
         
         if(argc == 2) {