jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

WPS: Make WPS-AP-AVAILABLE* events a bit more consistent

Browse source 
The BSS table entries may be in more or less random order and it is
better to show the most likely WPS configuration method in a way that is
somewhat more consistent instead of just showing the method of the first
BSS entry found in the table.
This commit is contained in:
Jouni Malinen 2011-01-05 11:49:03 +02:00 committed by Jouni Malinen
parent 62a0255c1f
commit 6c6ad81f9c
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
wpa_supplicant/wps_supplicant.c
View file

@ -1297,6 +1297,7 @@ int wpas_wps_scan_pbc_overlap(struct wpa_supplicant *wpa_s,
void wpas_wps_notify_scan_results(struct wpa_supplicant *wpa_s) void wpas_wps_notify_scan_results(struct wpa_supplicant *wpa_s)
{ {
struct wpa_bss *bss; struct wpa_bss *bss;
unsigned int pbc = 0, auth = 0, pin = 0, wps = 0;
if (wpa_s->disconnected || wpa_s->wpa_state >= WPA_ASSOCIATED) if (wpa_s->disconnected || wpa_s->wpa_state >= WPA_ASSOCIATED)
return; return;
@ -1307,20 +1308,24 @@ void wpas_wps_notify_scan_results(struct wpa_supplicant *wpa_s)
if (!ie) if (!ie)
continue; continue;
if (wps_is_selected_pbc_registrar(ie)) if (wps_is_selected_pbc_registrar(ie))
wpa_msg_ctrl(wpa_s, MSG_INFO, pbc++;
WPS_EVENT_AP_AVAILABLE_PBC);
else if (wps_is_addr_authorized(ie, wpa_s->own_addr, 0)) else if (wps_is_addr_authorized(ie, wpa_s->own_addr, 0))
wpa_msg_ctrl(wpa_s, MSG_INFO, auth++;
WPS_EVENT_AP_AVAILABLE_AUTH);
else if (wps_is_selected_pin_registrar(ie)) else if (wps_is_selected_pin_registrar(ie))
wpa_msg_ctrl(wpa_s, MSG_INFO, pin++;
WPS_EVENT_AP_AVAILABLE_PIN);
else else
wpa_msg_ctrl(wpa_s, MSG_INFO, wps++;
WPS_EVENT_AP_AVAILABLE);
wpabuf_free(ie); wpabuf_free(ie);
break;
} }
if (pbc)
wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE_PBC);
else if (auth)
wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE_AUTH);
else if (pin)
wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE_PIN);
else if (wps)
wpa_msg_ctrl(wpa_s, MSG_INFO, WPS_EVENT_AP_AVAILABLE);
} }