From: Jouni Malinen Date: Thu, 26 Dec 2013 17:00:48 +0000 (+0200) Subject: Do not use results from externally requested scan for network selection X-Git-Tag: hostap_2_1~366 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=015af91fea2ec780cb44914bfc0cbc39932cf60d;p=thirdparty%2Fhostap.git Do not use results from externally requested scan for network selection It may not always be desirable to trigger reassociation or network change based on scan results from externally to wpa_supplicant trigger scan operations. Skip network selection and roaming determination if the received scan result is known to be triggered by something external to wpa_supplicant. The control interface SCAN command can be used to request wpa_supplicant to determine the best network. Signed-hostap: Jouni Malinen --- diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 308e82e94..062c696d0 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -1279,6 +1279,12 @@ static int _wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s, wpas_notify_scan_done(wpa_s, 1); + if (!wpa_s->own_scan_running && wpa_s->external_scan_running) { + wpa_dbg(wpa_s, MSG_DEBUG, "Do not use results from externally requested scan operation for network selection"); + wpa_scan_results_free(scan_res); + return 0; + } + if (sme_proc_obss_scan(wpa_s) > 0) { wpa_scan_results_free(scan_res); return 0;