WPS: Fix failure path to allow WSC_NACK and EAP-Failure to be exchanged

Commit c7a67a77195464d667d6f482777a75325b6f3642 forced disconnection
when wpas_clear_wps() is called. Call this function from a registered
timeout when processing a failure event in order to allow the WPS
handshake to be completed with WSC_NACK and EAP-Failure.

Signed-hostap: Jouni Malinen <jouni@qca.qualcomm.com>

diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c
index 452ce8ee6b5a0d6f28cf43f7e21c5c4d6b42b2ea..ef50878b631e9fe119fde42456fa2c1dd8a985aa 100644 (file)
--- a/wpa_supplicant/wps_supplicant.c
+++ b/wpa_supplicant/wps_supplicant.c
@@ -567,6 +567,14 @@ static void wpa_supplicant_wps_event_m2d(struct wpa_supplicant *wpa_s,
 }
 
 
+static void wpas_wps_clear_timeout(void *eloop_ctx, void *timeout_ctx)
+{
+       struct wpa_supplicant *wpa_s = eloop_ctx;
+       wpa_printf(MSG_DEBUG, "WPS: Clear WPS network from timeout");
+       wpas_clear_wps(wpa_s);
+}
+
+
 static void wpa_supplicant_wps_event_fail(struct wpa_supplicant *wpa_s,
                                          struct wps_event_fail *fail)
 {
@@ -591,7 +599,14 @@ static void wpa_supplicant_wps_event_fail(struct wpa_supplicant *wpa_s,
                                "msg=%d config_error=%d",
                                fail->msg, fail->config_error);
        }
-       wpas_clear_wps(wpa_s);
+
+       /*
+        * Need to allow WPS processing to complete, e.g., by sending WSC_NACK.
+        */
+       wpa_printf(MSG_DEBUG, "WPS: Register timeout to clear WPS network");
+       eloop_cancel_timeout(wpas_wps_clear_timeout, wpa_s, NULL);
+       eloop_register_timeout(0, 100000, wpas_wps_clear_timeout, wpa_s, NULL);
+
        wpas_notify_wps_event_fail(wpa_s, fail);
 #ifdef CONFIG_P2P
        wpas_p2p_wps_failed(wpa_s, fail);
@@ -1385,6 +1400,7 @@ int wpas_wps_init(struct wpa_supplicant *wpa_s)
 void wpas_wps_deinit(struct wpa_supplicant *wpa_s)
 {
        eloop_cancel_timeout(wpas_wps_timeout, wpa_s, NULL);
+       eloop_cancel_timeout(wpas_wps_clear_timeout, wpa_s, NULL);
        eloop_cancel_timeout(wpas_wps_reenable_networks_cb, wpa_s, NULL);
        wpas_wps_clear_ap_info(wpa_s);