Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-01 18:50:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/dpp_concurrency_issue_v5.5' into 'release/v5.5'

Browse Source 
fix(esp_wifi): Execute DPP event handlers in eloop context (v5.5)

See merge request espressif/esp-idf!48126
This commit is contained in:
Jiang Jiang Jian
2026-04-30 19:19:06 +08:00
parent a75e6afe94 2c3440481d
commit 736e6f3106
1 changed files with 46 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/wpa_supplicant/esp_supplicant/src/esp_dpp.c
+46 -17
View File
@@ -803,26 +803,24 @@ static void esp_dpp_auth_resp_retry(void *eloop_ctx, void *timeout_ctx)
esp_dpp_auth_resp_retry_timeout(NULL, NULL);
}
static void tx_status_handler(void *arg, esp_event_base_t event_base,
int32_t event_id, void *event_data)
static void tx_status_eloop_handler(void *eloop_ctx, void *event_data)
{
struct dpp_authentication *auth = s_dpp_ctx.dpp_auth;
wifi_event_action_tx_status_t *evt = event_data;
if (!evt) {
return;
}
wpa_printf(MSG_DEBUG, "Mgmt Tx Status - %d, Cookie - 0x%x",
evt->status, (uint32_t)evt->context);
if (evt->op_id != s_current_tx_op_id) {
wpa_printf(MSG_DEBUG, "DPP: status not for recent frame op_id=%u, s_current_tx_op_id=%u",
evt->op_id, s_current_tx_op_id);
return;
}
if (!auth) {
} else if (!auth) {
wpa_printf(MSG_DEBUG, "Auth already deinitialized, return");
return;
}
if (auth->waiting_auth_conf) {
} else if (auth->waiting_auth_conf) {
eloop_cancel_timeout(esp_dpp_auth_resp_retry_timeout, NULL, NULL);
if (evt->status == WIFI_ACTION_TX_FAILED) {
/* failed to send auth response frame */
@@ -842,20 +840,51 @@ static void tx_status_handler(void *arg, esp_event_base_t event_base,
eloop_register_timeout(ESP_GAS_TIMEOUT_SECS, 0, gas_query_timeout, NULL, auth);
}
}
os_free(evt);
}
static void tx_status_handler(void *arg, esp_event_base_t event_base,
int32_t event_id, void *event_data)
{
wifi_event_action_tx_status_t *evt_c = os_malloc(sizeof(*evt_c));
if (evt_c) {
os_memcpy(evt_c, event_data, sizeof(*evt_c));
if (eloop_register_timeout(0, 0, tx_status_eloop_handler, NULL, evt_c) < 0) {
os_free(evt_c);
}
} else {
wpa_printf(MSG_ERROR, "DPP: Failed to allocate memory for TX status");
}
}
static void roc_status_eloop_handler(void *eloop_ctx, void *event_data)
{
wifi_event_roc_done_t *evt = (wifi_event_roc_done_t *)event_data;
if (evt) {
if (evt->context == (uint32_t)s_action_rx_cb) {
eloop_cancel_timeout(dpp_listen_next_channel, NULL, NULL);
eloop_register_timeout(0, 0, dpp_listen_next_channel, NULL, NULL);
}
os_free(evt);
}
atomic_store(&roc_in_progress, false);
os_event_group_set_bits(s_dpp_event_group, DPP_ROC_EVENT_HANDLED);
}
static void roc_status_handler(void *arg, esp_event_base_t event_base,
int32_t event_id, void *event_data)
{
wifi_event_roc_done_t *evt = (wifi_event_roc_done_t *)event_data;
if (evt->context == (uint32_t)s_action_rx_cb) {
eloop_cancel_timeout(dpp_listen_next_channel, NULL, NULL);
eloop_register_timeout(0, 0, dpp_listen_next_channel, NULL, NULL);
wifi_event_roc_done_t *evt_c = os_malloc(sizeof(*evt_c));
if (evt_c) {
os_memcpy(evt_c, event_data, sizeof(*evt_c));
if (eloop_register_timeout(0, 0, roc_status_eloop_handler, NULL, evt_c) < 0) {
os_free(evt_c);
}
} else {
wpa_printf(MSG_ERROR, "DPP: Failed to allocate memory for ROC status");
}
atomic_store(&roc_in_progress, false);
os_event_group_set_bits(s_dpp_event_group, DPP_ROC_EVENT_HANDLED);
}
static char *esp_dpp_parse_chan_list(const char *chan_list)