DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

dbus: Stop ongoing scheduled scan when scan is requested

Browse source 
Signed-off-by: Avraham Stern <avraham.stern@intel.com>
This commit is contained in:
Avraham Stern 2015-04-28 14:01:03 +03:00 committed by Jouni Malinen
parent 0c28071872
commit a5da657445
1 changed files with 25 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
wpa_supplicant/dbus/dbus_new_handlers.c
View file

@ -1332,14 +1332,25 @@ DBusMessage * wpas_dbus_handler_scan(DBusMessage *message,
message, message,
"You can specify only Channels in passive scan"); "You can specify only Channels in passive scan");
goto out; goto out;
} else if (params.freqs && params.freqs[0]) {
if (wpa_supplicant_trigger_scan(wpa_s, &params)) {
reply = wpas_dbus_error_scan_error(
message, "Scan request rejected");
}
} else { } else {
wpa_s->scan_req = MANUAL_SCAN_REQ; if (wpa_s->sched_scanning) {
wpa_supplicant_req_scan(wpa_s, 0, 0); wpa_printf(MSG_DEBUG,
"%s[dbus]: Stop ongoing sched_scan to allow requested scan to proceed",
__func__);
wpa_supplicant_cancel_sched_scan(wpa_s);
}
if (params.freqs && params.freqs[0]) {
if (wpa_supplicant_trigger_scan(wpa_s,
&params)) {
reply = wpas_dbus_error_scan_error(
message,
"Scan request rejected");
}
} else {
wpa_s->scan_req = MANUAL_SCAN_REQ;
wpa_supplicant_req_scan(wpa_s, 0, 0);
}
} }
} else if (os_strcmp(type, "active") == 0) { } else if (os_strcmp(type, "active") == 0) {
if (!params.num_ssids) { if (!params.num_ssids) {
@ -1349,6 +1360,13 @@ DBusMessage * wpas_dbus_handler_scan(DBusMessage *message,
#ifdef CONFIG_AUTOSCAN #ifdef CONFIG_AUTOSCAN
autoscan_deinit(wpa_s); autoscan_deinit(wpa_s);
#endif /* CONFIG_AUTOSCAN */ #endif /* CONFIG_AUTOSCAN */
if (wpa_s->sched_scanning) {
wpa_printf(MSG_DEBUG,
"%s[dbus]: Stop ongoing sched_scan to allow requested scan to proceed",
__func__);
wpa_supplicant_cancel_sched_scan(wpa_s);
}
if (wpa_supplicant_trigger_scan(wpa_s, &params)) { if (wpa_supplicant_trigger_scan(wpa_s, &params)) {
reply = wpas_dbus_error_scan_error( reply = wpas_dbus_error_scan_error(
message, "Scan request rejected"); message, "Scan request rejected");