From 4125c560074c53b63e2b7329c6530039a0dffadb Mon Sep 17 00:00:00 2001
From: aditi_lonkar <aditi.lonkar@espressif.com>
Date: Mon, 6 Nov 2023 11:17:01 +0530
Subject: [PATCH] fix(wifi):Fix for setting wps status fail when connection
 fails

---
 .../esp_wifi/include/esp_wifi_types_generic.h |  1 +
 components/esp_wifi/lib                       |  2 +-
 .../esp_supplicant/src/esp_wpa_main.c         |  6 +++++
 .../esp_supplicant/src/esp_wps.c              | 23 +++++++++++++++++++
 .../esp_supplicant/src/esp_wps_i.h            |  5 ++++
 5 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/components/esp_wifi/include/esp_wifi_types_generic.h b/components/esp_wifi/include/esp_wifi_types_generic.h
index 97bb8542ed..d1ea00f9a2 100644
--- a/components/esp_wifi/include/esp_wifi_types_generic.h
+++ b/components/esp_wifi/include/esp_wifi_types_generic.h
@@ -879,6 +879,7 @@ typedef struct {
 typedef enum {
     WPS_FAIL_REASON_NORMAL = 0,     /**< WPS normal fail reason */
     WPS_FAIL_REASON_RECV_M2D,       /**< WPS receive M2D frame */
+    WPS_FAIL_REASON_RECV_DEAUTH,    /**< Recv deauth from AP while wps handshake */
     WPS_FAIL_REASON_MAX
 } wifi_event_sta_wps_fail_reason_t;
 
diff --git a/components/esp_wifi/lib b/components/esp_wifi/lib
index 17509c30ae..7fbc7d9f5a 160000
--- a/components/esp_wifi/lib
+++ b/components/esp_wifi/lib
@@ -1 +1 @@
-Subproject commit 17509c30aecde2c38bf4d3cc3e860b9297cf23e8
+Subproject commit 7fbc7d9f5a205177f28c4ce48e67d9eaa28908d8
diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c b/components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
index 8dd2596ed7..7972a6c93f 100644
--- a/components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
+++ b/components/wpa_supplicant/esp_supplicant/src/esp_wpa_main.c
@@ -33,6 +33,7 @@
 #include "esp_owe_i.h"
 
 #include "esp_wps.h"
+#include "esp_wps_i.h"
 #include "eap_server/eap.h"
 #include "eapol_auth/eapol_auth_sm.h"
 #include "ap/ieee802_1x.h"
@@ -303,6 +304,11 @@ static void wpa_sta_disconnected_cb(uint8_t reason_code)
         }
         break;
     }
+
+    struct wps_sm_funcs *wps_sm_cb = wps_get_wps_sm_cb();
+    if (wps_sm_cb && wps_sm_cb->wps_sm_notify_deauth) {
+        wps_sm_cb->wps_sm_notify_deauth();
+    }
 #ifdef CONFIG_OWE_STA
     owe_deinit();
 #endif /* CONFIG_OWE_STA */
diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_wps.c b/components/wpa_supplicant/esp_supplicant/src/esp_wps.c
index 54a01e741b..b68c2403c1 100644
--- a/components/wpa_supplicant/esp_supplicant/src/esp_wps.c
+++ b/components/wpa_supplicant/esp_supplicant/src/esp_wps.c
@@ -45,6 +45,7 @@ struct wps_rx_param {
 };
 static STAILQ_HEAD(, wps_rx_param) s_wps_rxq;
 
+static struct wps_sm_funcs *s_wps_sm_cb = NULL;
 static void *s_wps_task_hdl = NULL;
 static void *s_wps_queue = NULL;
 static void *s_wps_data_lock = NULL;
@@ -839,6 +840,13 @@ int wps_finish(void)
     return ret;
 }
 
+static void wps_sm_notify_deauth(void)
+{
+    if (gWpsSm && gWpsSm->wps->state != WPS_FINISHED) {
+        wps_stop_process(WPS_FAIL_REASON_RECV_DEAUTH);
+    }
+}
+
 /* Add current ap to discard ap list */
 void wps_add_discard_ap(u8 *bssid)
 {
@@ -1385,6 +1393,11 @@ int wps_init_cfg_pin(struct wps_config *cfg)
     return 0;
 }
 
+struct wps_sm_funcs* wps_get_wps_sm_cb(void)
+{
+    return s_wps_sm_cb;
+}
+
 static int wifi_station_wps_init(const esp_wps_config_t *config)
 {
     struct wps_funcs *wps_cb;
@@ -1466,6 +1479,12 @@ static int wifi_station_wps_init(const esp_wps_config_t *config)
     wps_cb->wps_start_pending = wps_start_pending;
     esp_wifi_set_wps_cb_internal(wps_cb);
 
+    s_wps_sm_cb = os_malloc(sizeof(struct wps_sm_funcs));
+    if (s_wps_sm_cb == NULL) {
+        goto _err;
+    }
+    s_wps_sm_cb->wps_sm_notify_deauth = wps_sm_notify_deauth;
+
     return ESP_OK;
 
 _err:
@@ -1539,6 +1558,10 @@ wifi_station_wps_deinit(void)
         wps_deinit(sm->wps);
         sm->wps = NULL;
     }
+    if (s_wps_sm_cb) {
+        os_free(s_wps_sm_cb);
+        s_wps_sm_cb = NULL;
+    }
     os_free(gWpsSm);
     gWpsSm = NULL;
 
diff --git a/components/wpa_supplicant/esp_supplicant/src/esp_wps_i.h b/components/wpa_supplicant/esp_supplicant/src/esp_wps_i.h
index a59dc897f9..4ffbb8b4dd 100644
--- a/components/wpa_supplicant/esp_supplicant/src/esp_wps_i.h
+++ b/components/wpa_supplicant/esp_supplicant/src/esp_wps_i.h
@@ -118,6 +118,11 @@ int wps_sm_rx_eapol(u8 *src_addr, u8 *buf, u32 len);
 int wps_dev_deinit(struct wps_device_data *dev);
 int wps_dev_init(void);
 int wps_set_factory_info(const esp_wps_config_t *config);
+struct wps_sm_funcs {
+    void (*wps_sm_notify_deauth)(void);
+};
+
+struct wps_sm_funcs* wps_get_wps_sm_cb(void);
 
 static inline int wps_get_type(void)
 {