wps: add overlap event

diff --git a/components/esp32/event_default_handlers.c b/components/esp32/event_default_handlers.c
index 8a397a345705e1711829f1cd3aa7a6fd0d9d97cd..10c4616d9a15b1a96be2075b2c1359c539a23df8 100644 (file)
--- a/components/esp32/event_default_handlers.c
+++ b/components/esp32/event_default_handlers.c
@@ -314,6 +314,10 @@ static esp_err_t esp_system_event_debug(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/esp32/include/esp_event_legacy.h b/components/esp32/include/esp_event_legacy.h
index 3bb2a77b9ff6fee1d96d4f3302429078a365b5ae..a25188418198e1adbbe648e9c4aa149d67ad14bd 100644 (file)
--- a/components/esp32/include/esp_event_legacy.h
+++ b/components/esp32/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/esp32/lib b/components/esp32/lib
index f3f11ddbe9f9fc2b2667bf13105ffa6628ec2ce2..18170e1677ddd567ba20cf773e71bfd2695a5164 160000 (submodule)
--- a/components/esp32/lib
+++ b/components/esp32/lib
@@ -1 +1 @@
-Subproject commit f3f11ddbe9f9fc2b2667bf13105ffa6628ec2ce2
+Subproject commit 18170e1677ddd567ba20cf773e71bfd2695a5164

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..6adf5ec7e35c1fa987d3b3935d9d2fdd0b8ef4a1 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 b731b9b95f2cc4ccc365fcad8206b8f6e9900bef..31092cbb8366ea2717de097c5d0e169197b017bd 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"