espressif/ESP8266_RTOS_SDK
1
0
Fork 0
mirror of https://github.com/espressif/ESP8266_RTOS_SDK.git synced 2025-07-01 06:08:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(sc): fix the issue of sending failure and exit

Browse Source 
1. Send unicast first, use broadcast to send if unicast fails.
         2. Send 60 times successfully before exiting.
This commit is contained in:
chenwen
2021-05-07 11:33:30 +08:00
parent 82a6a98f4a
commit 938d127fc5
2 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
components/esp8266/source/smartconfig_ack.c
View File

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

4
examples/wifi/smart_config/main/Kconfig.projbuild
View File

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