Crash_Override/OVMS3-idf
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

wps: add overlap event (backport v3.3)

Browse source 
modify some header files to be consistent with vnc
This commit is contained in:
xiehang 2019-05-31 19:09:29 +08:00
parent 06651c0951
commit cf3647fe40
5 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
components/esp32/event_default_handlers.c
View file

@ -365,6 +365,10 @@ static esp_err_t esp_system_event_debug(system_event_t *event)
ESP_LOGD(TAG, "SYSTEM_EVENT_STA_WPS_ER_PIN"); ESP_LOGD(TAG, "SYSTEM_EVENT_STA_WPS_ER_PIN");
break; 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: { case SYSTEM_EVENT_AP_START: {
ESP_LOGD(TAG, "SYSTEM_EVENT_AP_START"); ESP_LOGD(TAG, "SYSTEM_EVENT_AP_START");
break; break;

1
components/esp32/include/esp_event_legacy.h
View file

@ -40,6 +40,7 @@ typedef enum {
SYSTEM_EVENT_STA_WPS_ER_FAILED, /**< ESP32 station wps fails in enrollee mode */ 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_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_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_START, /**< ESP32 soft-AP start */
SYSTEM_EVENT_AP_STOP, /**< ESP32 soft-AP stop */ SYSTEM_EVENT_AP_STOP, /**< ESP32 soft-AP stop */
SYSTEM_EVENT_AP_STACONNECTED, /**< a station connected to ESP32 soft-AP */ SYSTEM_EVENT_AP_STACONNECTED, /**< a station connected to ESP32 soft-AP */

2
components/esp32/lib

@ -1 +1 @@
Subproject commit b8b96f985aee155682a2907c6c0f3b693bb43785 Subproject commit fc518f822e23b6f4fd8870d61cb1dba107727df2

11
components/wpa_supplicant/include/wpa2/eap_peer/eap_i.h
View file

@ -98,6 +98,14 @@ struct eap_method {
#define BLOB_NAME_LEN 3 #define BLOB_NAME_LEN 3
#define BLOB_NUM 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 * struct eap_sm - EAP state machine data
*/ */
@ -114,8 +122,7 @@ struct eap_sm {
u8 current_identifier; u8 current_identifier;
u8 ownaddr[ETH_ALEN]; u8 ownaddr[ETH_ALEN];
#ifdef USE_WPA2_TASK #ifdef USE_WPA2_TASK
#define SIG_WPA2_NUM 2 u8 wpa2_sig_cnt[SIG_WPA2_MAX];
u8 wpa2_sig_cnt[SIG_WPA2_NUM];
#endif #endif
u8 finish_state; u8 finish_state;

6
components/wpa_supplicant/include/wps/wps.h
View file

@ -1009,9 +1009,9 @@ enum wps_cb_status {
typedef void (*wps_st_cb_t)(int status); typedef void (*wps_st_cb_t)(int status);
#ifdef USE_WPS_TASK #ifdef USE_WPS_TASK
#define SIG_WPS_START 0 #define SIG_WPS_START 2
#define SIG_WPS_RX 1 #define SIG_WPS_RX 3
#define SIG_WPS_NUM 2 #define SIG_WPS_NUM 9
#endif #endif
#define WPS_EAP_EXT_VENDOR_TYPE "WFA-SimpleConfig-Enrollee-1-0" #define WPS_EAP_EXT_VENDOR_TYPE "WFA-SimpleConfig-Enrollee-1-0"