Diff: internal/network/NetworkJoin.cpp

Revision:

24:e27e23297f02

Parent:

23:8cfc6fdce6b0

Child:

27:b63f5a9cdefa

--- a/internal/network/NetworkJoin.cpp	Sat Sep 06 14:24:03 2014 -0700
+++ b/internal/network/NetworkJoin.cpp	Sat Sep 06 20:34:01 2014 -0700
@@ -1,30 +1,30 @@
-/**
- * ACKme WiConnect Host Library is licensed under the BSD licence: 
- * 
- * Copyright (c)2014 ACKme Networks.
- * All rights reserved. 
- * 
- * Redistribution and use in source and binary forms, with or without modification, 
- * are permitted provided that the following conditions are met: 
- * 
- * 1. Redistributions of source code must retain the above copyright notice, 
- * this list of conditions and the following disclaimer. 
- * 2. Redistributions in binary form must reproduce the above copyright notice, 
- * this list of conditions and the following disclaimer in the documentation 
- * and/or other materials provided with the distribution. 
- * 3. The name of the author may not be used to endorse or promote products 
- * derived from this software without specific prior written permission. 
- * 
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED 
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
- * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
- * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
- * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
- * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
- * OF SUCH DAMAGE.
+/**
+ * ACKme WiConnect Host Library is licensed under the BSD licence: 
+ * 
+ * Copyright (c)2014 ACKme Networks.
+ * All rights reserved. 
+ * 
+ * Redistribution and use in source and binary forms, with or without modification, 
+ * are permitted provided that the following conditions are met: 
+ * 
+ * 1. Redistributions of source code must retain the above copyright notice, 
+ * this list of conditions and the following disclaimer. 
+ * 2. Redistributions in binary form must reproduce the above copyright notice, 
+ * this list of conditions and the following disclaimer in the documentation 
+ * and/or other materials provided with the distribution. 
+ * 3. The name of the author may not be used to endorse or promote products 
+ * derived from this software without specific prior written permission. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS AND ANY EXPRESS OR IMPLIED 
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT 
+ * SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT 
+ * OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN 
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING 
+ * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY 
+ * OF SUCH DAMAGE.
  */
 #include "Wiconnect.h"
 #include "internal/common.h"
@@ -38,11 +38,11 @@
     {
         FS_SET_SSID,
         FS_SET_PASSWORD,
-        FS_NETWORK_UP,
+        FS_NETWORK_UP,
         FS_GET_STATUS
     };
 
-    CHECK_CALLBACK_AVAILABLE(completeHandler_);
+    CHECK_CALLBACK_AVAILABLE(completeHandler_);
 
     CHECK_OTHER_COMMAND_EXECUTING();
 
@@ -57,7 +57,7 @@
 
     if(wiconnect->internalProcessingState == FS_SET_PASSWORD)
     {
-        if(password == NULL ||
+        if(password == NULL || *password == 0 ||
            WICONNECT_SUCCEEDED(result, wiconnect->sendCommand("set wlan.passkey %s", password)))
         {
             wiconnect->internalProcessingState = FS_NETWORK_UP;
@@ -67,12 +67,12 @@
     if(wiconnect->internalProcessingState == FS_NETWORK_UP)
     {
         if(WICONNECT_SUCCEEDED(result, wiconnect->sendCommand("network_up")))
-        {
-            if(!completeHandler_.isValid())
-            {
-                wiconnect->internalProcessingState = FS_GET_STATUS;
+        {
+            if(!completeHandler_.isValid())
+            {
+                wiconnect->internalProcessingState = FS_GET_STATUS;
             }
-#ifdef WICONNECT_ASYNC_TIMER_ENABLED
+#ifdef WICONNECT_ASYNC_TIMER_ENABLED
             else
             {
                 monitorTimer.stop();
@@ -81,36 +81,36 @@
             }
 #endif
         }
-    }
-
-    if(wiconnect->internalProcessingState == FS_GET_STATUS)
-    {
-#define MAX_JOIN_TIME 30000
-        TimeoutTimer timeout;
-
-        status_loop:
-        if(WICONNECT_SUCCEEDED(result, wiconnect->sendCommand("get network.status")))
-        {
-            int32_t status;
-            if(!WICONNECT_FAILED(result, wiconnect->responseToInt32(&status)))
-            {
-                if(status == NETWORK_STATUS_DOWN)
-                {
-                    if(timeout.timedOut(MAX_JOIN_TIME))
-                    {
-                        result = WICONNECT_TIMEOUT;
-                    }
-                    else if(!wiconnect->nonBlocking)
-                    {
-                        goto status_loop;
-                    }
-                    else
-                    {
-                        result = WICONNECT_PROCESSING;
-                    }
-                }
-            }
-        }
+    }
+
+    if(wiconnect->internalProcessingState == FS_GET_STATUS)
+    {
+#define MAX_JOIN_TIME 30000
+        TimeoutTimer timeout;
+
+        status_loop:
+        if(WICONNECT_SUCCEEDED(result, wiconnect->sendCommand("get network.status")))
+        {
+            int32_t status;
+            if(!WICONNECT_FAILED(result, wiconnect->responseToInt32(&status)))
+            {
+                if(status == NETWORK_STATUS_DOWN)
+                {
+                    if(timeout.timedOut(MAX_JOIN_TIME))
+                    {
+                        result = WICONNECT_TIMEOUT;
+                    }
+                    else if(!wiconnect->nonBlocking)
+                    {
+                        goto status_loop;
+                    }
+                    else
+                    {
+                        result = WICONNECT_PROCESSING;
+                    }
+                }
+            }
+        }
     }
 
     CHECK_CLEANUP_COMMAND();