espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-05 05:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/sta_rejoin_softap_mode_issue' into 'master'

Browse Source 
wpa_supplicant: Add changes to deinit sta_info correctly

Closes WIFI-4441

See merge request espressif/esp-idf!18395
This commit is contained in:
Kapil Gupta
2022-06-07 21:47:14 +08:00
parent e2bc3f865e ed2bed49c0
commit bb23d783c0
3 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -269,7 +269,7 @@ static int check_n_add_wps_sta(struct hostapd_data *hapd, struct sta_info *sta_i
} }
#endif #endif
static bool hostap_sta_join(void **sm, u8 *bssid, u8 *wpa_ie, u8 wpa_ie_len, bool *pmf_enable) static bool hostap_sta_join(void **sta, u8 *bssid, u8 *wpa_ie, u8 wpa_ie_len, bool *pmf_enable)
{ {
struct sta_info *sta_info; struct sta_info *sta_info;
struct hostapd_data *hapd = hostapd_get_hapd_data(); struct hostapd_data *hapd = hostapd_get_hapd_data();
@@ -277,6 +277,10 @@ static bool hostap_sta_join(void **sm, u8 *bssid, u8 *wpa_ie, u8 wpa_ie_len, boo
if (!hapd) { if (!hapd) {
return 0; return 0;
} }
if (*sta) {
ap_free_sta(hapd, *sta);
}
sta_info = ap_sta_add(hapd, bssid); sta_info = ap_sta_add(hapd, bssid);
if (!sta_info) { if (!sta_info) {
wpa_printf(MSG_ERROR, "failed to add station " MACSTR, MAC2STR(bssid)); wpa_printf(MSG_ERROR, "failed to add station " MACSTR, MAC2STR(bssid));
@@ -284,13 +288,12 @@ static bool hostap_sta_join(void **sm, u8 *bssid, u8 *wpa_ie, u8 wpa_ie_len, boo
} }
#ifdef CONFIG_WPS_REGISTRAR #ifdef CONFIG_WPS_REGISTRAR
if (check_n_add_wps_sta(hapd, sta_info, wpa_ie, wpa_ie_len, pmf_enable)) { if (check_n_add_wps_sta(hapd, sta_info, wpa_ie, wpa_ie_len, pmf_enable)) {
*sm = sta_info; *sta = sta_info;
return true; return true;
} }
#endif #endif
if (wpa_ap_join(sm, bssid, wpa_ie, wpa_ie_len, pmf_enable)) { if (wpa_ap_join(sta_info, bssid, wpa_ie, wpa_ie_len, pmf_enable)) {
sta_info->wpa_sm = *sm; *sta = sta_info;
*sm = sta_info;
return true; return true;
} }

5
components/wpa_supplicant/src/ap/ap_config.h
View File

@@ -372,7 +372,8 @@ int hostapd_wep_key_cmp(struct hostapd_wep_keys *a,
const u8 * hostapd_get_psk(const struct hostapd_bss_config *conf, const u8 * hostapd_get_psk(const struct hostapd_bss_config *conf,
const u8 *addr, const u8 *prev_psk); const u8 *addr, const u8 *prev_psk);
int hostapd_setup_wpa_psk(struct hostapd_bss_config *conf); int hostapd_setup_wpa_psk(struct hostapd_bss_config *conf);
bool wpa_ap_join(void** sm, uint8_t *bssid, uint8_t *wpa_ie, uint8_t wpa_ie_len, bool *pmf_enable); struct sta_info;
bool wpa_ap_remove(void* sm); bool wpa_ap_join(struct sta_info *sta, uint8_t *bssid, uint8_t *wpa_ie, uint8_t wpa_ie_len, bool *pmf_enable);
bool wpa_ap_remove(void* sta_info);
#endif /* HOSTAPD_CONFIG_H */ #endif /* HOSTAPD_CONFIG_H */

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

@@ -2340,53 +2340,49 @@ static int wpa_sm_step(struct wpa_state_machine *sm)
return 0; return 0;
} }
bool wpa_ap_join(void** sm, uint8_t *bssid, uint8_t *wpa_ie, uint8_t wpa_ie_len, bool *pmf_enable) bool wpa_ap_join(struct sta_info *sta, uint8_t *bssid, uint8_t *wpa_ie, uint8_t wpa_ie_len, bool *pmf_enable)
{ {
struct hostapd_data *hapd = (struct hostapd_data*)esp_wifi_get_hostap_private_internal(); struct hostapd_data *hapd = (struct hostapd_data*)esp_wifi_get_hostap_private_internal();
struct wpa_state_machine **wpa_sm;
if (!sm || !bssid || !wpa_ie){ if (!sta || !bssid || !wpa_ie){
return false; return false;
} }
wpa_sm = (struct wpa_state_machine **)sm;
if (hapd) { if (hapd) {
if (hapd->wpa_auth->conf.wpa) { if (hapd->wpa_auth->conf.wpa) {
if (*wpa_sm){ if (sta->wpa_sm){
wpa_auth_sta_deinit(*wpa_sm); wpa_auth_sta_deinit(sta->wpa_sm);
} }
*wpa_sm = wpa_auth_sta_init(hapd->wpa_auth, bssid); sta->wpa_sm = wpa_auth_sta_init(hapd->wpa_auth, bssid);
wpa_printf( MSG_DEBUG, "init wpa sm=%p\n", *wpa_sm); wpa_printf( MSG_DEBUG, "init wpa sm=%p\n", sta->wpa_sm);
if (*wpa_sm == NULL) { if (sta->wpa_sm == NULL) {
return false; return false;
} }
if (wpa_validate_wpa_ie(hapd->wpa_auth, *wpa_sm, wpa_ie, wpa_ie_len)) { if (wpa_validate_wpa_ie(hapd->wpa_auth, sta->wpa_sm, wpa_ie, wpa_ie_len)) {
return false; return false;
} }
//Check whether AP uses Management Frame Protection for this connection //Check whether AP uses Management Frame Protection for this connection
*pmf_enable = wpa_auth_uses_mfp(*wpa_sm); *pmf_enable = wpa_auth_uses_mfp(sta->wpa_sm);
} }
wpa_auth_sta_associated(hapd->wpa_auth, *wpa_sm); wpa_auth_sta_associated(hapd->wpa_auth, sta->wpa_sm);
} }
return true; return true;
} }
bool wpa_ap_remove(void* sm) bool wpa_ap_remove(void* sta_info)
{ {
struct hostapd_data *hapd = hostapd_get_hapd_data(); struct hostapd_data *hapd = hostapd_get_hapd_data();
if (!sm || !hapd) { if (!sta_info || !hapd) {
return false; return false;
} }
ap_free_sta(hapd, sm); ap_free_sta(hapd, sta_info);
return true; return true;
} }