espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-29 18:27:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/wps_msg_timeout_increase_v5.4' into 'release/v5.4'

Browse Source 
fix(esp_wifi): Increase WPS message timeout (v5.4)

See merge request espressif/esp-idf!38875
This commit is contained in:
Jiang Jiang Jian
2025-05-06 16:37:56 +08:00
parent 45d95b1bd8 71fde740e1
commit beb0bcc970
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/wpa_supplicant/esp_supplicant/src/esp_wps.c
View File

@ -919,16 +919,16 @@ int wps_start_msg_timer(void)
}
if (sm->wps->state == WPS_FINISHED) {
msg_timeout = 100;
msg_timeout = 5;
wpa_printf(MSG_DEBUG, "start msg timer WPS_FINISHED %" PRId32 " ms", msg_timeout);
eloop_cancel_timeout(wifi_station_wps_msg_timeout, NULL, NULL);
eloop_register_timeout(0, msg_timeout*1000, wifi_station_wps_msg_timeout, NULL, NULL);
eloop_cancel_timeout(wifi_station_wps_msg_timeout, NULL, NULL);
eloop_register_timeout(msg_timeout, 0, wifi_station_wps_msg_timeout, NULL, NULL);
ret = 0;
} else if (sm->wps->state == RECV_M2) {
msg_timeout = 5;
msg_timeout = 20;
wpa_printf(MSG_DEBUG, "start msg timer RECV_M2 %" PRId32 " s", msg_timeout);
eloop_cancel_timeout(wifi_station_wps_msg_timeout, NULL, NULL);
eloop_register_timeout(msg_timeout, 0, wifi_station_wps_msg_timeout, NULL, NULL);
eloop_cancel_timeout(wifi_station_wps_msg_timeout, NULL, NULL);
eloop_register_timeout(msg_timeout, 0, wifi_station_wps_msg_timeout, NULL, NULL);
ret = 0;
}
return ret;
@ -1663,7 +1663,7 @@ wifi_wps_scan_done(void *arg, ETS_STATUS status)
esp_wifi_connect();
sm->state = WAIT_START;
eloop_cancel_timeout(wifi_station_wps_msg_timeout, NULL, NULL);
eloop_register_timeout(2, 0, wifi_station_wps_msg_timeout, NULL, NULL);
eloop_register_timeout(20, 0, wifi_station_wps_msg_timeout, NULL, NULL);
} else if (wps_get_status() == WPS_STATUS_SCANNING) {
if (wps_get_type() == WPS_TYPE_PIN && sm->scan_cnt > WPS_IGNORE_SEL_REG_MAX_CNT) {
wpa_printf(MSG_INFO, "WPS: ignore selected registrar after %d scans", sm->scan_cnt);

1
examples/wifi/roaming/roaming_11kvr/sdkconfig.ci
View File

@ -1,2 +1,3 @@
# Add CI coverage for WPA supplicant debug feature
CONFIG_LOG_DEFAULT_LEVEL_DEBUG=y
CONFIG_ESP_WIFI_DEBUG_PRINT=y