From: Jouni Malinen <jouni@codeaurora.org>
Date: Fri, 20 Dec 2019 14:51:59 +0000 (+0200)
Subject: DPP: Abort ongoing scan if connection status needs to be sent
X-Git-Tag: hostap_2_10~2142
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9be30ffc1356a828c7b4644f473e0adc9665818a;p=thirdparty%2Fhostap.git

DPP: Abort ongoing scan if connection status needs to be sent

Ongoing scan could prevent the station Enrollee from sending out DPP
connection status after the 15 second timeout and that would result in
the Configurator timing out on the wait for the status report. Abort any
ongoing scan, if needed, to avoid this.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
---

diff --git a/wpa_supplicant/dpp_supplicant.c b/wpa_supplicant/dpp_supplicant.c
index 1c9faa159..c01ff9498 100644
--- a/wpa_supplicant/dpp_supplicant.c
+++ b/wpa_supplicant/dpp_supplicant.c
@@ -197,6 +197,8 @@ static void wpas_dpp_conn_status_result_timeout(void *eloop_ctx,
 		result = DPP_STATUS_NO_AP;
 	else
 		result = 255; /* What to report here for unexpected state? */
+	if (wpa_s->wpa_state == WPA_SCANNING)
+		wpas_abort_ongoing_scan(wpa_s);
 	wpas_dpp_send_conn_status_result(wpa_s, result);
 }