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_bug' into 'master'

Browse Source 
fix(wpa_supplicant):Fix for setting wps status fail when connection fails

Closes WIFIBUG-151 and WIFIBUG-419

See merge request espressif/esp-idf!26940
This commit is contained in:
Jiang Jiang Jian 2024-07-04 20:41:02 +08:00
commit 3ed188478b
5 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
components/esp_wifi/include/esp_wifi_types_generic.h
View File

@ -879,6 +879,7 @@ typedef struct {
typedef enum {
WPS_FAIL_REASON_NORMAL = 0, /**< WPS normal fail reason */
WPS_FAIL_REASON_RECV_M2D, /**< WPS receive M2D frame */
WPS_FAIL_REASON_RECV_DEAUTH, /**< Recv deauth from AP while wps handshake */
WPS_FAIL_REASON_MAX
} wifi_event_sta_wps_fail_reason_t;

2
components/esp_wifi/lib

@ -1 +1 @@
Subproject commit 17509c30aecde2c38bf4d3cc3e860b9297cf23e8
Subproject commit 7fbc7d9f5a205177f28c4ce48e67d9eaa28908d8

6
components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
View File

@ -33,6 +33,7 @@
#include "esp_owe_i.h"
#include "esp_wps.h"
#include "esp_wps_i.h"
#include "eap_server/eap.h"
#include "eapol_auth/eapol_auth_sm.h"
#include "ap/ieee802_1x.h"
@ -303,6 +304,11 @@ static void wpa_sta_disconnected_cb(uint8_t reason_code)
}
break;
}
struct wps_sm_funcs *wps_sm_cb = wps_get_wps_sm_cb();
if (wps_sm_cb && wps_sm_cb->wps_sm_notify_deauth) {
wps_sm_cb->wps_sm_notify_deauth();
}
#ifdef CONFIG_OWE_STA
owe_deinit();
#endif /* CONFIG_OWE_STA */

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

@ -45,6 +45,7 @@ struct wps_rx_param {
};
static STAILQ_HEAD(, wps_rx_param) s_wps_rxq;
static struct wps_sm_funcs *s_wps_sm_cb = NULL;
static void *s_wps_task_hdl = NULL;
static void *s_wps_queue = NULL;
static void *s_wps_data_lock = NULL;
@ -839,6 +840,13 @@ int wps_finish(void)
return ret;
}
static void wps_sm_notify_deauth(void)
{
if (gWpsSm && gWpsSm->wps->state != WPS_FINISHED) {
wps_stop_process(WPS_FAIL_REASON_RECV_DEAUTH);
}
}
/* Add current ap to discard ap list */
void wps_add_discard_ap(u8 *bssid)
{
@ -1385,6 +1393,11 @@ int wps_init_cfg_pin(struct wps_config *cfg)
return 0;
}
struct wps_sm_funcs* wps_get_wps_sm_cb(void)
{
return s_wps_sm_cb;
}
static int wifi_station_wps_init(const esp_wps_config_t *config)
{
struct wps_funcs *wps_cb;
@ -1466,6 +1479,12 @@ static int wifi_station_wps_init(const esp_wps_config_t *config)
wps_cb->wps_start_pending = wps_start_pending;
esp_wifi_set_wps_cb_internal(wps_cb);
s_wps_sm_cb = os_malloc(sizeof(struct wps_sm_funcs));
if (s_wps_sm_cb == NULL) {
goto _err;
}
s_wps_sm_cb->wps_sm_notify_deauth = wps_sm_notify_deauth;
return ESP_OK;
_err:
@ -1539,6 +1558,10 @@ wifi_station_wps_deinit(void)
wps_deinit(sm->wps);
sm->wps = NULL;
}
if (s_wps_sm_cb) {
os_free(s_wps_sm_cb);
s_wps_sm_cb = NULL;
}
os_free(gWpsSm);
gWpsSm = NULL;

5
components/wpa_supplicant/esp_supplicant/src/esp_wps_i.h
View File

@ -118,6 +118,11 @@ int wps_sm_rx_eapol(u8 *src_addr, u8 *buf, u32 len);
int wps_dev_deinit(struct wps_device_data *dev);
int wps_dev_init(void);
int wps_set_factory_info(const esp_wps_config_t *config);
struct wps_sm_funcs {
void (*wps_sm_notify_deauth)(void);
};
struct wps_sm_funcs* wps_get_wps_sm_cb(void);
static inline int wps_get_type(void)
{