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

Merge branch 'bugfix/wps_start_state_issue_v4.3' into 'release/v4.3'

Browse Source 
esp_wifi: Add check for wps start state (v4.3)

See merge request espressif/esp-idf!22029
This commit is contained in:
Jiang Jiang Jian
2023-02-06 17:22:09 +08:00
parent 419d6209a8 2cc790a69b
commit 30ee33c62e
3 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -791,6 +791,20 @@ int wps_process_wps_mX_req(u8 *ubuf, int len, enum wps_process_res *res)
expd = (struct eap_expand *) ubuf; expd = (struct eap_expand *) ubuf;
wpa_printf(MSG_DEBUG, "wps process mX req: len %d, tlen %d", len, tlen); wpa_printf(MSG_DEBUG, "wps process mX req: len %d, tlen %d", len, tlen);
if (sm->state == WAIT_START) {
if (expd->opcode != WSC_Start) {
wpa_printf(MSG_DEBUG, "EAP-WSC: Unexpected Op-Code %d "
"in WAIT_START state", expd->opcode);
return ESP_FAIL;
}
wpa_printf(MSG_DEBUG, "EAP-WSC: Received start");
sm->state = WPA_MESG;
} else if (expd->opcode == WSC_Start){
wpa_printf(MSG_DEBUG, "EAP-WSC: Unexpected Op-Code %d",
expd->opcode);
return ESP_FAIL;
}
flag = *(u8 *)(ubuf + sizeof(struct eap_expand)); flag = *(u8 *)(ubuf + sizeof(struct eap_expand));
if (flag & WPS_MSG_FLAG_LEN) { if (flag & WPS_MSG_FLAG_LEN) {
tbuf = ubuf + sizeof(struct eap_expand) + 1 + 2;//two bytes total length tbuf = ubuf + sizeof(struct eap_expand) + 1 + 2;//two bytes total length
@ -843,6 +857,10 @@ int wps_process_wps_mX_req(u8 *ubuf, int len, enum wps_process_res *res)
wps_enrollee_process_msg(sm->wps, expd->opcode, wps_buf); wps_enrollee_process_msg(sm->wps, expd->opcode, wps_buf);
} }
if (res && *res == WPS_FAILURE) {
sm->state = WPA_FAIL;
}
if (wps_buf) { if (wps_buf) {
wpabuf_free(wps_buf); wpabuf_free(wps_buf);
wps_buf = NULL; wps_buf = NULL;
@ -978,6 +996,7 @@ int wps_stop_process(wifi_event_sta_wps_fail_reason_t reason_code)
esp_wifi_disconnect(); esp_wifi_disconnect();
sm->state = WPA_FAIL;
wpa_printf(MSG_DEBUG, "Write wps_fail_information"); wpa_printf(MSG_DEBUG, "Write wps_fail_information");
esp_event_send_internal(WIFI_EVENT, WIFI_EVENT_STA_WPS_ER_FAILED, &reason_code, sizeof(reason_code), portMAX_DELAY); esp_event_send_internal(WIFI_EVENT, WIFI_EVENT_STA_WPS_ER_FAILED, &reason_code, sizeof(reason_code), portMAX_DELAY);
@ -1862,6 +1881,7 @@ wifi_wps_scan_done(void *arg, STATUS status)
wpa_printf(MSG_DEBUG, "WPS: neg start"); wpa_printf(MSG_DEBUG, "WPS: neg start");
esp_wifi_connect(); esp_wifi_connect();
sm->state = WAIT_START;
ets_timer_disarm(&sm->wps_msg_timeout_timer); ets_timer_disarm(&sm->wps_msg_timeout_timer);
ets_timer_arm(&sm->wps_msg_timeout_timer, 2000, 0); ets_timer_arm(&sm->wps_msg_timeout_timer, 2000, 0);
} else if (wps_get_status() == WPS_STATUS_SCANNING) { } else if (wps_get_status() == WPS_STATUS_SCANNING) {
@ -1903,7 +1923,7 @@ int wifi_station_wps_start(void)
struct wps_sm *sm = wps_sm_get(); struct wps_sm *sm = wps_sm_get();
if (!sm) { if (!sm) {
wpa_printf(MSG_ERROR, "WPS: wps not initial"); wpa_printf(MSG_ERROR, "WPS: wps is not initialized");
return ESP_FAIL; return ESP_FAIL;
} }

9
components/wpa_supplicant/src/wps/wps.h
View File

@ -1021,9 +1021,18 @@ enum wps_sig_type {
}; };
#endif #endif
#ifdef ESP_SUPPLICANT
enum wps_sm_state{
WAIT_START,
WPA_MESG,
WPA_FAIL
};
#endif /* ESP_SUPPLICANT */
#define WPS_EAP_EXT_VENDOR_TYPE "WFA-SimpleConfig-Enrollee-1-0" #define WPS_EAP_EXT_VENDOR_TYPE "WFA-SimpleConfig-Enrollee-1-0"
#define WPS_OUTBUF_SIZE 500 #define WPS_OUTBUF_SIZE 500
struct wps_sm { struct wps_sm {
u8 state;
struct wps_config *wps_cfg; struct wps_config *wps_cfg;
struct wps_context *wps_ctx; struct wps_context *wps_ctx;
struct wps_data *wps; struct wps_data *wps;

4
components/wpa_supplicant/src/wps/wps_enrollee.c
View File

@ -1532,8 +1532,8 @@ enum wps_process_res wps_enrollee_process_msg(struct wps_data *wps,
} }
switch (op_code) { switch (op_code) {
case WSC_Start: case WSC_Start:
return wps_process_wsc_start(wps, msg); return wps_process_wsc_start(wps, msg);
case WSC_MSG: case WSC_MSG:
case WSC_UPnP: case WSC_UPnP:
return wps_process_wsc_msg(wps, msg); return wps_process_wsc_msg(wps, msg);