alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/wps_reg_state_handling_v5.2' into 'release/v5.2'

Browse Source 
fix(wpa_supplicant): Handle case when WPS registrar misses WSC_DONE sent by station (Backport v5.2)

See merge request espressif/esp-idf!32081
This commit is contained in:
Jiang Jiang Jian 2024-07-15 10:43:01 +08:00
commit c06cfeddb5
3 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/wpa_supplicant/esp_supplicant/src/esp_hostpad_wps.c
View File

@ -221,7 +221,7 @@ int esp_wifi_ap_wps_enable(const esp_wps_config_t *config)
return ret; return ret;
} }
static int wifi_ap_wps_disable_internal(void) int wifi_ap_wps_disable_internal(void)
{ {
struct wps_sm *sm = gWpsSm; struct wps_sm *sm = gWpsSm;

28
components/wpa_supplicant/src/ap/wpa_auth.c
View File

@ -2620,21 +2620,6 @@ send_resp:
return true; return true;
} }
#ifdef CONFIG_WPS_REGISTRAR
static void ap_free_sta_timeout(void *ctx, void *data)
{
struct hostapd_data *hapd = (struct hostapd_data *) ctx;
u8 *addr = (u8 *) data;
struct sta_info *sta = ap_get_sta(hapd, addr);
if (sta) {
ap_free_sta(hapd, sta);
}
os_free(addr);
}
#endif
bool wpa_ap_remove(u8* bssid) bool wpa_ap_remove(u8* bssid)
{ {
struct hostapd_data *hapd = hostapd_get_hapd_data(); struct hostapd_data *hapd = hostapd_get_hapd_data();
@ -2657,19 +2642,6 @@ bool wpa_ap_remove(u8* bssid)
return true; return true;
} }
#endif /* CONFIG_SAE */ #endif /* CONFIG_SAE */
#ifdef CONFIG_WPS_REGISTRAR
wpa_printf(MSG_DEBUG, "wps_status=%d", wps_get_status());
if (wps_get_status() == WPS_STATUS_PENDING) {
u8 *addr = os_malloc(ETH_ALEN);
if (!addr) {
return false;
}
os_memcpy(addr, sta->addr, ETH_ALEN);
eloop_register_timeout(0, 10000, ap_free_sta_timeout, hapd, addr);
} else
#endif
ap_free_sta(hapd, sta); ap_free_sta(hapd, sta);
return true; return true;

7
components/wpa_supplicant/src/eap_server/eap_server_wsc.c
View File

@ -103,6 +103,13 @@ static void eap_wsc_reset(struct eap_sm *sm, void *priv)
wpabuf_free(data->out_buf); wpabuf_free(data->out_buf);
//wps_deinit(data->wps); //wps_deinit(data->wps);
os_free(data); os_free(data);
#ifdef ESP_SUPPLICANT
/* TODO: When wps-registrar is shifted in a separate task other than wifi task,
* call esp_wifi_ap_wps_disable() here instead of wifi_ap_wps_disable_internal()
* */
extern int wifi_ap_wps_disable_internal(void);
wifi_ap_wps_disable_internal();
#endif
} }