Skip to content

Commit dc814f2

Browse files
author
Jiang Jiang Jian
committed
Merge branch 'bugfix/dpp_sync_issue' into 'master'
fix(esp_wifi): Fixed DPP concurrency issue Closes WIFIBUG-1229 See merge request espressif/esp-idf!38832
2 parents de3b6ff + 3c84fd7 commit dc814f2

File tree

7 files changed

+208
-82
lines changed

7 files changed

+208
-82
lines changed

components/esp_wifi/include/esp_wifi_types_generic.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,6 +1116,9 @@ typedef enum {
11161116
WIFI_EVENT_AP_WRONG_PASSWORD, /**< a station tried to connect with wrong password */
11171117

11181118
WIFI_EVENT_STA_BEACON_OFFSET_UNSTABLE, /**< Station sampled beacon offset unstable */
1119+
WIFI_EVENT_DPP_URI_READY, /**< DPP URI is ready through Bootstrapping */
1120+
WIFI_EVENT_DPP_CFG_RECVD, /**< Config received via DPP Authentication */
1121+
WIFI_EVENT_DPP_FAILED, /**< DPP failed */
11191122
WIFI_EVENT_MAX, /**< Invalid Wi-Fi event ID */
11201123
} wifi_event_t;
11211124

@@ -1520,6 +1523,22 @@ typedef struct {
15201523
float beacon_success_rate; /**< Received beacon success rate */
15211524
} wifi_event_sta_beacon_offset_unstable_t;
15221525

1526+
/** Argument structure for WIFI_EVENT_DPP_URI_READY event */
1527+
typedef struct {
1528+
uint32_t uri_data_len; /**< URI data length including null termination */
1529+
char uri[]; /**< URI data */
1530+
} wifi_event_dpp_uri_ready_t;
1531+
1532+
/** Argument structure for WIFI_EVENT_DPP_CFG_RECVD event */
1533+
typedef struct {
1534+
wifi_config_t wifi_cfg; /**< Received WIFI config in DPP */
1535+
} wifi_event_dpp_config_received_t;
1536+
1537+
/** Argument structure for WIFI_EVENT_DPP_FAIL event */
1538+
typedef struct {
1539+
int failure_reason; /**< Failure reason */
1540+
} wifi_event_dpp_failed_t;
1541+
15231542
#ifdef __cplusplus
15241543
}
15251544
#endif

components/wpa_supplicant/esp_supplicant/include/esp_dpp.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* SPDX-FileCopyrightText: 2020-2024 Espressif Systems (Shanghai) CO LTD
2+
* SPDX-FileCopyrightText: 2020-2025 Espressif Systems (Shanghai) CO LTD
33
*
44
* SPDX-License-Identifier: Apache-2.0
55
*/
@@ -55,7 +55,10 @@ typedef void (*esp_supp_dpp_event_cb_t)(esp_supp_dpp_event_t evt, void *data);
5555
*
5656
* Starts DPP Supplicant and initializes related Data Structures.
5757
*
58-
* @param evt_cb Callback function to receive DPP related events
58+
* @note The `evt_cb` parameter is deprecated and will be ignored in future IDF versions.
59+
* Directly register for WiFi events to get DPP events.
60+
*
61+
* @param evt_cb (Deprecated) Callback function to receive DPP related events
5962
*
6063
* return
6164
* - ESP_OK: Success

0 commit comments

Comments
 (0)