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

Fix per-SSID scan (scan_ssid=1)

Browse source 
Commit d3a9822542 broke per-SSID scan
by using the ssid variable for internal loop and by doing so,
overriding the value that was needed below to figure out whether the
scan is for a specific SSID. Fix this by using a temporary variable
instead when looping over network finding which frequencies to scan for.
This commit is contained in:
Jouni Malinen 2009-11-10 18:00:57 +02:00 committed by Jouni Malinen
parent 5228401cbc
commit 5be45e2e6e
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
wpa_supplicant/scan.c
View file

@ -300,7 +300,7 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
*/ */
ssid = NULL; ssid = NULL;
} else { } else {
struct wpa_ssid *start = ssid; struct wpa_ssid *start = ssid, *tssid;
int freqs_set = 0; int freqs_set = 0;
if (ssid == NULL && max_ssids > 1) if (ssid == NULL && max_ssids > 1)
ssid = wpa_s->conf->ssid; ssid = wpa_s->conf->ssid;
@ -324,12 +324,12 @@ static void wpa_supplicant_scan(void *eloop_ctx, void *timeout_ctx)
ssid = wpa_s->conf->ssid; ssid = wpa_s->conf->ssid;
} }
for (ssid = wpa_s->conf->ssid; ssid; ssid = ssid->next) { for (tssid = wpa_s->conf->ssid; tssid; tssid = tssid->next) {
if (ssid->disabled) if (tssid->disabled)
continue; continue;
if ((params.freqs || !freqs_set) && ssid->scan_freq) { if ((params.freqs || !freqs_set) && tssid->scan_freq) {
int_array_concat(&params.freqs, int_array_concat(&params.freqs,
ssid->scan_freq); tssid->scan_freq);
} else { } else {
os_free(params.freqs); os_free(params.freqs);
params.freqs = NULL; params.freqs = NULL;