From 0033c3ef3a0a326340a9640de69c29312f037391 Mon Sep 17 00:00:00 2001
From: XiaXiaotian <xiaxiaotian@espressif.com>
Date: Mon, 9 Apr 2018 14:29:53 +0800
Subject: [PATCH] refactor smartconfig

    move wifi part to wifi lib and lwip part to idf
---
 components/esp32/lib                          |  2 +-
 .../component.mk                              |  0
 .../include/smartconfig_ack.h}                |  4 +--
 .../smartconfig_ack.c}                        | 26 ++++++++++---------
 4 files changed, 17 insertions(+), 15 deletions(-)
 rename components/{smartconfig => smartconfig_ack}/component.mk (100%)
 rename components/{smartconfig/include/smartconfig.h => smartconfig_ack/include/smartconfig_ack.h} (97%)
 rename components/{smartconfig/smartconfig.c => smartconfig_ack/smartconfig_ack.c} (88%)
 mode change 100644 => 100755

diff --git a/components/esp32/lib b/components/esp32/lib
index ab80b0b98..efae38d4d 160000
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit ab80b0b980997af5c224f2316a33486fe4af7258
+Subproject commit efae38d4d6f43c59e1570fe6dd0f483b26cbd7e7
diff --git a/components/smartconfig/component.mk b/components/smartconfig_ack/component.mk
similarity index 100%
rename from components/smartconfig/component.mk
rename to components/smartconfig_ack/component.mk
diff --git a/components/smartconfig/include/smartconfig.h b/components/smartconfig_ack/include/smartconfig_ack.h
similarity index 97%
rename from components/smartconfig/include/smartconfig.h
rename to components/smartconfig_ack/include/smartconfig_ack.h
index 1723a775b..be49fd3bd 100644
--- a/components/smartconfig/include/smartconfig.h
+++ b/components/smartconfig_ack/include/smartconfig_ack.h
@@ -12,8 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef SMARTCONFIG_H
-#define SMARTCONFIG_H
+#ifndef SMARTCONFIG_ACK_H
+#define SMARTCONFIG_ACK_H
 
 #ifdef __cplusplus
 extern "C" {
diff --git a/components/smartconfig/smartconfig.c b/components/smartconfig_ack/smartconfig_ack.c
old mode 100644
new mode 100755
similarity index 88%
rename from components/smartconfig/smartconfig.c
rename to components/smartconfig_ack/smartconfig_ack.c
index a0636d078..be5c4a676
--- a/components/smartconfig/smartconfig.c
+++ b/components/smartconfig_ack/smartconfig_ack.c
@@ -25,7 +25,7 @@
 #include "esp_log.h"
 #include "esp_wifi.h"
 #include "esp_smartconfig.h"
-#include "smartconfig.h"
+#include "smartconfig_ack.h"
 
 static const char *TAG = "smartconfig";
 
@@ -50,7 +50,7 @@ static void sc_ack_send_task(void *pvParameters)
     int remote_port = (ack->type == SC_ACK_TYPE_ESPTOUCH) ? SC_ACK_TOUCH_SERVER_PORT : SC_ACK_AIRKISS_SERVER_PORT;
     struct sockaddr_in server_addr;
     socklen_t sin_size = sizeof(server_addr);
-    int send_sock = 0;
+    int send_sock = -1;
     int optval = 1;
     int sendlen;
     int ack_len = (ack->type == SC_ACK_TYPE_ESPTOUCH) ? SC_ACK_TOUCH_LEN : SC_ACK_AIRKISS_LEN;
@@ -78,10 +78,9 @@ static void sc_ack_send_task(void *pvParameters)
 
             /* Create UDP socket. */
             send_sock = socket(AF_INET, SOCK_DGRAM, 0);
-            if (send_sock < 0) {
+            if ((send_sock < LWIP_SOCKET_OFFSET) || (send_sock > (FD_SETSIZE - 1))) {
                 ESP_LOGE(TAG,  "Creat udp socket failed");
-                free(ack);
-                vTaskDelete(NULL);
+                goto _end;	
             }
 
             setsockopt(send_sock, SOL_SOCKET, SO_BROADCAST | SO_REUSEADDR, &optval, sizeof(int));
@@ -100,9 +99,7 @@ static void sc_ack_send_task(void *pvParameters)
                         if (ack->cb) {
                             ack->cb(SC_STATUS_LINK_OVER, remote_ip);
                         }
-                        close(send_sock);
-                        free(ack);
-                        vTaskDelete(NULL);
+                        goto _end;
                     }
                 }
                 else {
@@ -112,9 +109,7 @@ static void sc_ack_send_task(void *pvParameters)
                         continue;
                     }
                     ESP_LOGE(TAG, "send failed, errno %d", err);
-                    close(send_sock);
-                    free(ack);
-                    vTaskDelete(NULL);
+                    goto _end;
                 }
             }
         }
@@ -123,6 +118,10 @@ static void sc_ack_send_task(void *pvParameters)
         }
     }
 
+_end:
+    if ((send_sock >= LWIP_SOCKET_OFFSET) && (send_sock <= (FD_SETSIZE - 1))) {
+        close(send_sock);
+    }
     free(ack);
     vTaskDelete(NULL);
 }
@@ -145,7 +144,10 @@ void sc_ack_send(sc_ack_t *param)
 
     s_sc_ack_send = true;
 
-    xTaskCreate(sc_ack_send_task, "sc_ack_send_task", SC_ACK_TASK_STACK_SIZE, ack, SC_ACK_TASK_PRIORITY, NULL);
+    if (xTaskCreate(sc_ack_send_task, "sc_ack_send_task", SC_ACK_TASK_STACK_SIZE, ack, SC_ACK_TASK_PRIORITY, NULL) != pdPASS) {
+        ESP_LOGE(TAG, "Create sending smartconfig ACK task fail");
+        free(ack);
+    }
 }
 
 void sc_ack_send_stop(void)