Amazing-Mirror/fragattacks
1
0
Fork 0
mirror of https://github.com/vanhoefm/fragattacks.git synced 2025-02-21 11:33:04 -05:00
Code Issues Projects Releases Wiki Activity

Share a common helper function for restarting sched_scan

Browse Source 
This code sequence was already used at two different places (and an
additional one has been proposed), so add a common helper function to
avoid having to copy-paste this functionality in multiple locations.

Signed-off-by: Jouni Malinen <jouni@qca.qualcomm.com>
This commit is contained in:
Jouni Malinen 2016-09-27 00:09:33 +03:00 committed by Jouni Malinen
parent be7ebd892e
commit 5bb7327a69
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wpa_supplicant/ctrl_iface.c
View File

@ -8564,10 +8564,7 @@ static int wpas_ctrl_iface_mac_rand_scan(struct wpa_supplicant *wpa_s,
} }
} else if (wpa_s->sched_scanning && } else if (wpa_s->sched_scanning &&
(type & MAC_ADDR_RAND_SCHED_SCAN)) { (type & MAC_ADDR_RAND_SCHED_SCAN)) {
/* simulate timeout to restart the sched scan */ wpas_scan_restart_sched_scan(wpa_s);
wpa_s->sched_scan_timed_out = 1;
wpa_s->prev_sched_ssid = NULL;
wpa_supplicant_cancel_sched_scan(wpa_s);
} }
return 0; return 0;
} }
@ -8593,12 +8590,8 @@ static int wpas_ctrl_iface_mac_rand_scan(struct wpa_supplicant *wpa_s,
wpas_mac_addr_rand_scan_set(wpa_s, MAC_ADDR_RAND_SCHED_SCAN, wpas_mac_addr_rand_scan_set(wpa_s, MAC_ADDR_RAND_SCHED_SCAN,
addr, mask); addr, mask);
if (wpa_s->sched_scanning && !wpa_s->pno) { if (wpa_s->sched_scanning && !wpa_s->pno)
/* simulate timeout to restart the sched scan */ wpas_scan_restart_sched_scan(wpa_s);
wpa_s->sched_scan_timed_out = 1;
wpa_s->prev_sched_ssid = NULL;
wpa_supplicant_cancel_sched_scan(wpa_s);
}
} }
if (type & MAC_ADDR_RAND_PNO) { if (type & MAC_ADDR_RAND_PNO) {

9
wpa_supplicant/scan.c
View File

@ -2745,3 +2745,12 @@ void wpas_scan_reset_sched_scan(struct wpa_supplicant *wpa_s)
wpa_supplicant_cancel_sched_scan(wpa_s); wpa_supplicant_cancel_sched_scan(wpa_s);
} }
} }
void wpas_scan_restart_sched_scan(struct wpa_supplicant *wpa_s)
{
/* simulate timeout to restart the sched scan */
wpa_s->sched_scan_timed_out = 1;
wpa_s->prev_sched_ssid = NULL;
wpa_supplicant_cancel_sched_scan(wpa_s);
}

1
wpa_supplicant/scan.h
View File

@ -45,6 +45,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 wpas_stop_pno(struct wpa_supplicant *wpa_s); int wpas_stop_pno(struct wpa_supplicant *wpa_s);
void wpas_scan_reset_sched_scan(struct wpa_supplicant *wpa_s); void wpas_scan_reset_sched_scan(struct wpa_supplicant *wpa_s);
void wpas_scan_restart_sched_scan(struct wpa_supplicant *wpa_s);
void wpas_mac_addr_rand_scan_clear(struct wpa_supplicant *wpa_s, void wpas_mac_addr_rand_scan_clear(struct wpa_supplicant *wpa_s,
unsigned int type); unsigned int type);