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 1c9faa159ec658460ef434555e81cb85dd5756f3..c01ff94982796743ce37056c6ec4a809fb82450d 100644 (file)
--- 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);
 }