wps: add overlap event

     modify some header files to be consistent with vnc

diff --git a/components/esp_event/event_send_compat.inc b/components/esp_event/event_send_compat.inc
index 42b4daf473d4d1bf575943f26591f4a20ed09848..eff799975b3fe6d3523cbfc06a9970a1a93ec52f 100644 (file)
--- a/components/esp_event/event_send_compat.inc
+++ b/components/esp_event/event_send_compat.inc
@@ -80,6 +80,7 @@ esp_err_t esp_event_send_to_default_loop(system_event_t *event)
         HANDLE_SYS_EVENT(WIFI, STA_WPS_ER_TIMEOUT);
         HANDLE_SYS_EVENT_ARG(WIFI, STA_WPS_ER_FAILED, sta_er_fail_reason);
         HANDLE_SYS_EVENT_ARG(WIFI, STA_WPS_ER_PIN, sta_er_pin);
+        HANDLE_SYS_EVENT(WIFI, STA_WPS_ER_PBC_OVERLAP);
 
         /* AP events */
         HANDLE_SYS_EVENT(WIFI, AP_START);
@@ -233,6 +234,10 @@ static void esp_system_event_debug(const system_event_t* event)
             ESP_LOGD(TAG, "SYSTEM_EVENT_STA_WPS_ER_PIN");
             break;
         }
+        case SYSTEM_EVENT_STA_WPS_ER_PBC_OVERLAP: {
+            ESP_LOGD(TAG, "SYSTEM_EVENT_STA_WPS_ER_PBC_OVERLAP");
+            break;
+        }
         case SYSTEM_EVENT_AP_START: {
             ESP_LOGD(TAG, "SYSTEM_EVENT_AP_START");
             break;

diff --git a/components/esp_event/include/esp_event_legacy.h b/components/esp_event/include/esp_event_legacy.h
index 7748f69a0d9b900ffaa59adfb96e8b10a0cc71f9..44e95546a13b888170c113b6ef33b90a81cee5f6 100644 (file)
--- a/components/esp_event/include/esp_event_legacy.h
+++ b/components/esp_event/include/esp_event_legacy.h
@@ -40,6 +40,7 @@ typedef enum {
     SYSTEM_EVENT_STA_WPS_ER_FAILED,        /*!< ESP32 station wps fails in enrollee mode */
     SYSTEM_EVENT_STA_WPS_ER_TIMEOUT,       /*!< ESP32 station wps timeout in enrollee mode */
     SYSTEM_EVENT_STA_WPS_ER_PIN,           /*!< ESP32 station wps pin code in enrollee mode */
+    SYSTEM_EVENT_STA_WPS_ER_PBC_OVERLAP,   /*!< ESP32 station wps overlap in enrollee mode */
     SYSTEM_EVENT_AP_START,                 /*!< ESP32 soft-AP start */
     SYSTEM_EVENT_AP_STOP,                  /*!< ESP32 soft-AP stop */
     SYSTEM_EVENT_AP_STACONNECTED,          /*!< a station connected to ESP32 soft-AP */

diff --git a/components/esp_wifi/include/esp_wifi_types.h b/components/esp_wifi/include/esp_wifi_types.h
index 8e930c555dfb8b4058234a55c6da27c5b3baa25c..426ba7f58a4c8b73091bc1ccfbdc0a03e05d8d0f 100644 (file)
--- a/components/esp_wifi/include/esp_wifi_types.h
+++ b/components/esp_wifi/include/esp_wifi_types.h
@@ -508,6 +508,7 @@ typedef enum {
     WIFI_EVENT_STA_WPS_ER_FAILED,        /**< ESP32 station wps fails in enrollee mode */
     WIFI_EVENT_STA_WPS_ER_TIMEOUT,       /**< ESP32 station wps timeout in enrollee mode */
     WIFI_EVENT_STA_WPS_ER_PIN,           /**< ESP32 station wps pin code in enrollee mode */
+    WIFI_EVENT_STA_WPS_ER_PBC_OVERLAP,   /**< ESP32 station wps overlap in enrollee mode */
 
     WIFI_EVENT_AP_START,                 /**< ESP32 soft-AP start */
     WIFI_EVENT_AP_STOP,                  /**< ESP32 soft-AP stop */

diff --git a/components/esp_wifi/lib_esp32 b/components/esp_wifi/lib_esp32
index b8b96f985aee155682a2907c6c0f3b693bb43785..fc518f822e23b6f4fd8870d61cb1dba107727df2 160000 (submodule)
--- a/components/esp_wifi/lib_esp32
+++ b/components/esp_wifi/lib_esp32
@@ -1 +1 @@
-Subproject commit b8b96f985aee155682a2907c6c0f3b693bb43785
+Subproject commit fc518f822e23b6f4fd8870d61cb1dba107727df2

diff --git a/components/wpa_supplicant/include/wpa2/eap_peer/eap_i.h b/components/wpa_supplicant/include/wpa2/eap_peer/eap_i.h
index 6204f46538529a3fe9d28d48501019c5c949319e..401d3687a9f89a0ac40b8fb6bd552f7ec977c626 100644 (file)
--- a/components/wpa_supplicant/include/wpa2/eap_peer/eap_i.h
+++ b/components/wpa_supplicant/include/wpa2/eap_peer/eap_i.h
@@ -98,6 +98,13 @@ struct eap_method {
 #define BLOB_NAME_LEN          3
 #define BLOB_NUM               3
 
+enum SIG_WPA2 {
+    SIG_WPA2_START = 0,
+    SIG_WPA2_RX,
+    SIG_WPA2_TASK_DEL,
+    SIG_WPA2_MAX,
+};
+
 /**
  * struct eap_sm - EAP state machine data
  */
@@ -114,8 +121,7 @@ struct eap_sm {
        u8 current_identifier;
        u8 ownaddr[ETH_ALEN];
 #ifdef USE_WPA2_TASK
-#define SIG_WPA2_NUM 2
-       u8 wpa2_sig_cnt[SIG_WPA2_NUM];
+       u8 wpa2_sig_cnt[SIG_WPA2_MAX];
 #endif
        u8 finish_state;
 

diff --git a/components/wpa_supplicant/include/wps/wps.h b/components/wpa_supplicant/include/wps/wps.h
index 42544957412e8501eb014a69d163676a6bf4dfd5..7249d6eee8d0fc55d0a3cc3bc50f8ee38e43b39c 100644 (file)
--- a/components/wpa_supplicant/include/wps/wps.h
+++ b/components/wpa_supplicant/include/wps/wps.h
@@ -1009,9 +1009,9 @@ enum wps_cb_status {
 typedef void (*wps_st_cb_t)(int status);
 
 #ifdef USE_WPS_TASK
-#define SIG_WPS_START  0
-#define        SIG_WPS_RX      1
-#define        SIG_WPS_NUM     2
+#define SIG_WPS_START  2
+#define        SIG_WPS_RX      3
+#define        SIG_WPS_NUM     9
 #endif
 
 #define WPS_EAP_EXT_VENDOR_TYPE "WFA-SimpleConfig-Enrollee-1-0"