mirror
/
esp-idf
kopia lustrzana https://github.com/espressif/esp-idf
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Merge branch 'bugfix/pbc_overlap_in_wps_pin_method_v4.4' into 'release/v4.4' 

wpa_supplicant: Fix for issue of wps-pbc overlap in wps-pin method(4.4)

See merge request espressif/esp-idf!25737
pull/13426/head
Jiang Jiang Jian 2023-12-05 10:39:27 +08:00
rodzic e62727886e 58f51147cf
commit 50511114e1
1 zmienionych plików z 8 dodań i 4 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

12
components/wpa_supplicant/esp_supplicant/src/esp_wps.c
Wyświetl plik

@ -1,5 +1,5 @@
/* /*
* SPDX-FileCopyrightText: 2019-2022 Espressif Systems (Shanghai) CO LTD * SPDX-FileCopyrightText: 2019-2023 Espressif Systems (Shanghai) CO LTD
* *
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
@ -1882,9 +1882,13 @@ wifi_wps_scan_done(void *arg, STATUS status)
} else if (sm->discover_ssid_cnt == 0) { } else if (sm->discover_ssid_cnt == 0) {
wps_set_status(WPS_STATUS_SCANNING); wps_set_status(WPS_STATUS_SCANNING);
} else { } else {
wpa_printf(MSG_INFO, "PBC session overlap!"); if (wps_get_type() == WPS_TYPE_PBC) {
wps_set_status(WPS_STATUS_DISABLE); wpa_printf(MSG_INFO, "PBC session overlap!");
esp_event_send_internal(WIFI_EVENT, WIFI_EVENT_STA_WPS_ER_PBC_OVERLAP, 0, 0, portMAX_DELAY); wps_set_status(WPS_STATUS_DISABLE);
esp_event_send_internal(WIFI_EVENT, WIFI_EVENT_STA_WPS_ER_PBC_OVERLAP, 0, 0, portMAX_DELAY);
} else {
wps_set_status(WPS_STATUS_PENDING);
}
} }
wpa_printf(MSG_DEBUG, "wps scan_done discover_ssid_cnt = %d", sm->discover_ssid_cnt); wpa_printf(MSG_DEBUG, "wps scan_done discover_ssid_cnt = %d", sm->discover_ssid_cnt);