Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2024-11-28 18:28:23 -05:00
Code Issues Projects Releases Wiki Activity

Use priority list instead of global for PNO

Browse Source 
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
This commit is contained in:
Dmitry Shmidt 2015-02-12 10:25:15 -08:00 committed by Jouni Malinen
parent d0007ac9d7
commit 6f5e1b0bf6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wpa_supplicant/scan.c
View File

@ -2036,7 +2036,7 @@ void wpa_scan_free_params(struct wpa_driver_scan_params *params)
int wpas_start_pno(struct wpa_supplicant *wpa_s) int wpas_start_pno(struct wpa_supplicant *wpa_s)
{ {
int ret, interval; int ret, interval, prio;
size_t i, num_ssid, num_match_ssid; size_t i, num_ssid, num_match_ssid;
struct wpa_ssid *ssid; struct wpa_ssid *ssid;
struct wpa_driver_scan_params params; struct wpa_driver_scan_params params;
@ -2101,8 +2101,10 @@ int wpas_start_pno(struct wpa_supplicant *wpa_s)
sizeof(struct wpa_driver_scan_filter)); sizeof(struct wpa_driver_scan_filter));
if (params.filter_ssids == NULL) if (params.filter_ssids == NULL)
return -1; return -1;
i = 0; i = 0;
ssid = wpa_s->conf->ssid; prio = 0;
ssid = wpa_s->conf->pssid[prio];
while (ssid) { while (ssid) {
if (!wpas_network_disabled(wpa_s, ssid)) { if (!wpas_network_disabled(wpa_s, ssid)) {
if (ssid->scan_ssid && params.num_ssids < num_ssid) { if (ssid->scan_ssid && params.num_ssids < num_ssid) {
@ -2120,7 +2122,12 @@ int wpas_start_pno(struct wpa_supplicant *wpa_s)
if (i == num_match_ssid) if (i == num_match_ssid)
break; break;
} }
ssid = ssid->next; if (ssid->pnext)
ssid = ssid->pnext;
else if (prio + 1 == wpa_s->conf->num_prio)
break;
else
ssid = wpa_s->conf->pssid[++prio];
} }
if (wpa_s->conf->filter_rssi) if (wpa_s->conf->filter_rssi)