Merge branch 'bugfix/fix_sc_send_failed_issue_for_v3.4' into 'release/v3.4'

fix(sc): fix the issue of sending failure and exit (backport v3.4)

See merge request sdk/ESP8266_RTOS_SDK!1615

Author: donghengqaz

components/esp8266/source/smartconfig_ack.c

@@ -79,7 +79,7 @@ static void sc_ack_send_task(void* pvParameters)
     sc_ack_t* ack = (sc_ack_t*)pvParameters;
     tcpip_adapter_ip_info_t local_ip;
     uint8_t remote_ip[4];
-    memset(remote_ip, 0xFF, sizeof(remote_ip));
+    memcpy(remote_ip, ack->ctx.ip, sizeof(remote_ip));
     struct sockaddr_in server_addr;
     socklen_t sin_size = sizeof(server_addr);
     int send_sock = -1;
@@ -99,6 +99,7 @@ static void sc_ack_send_task(void* pvParameters)
             port_bit = 0;
         }
         remote_port = SC_ACK_TOUCH_V2_SERVER_PORT(port_bit);
+        memset(remote_ip, 0xFF, sizeof(remote_ip));
     } else {
         remote_port = SC_ACK_AIRKISS_SERVER_PORT;
     }
@@ -156,30 +157,32 @@ static void sc_ack_send_task(void* pvParameters)
                     memcpy(remote_ip, &from.sin_addr, 4);
                     server_addr.sin_addr.s_addr = from.sin_addr.s_addr;
                 } else {
-                    goto _end;
+                    server_addr.sin_addr.s_addr = INADDR_BROADCAST;
                 }
             }
 
+            uint32_t ip_addr = server_addr.sin_addr.s_addr;
             while (s_sc_ack_send) {
                 /* Send smartconfig ACK every 100ms. */
                 vTaskDelay(100 / portTICK_RATE_MS);
-                sendlen = sendto(send_sock, &ack->ctx, ack_len, 0, (struct sockaddr*) &server_addr, sin_size);
-
-                if (sendlen > 0) {
-                    /* Totally send 60 smartconfig ACKs. Then smartconfig is successful. */
-                    if (packet_count++ >= SC_ACK_MAX_COUNT) {
-                        esp_event_post(SC_EVENT, SC_EVENT_SEND_ACK_DONE, NULL, 0, portMAX_DELAY);
-                        goto _end;
-                    }
+                if (ip_addr != INADDR_BROADCAST) {
+                    sendto(send_sock, &ack->ctx, ack_len, 0, (struct sockaddr*) &server_addr, sin_size);
+                    server_addr.sin_addr.s_addr = INADDR_BROADCAST;
+                    sendlen = sendto(send_sock, &ack->ctx, ack_len, 0, (struct sockaddr*) &server_addr, sin_size);
+                    server_addr.sin_addr.s_addr = ip_addr;
                 } else {
-                    err = sc_ack_send_get_errno(send_sock);
-
-                    if (err == ENOMEM || err == EAGAIN) {
-                        ESP_LOGD(TAG, "send failed, errno %d", err);
-                        continue;
-                    }
+                    sendlen = sendto(send_sock, &ack->ctx, ack_len, 0, (struct sockaddr*) &server_addr, sin_size);
+                }
 
+                if (sendlen <= 0) {
+                    err = sc_ack_send_get_errno(send_sock);
                     ESP_LOGE(TAG, "send failed, errno %d", err);
+                    vTaskDelay(200 / portTICK_RATE_MS);
+                }
+
+                /* Send 60 smartconfig ACKs, exit regardless of failure or success. */
+                if (packet_count++ >= SC_ACK_MAX_COUNT) {
+                    esp_event_post(SC_EVENT, SC_EVENT_SEND_ACK_DONE, NULL, 0, portMAX_DELAY);
                     goto _end;
                 }
             }

examples/wifi/smart_config/main/Kconfig.projbuild

@@ -12,7 +12,7 @@ config ESP_TOUCH
 	bool "ESPTouch"
 config AIRKISS
 	bool "AirKiss"
-config ESP_TOUCH-AIRKISS
+config ESP_TOUCH_AIRKISS
 	bool "ESPTouch and AirKiss"
 config ESP_TOUCH_V2
 	bool "ESPTouch-V2"
@@ -22,7 +22,7 @@ config ESP_SMARTCONFIG_TYPE
 	int
 	default 0 if ESP_TOUCH
 	default 1 if AIRKISS
-	default 2 if ESP_TOUCH-AIRKISS
+	default 2 if ESP_TOUCH_AIRKISS
 	default 3 if ESP_TOUCH_V2
 
 endmenu