Ignore externally triggered scan results with scan_res_handler

wpa_s->scan_res_handler is set only for cases where a scan operation is
requested for a specific purpose. As such, this callback should only be
called when a scan result from a scan that was triggered by
wpa_supplicant is processed.

Signed-hostap: Jouni Malinen <j@w1.fi>
This commit is contained in:
Jouni Malinen 2014-01-03 12:00:13 +02:00
parent c9b5559737
commit 06f9acce18

View file

@ -1243,7 +1243,8 @@ static int _wpa_supplicant_event_scan_results(struct wpa_supplicant *wpa_s,
} }
#endif /* CONFIG_NO_RANDOM_POOL */ #endif /* CONFIG_NO_RANDOM_POOL */
if (own_request && wpa_s->scan_res_handler) { if (own_request && wpa_s->scan_res_handler &&
(wpa_s->own_scan_running || !wpa_s->external_scan_running)) {
void (*scan_res_handler)(struct wpa_supplicant *wpa_s, void (*scan_res_handler)(struct wpa_supplicant *wpa_s,
struct wpa_scan_results *scan_res); struct wpa_scan_results *scan_res);