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

Allow sub-second resolution for scan requests

Browse source 
This is in preparation to use cases that may benefit from more frequent
scanning.
This commit is contained in:
Jouni Malinen 2010-04-11 19:10:01 +03:00 committed by Jouni Malinen
parent 17a4734dc4
commit 977b11747f
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
wpa_supplicant/events.c
View file

@ -698,7 +698,7 @@ wpa_supplicant_pick_network(struct wpa_supplicant *wpa_s,
static void wpa_supplicant_req_new_scan(struct wpa_supplicant *wpa_s, static void wpa_supplicant_req_new_scan(struct wpa_supplicant *wpa_s,
int timeout) int timeout_sec, int timeout_usec)
{ {
if (wpa_s->scan_res_tried == 1 && wpa_s->conf->ap_scan == 1) { if (wpa_s->scan_res_tried == 1 && wpa_s->conf->ap_scan == 1) {
/* /*
@ -706,7 +706,8 @@ static void wpa_supplicant_req_new_scan(struct wpa_supplicant *wpa_s,
* complete when fetched before the first scan request. * complete when fetched before the first scan request.
*/ */
wpa_s->scan_res_tried++; wpa_s->scan_res_tried++;
timeout = 0; timeout_sec = 0;
timeout_usec = 0;
} else if (!wpa_supplicant_enabled_networks(wpa_s->conf)) { } else if (!wpa_supplicant_enabled_networks(wpa_s->conf)) {
/* /*
* No networks are enabled; short-circuit request so * No networks are enabled; short-circuit request so
@ -716,7 +717,7 @@ static void wpa_supplicant_req_new_scan(struct wpa_supplicant *wpa_s,
wpa_supplicant_set_state(wpa_s, WPA_INACTIVE); wpa_supplicant_set_state(wpa_s, WPA_INACTIVE);
return; return;
} }
wpa_supplicant_req_scan(wpa_s, timeout, 0); wpa_supplicant_req_scan(wpa_s, timeout_sec, timeout_usec);
} }
@ -727,7 +728,7 @@ void wpa_supplicant_connect(struct wpa_supplicant *wpa_s,
if (wpas_wps_scan_pbc_overlap(wpa_s, selected, ssid)) { if (wpas_wps_scan_pbc_overlap(wpa_s, selected, ssid)) {
wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_OVERLAP wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_OVERLAP
"PBC session overlap"); "PBC session overlap");
wpa_supplicant_req_new_scan(wpa_s, 10); wpa_supplicant_req_new_scan(wpa_s, 10, 0);
return; return;
} }
@ -742,7 +743,7 @@ void wpa_supplicant_connect(struct wpa_supplicant *wpa_s,
os_memcmp(selected->bssid, wpa_s->pending_bssid, ETH_ALEN) != os_memcmp(selected->bssid, wpa_s->pending_bssid, ETH_ALEN) !=
0))) { 0))) {
if (wpa_supplicant_scard_init(wpa_s, ssid)) { if (wpa_supplicant_scard_init(wpa_s, ssid)) {
wpa_supplicant_req_new_scan(wpa_s, 10); wpa_supplicant_req_new_scan(wpa_s, 10, 0);
return; return;
} }
wpa_supplicant_associate(wpa_s, selected, ssid); wpa_supplicant_associate(wpa_s, selected, ssid);
@ -894,7 +895,7 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s,
return; return;
wpa_printf(MSG_DEBUG, "Failed to get scan results - try " wpa_printf(MSG_DEBUG, "Failed to get scan results - try "
"scanning again"); "scanning again");
wpa_supplicant_req_new_scan(wpa_s, 1); wpa_supplicant_req_new_scan(wpa_s, 1, 0);
return; return;
} }
@ -949,8 +950,12 @@ static void wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s,
if (ssid) { if (ssid) {
wpa_printf(MSG_DEBUG, "Setup a new network"); wpa_printf(MSG_DEBUG, "Setup a new network");
wpa_supplicant_associate(wpa_s, NULL, ssid); wpa_supplicant_associate(wpa_s, NULL, ssid);
} else } else {
wpa_supplicant_req_new_scan(wpa_s, 5); int timeout_sec = 5;
int timeout_usec = 0;
wpa_supplicant_req_new_scan(wpa_s, timeout_sec,
timeout_usec);
}
} }
} }
#endif /* CONFIG_NO_SCAN_PROCESSING */ #endif /* CONFIG_NO_SCAN_PROCESSING */