DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Allow SA Query to be disabled for testing purposes

Browse source 
The new wpa_supplicant control interface SET parameter disable_sa_query
can now be used to disable SA Query on receiving unprotected
disconnection event.

Signed-off-by: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2020-03-21 18:12:02 +02:00
parent 7546c489a9
commit eb26a6997d
3 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
wpa_supplicant/ctrl_iface.c
View file

@ -721,6 +721,8 @@ static int wpa_supplicant_ctrl_iface_set(struct wpa_supplicant *wpa_s,
wpa_s->ignore_assoc_disallow = !!atoi(value); wpa_s->ignore_assoc_disallow = !!atoi(value);
wpa_drv_ignore_assoc_disallow(wpa_s, wpa_drv_ignore_assoc_disallow(wpa_s,
wpa_s->ignore_assoc_disallow); wpa_s->ignore_assoc_disallow);
} else if (os_strcasecmp(cmd, "disable_sa_query") == 0) {
wpa_s->disable_sa_query = !!atoi(value);
} else if (os_strcasecmp(cmd, "ignore_sae_h2e_only") == 0) { } else if (os_strcasecmp(cmd, "ignore_sae_h2e_only") == 0) {
wpa_s->ignore_sae_h2e_only = !!atoi(value); wpa_s->ignore_sae_h2e_only = !!atoi(value);
} else if (os_strcasecmp(cmd, "extra_sae_rejected_groups") == 0) { } else if (os_strcasecmp(cmd, "extra_sae_rejected_groups") == 0) {
@ -8170,6 +8172,7 @@ static void wpa_supplicant_ctrl_iface_flush(struct wpa_supplicant *wpa_s)
wpa_s->p2p_go_csa_on_inv = 0; wpa_s->p2p_go_csa_on_inv = 0;
wpa_s->ignore_auth_resp = 0; wpa_s->ignore_auth_resp = 0;
wpa_s->ignore_assoc_disallow = 0; wpa_s->ignore_assoc_disallow = 0;
wpa_s->disable_sa_query = 0;
wpa_s->testing_resend_assoc = 0; wpa_s->testing_resend_assoc = 0;
wpa_s->ignore_sae_h2e_only = 0; wpa_s->ignore_sae_h2e_only = 0;
wpa_s->reject_btm_req_reason = 0; wpa_s->reject_btm_req_reason = 0;

4
wpa_supplicant/sme.c
View file

@ -2658,6 +2658,10 @@ void sme_event_unprot_disconnect(struct wpa_supplicant *wpa_s, const u8 *sa,
return; return;
if (wpa_s->sme.sa_query_count > 0) if (wpa_s->sme.sa_query_count > 0)
return; return;
#ifdef CONFIG_TESTING_OPTIONS
if (wpa_s->disable_sa_query)
return;
#endif /* CONFIG_TESTING_OPTIONS */
os_get_reltime(&now); os_get_reltime(&now);
if (wpa_s->sme.last_unprot_disconnect.sec && if (wpa_s->sme.last_unprot_disconnect.sec &&

1
wpa_supplicant/wpa_supplicant_i.h
View file

@ -1132,6 +1132,7 @@ struct wpa_supplicant {
unsigned int p2p_go_csa_on_inv:1; unsigned int p2p_go_csa_on_inv:1;
unsigned int ignore_auth_resp:1; unsigned int ignore_auth_resp:1;
unsigned int ignore_assoc_disallow:1; unsigned int ignore_assoc_disallow:1;
unsigned int disable_sa_query:1;
unsigned int testing_resend_assoc:1; unsigned int testing_resend_assoc:1;
unsigned int ignore_sae_h2e_only:1; unsigned int ignore_sae_h2e_only:1;
struct wpabuf *sae_commit_override; struct wpabuf *sae_commit_override;