Merge branch 'bugfix/fix_arp_buffer_error_in_smart_config_v4.2' into 'release/v4.2'

bugfix/fix_arp_buffer_error_in_smart_config_v4.2

See merge request espressif/esp-idf!12254
This commit is contained in:
Jiang Jiang Jian 2021-03-18 04:17:36 +00:00
commit 359784f0b6

View File

@ -144,20 +144,15 @@ static void sc_ack_send_task(void *pvParameters)
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); sendlen = sendto(send_sock, &ack->ctx, ack_len, 0, (struct sockaddr*) &server_addr, sin_size);
if (sendlen > 0) { if (sendlen <= 0) {
/* Totally send 30 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;
}
}
else {
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);
ESP_LOGD(TAG, "send failed, errno %d", err); vTaskDelay(100 / portTICK_RATE_MS);
continue; }
}
ESP_LOGE(TAG, "send failed, errno %d", err); /* Send 30 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; goto _end;
} }
} }