Skip to content

Commit 169405b

Browse files
committed
fix(mdns): Fix API races when removing all services
Fixes **API race issue** (described in 8a69050) for API mdns_service_remove_all()
1 parent 643dc6d commit 169405b

File tree

2 files changed

+16
-32
lines changed

2 files changed

+16
-32
lines changed

components/mdns/mdns.c

Lines changed: 16 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -5148,8 +5148,6 @@ static void _mdns_free_action(mdns_action_t *action)
51485148
*/
51495149
static void _mdns_execute_action(mdns_action_t *action)
51505150
{
5151-
mdns_srv_item_t *a = NULL;
5152-
51535151
switch (action->type) {
51545152
case ACTION_SYSTEM_EVENT:
51555153
perform_event_action(action->data.sys_event.interface, action->data.sys_event.event_action);
@@ -5169,19 +5167,6 @@ static void _mdns_execute_action(mdns_action_t *action)
51695167
_mdns_server->instance = action->data.instance;
51705168
_mdns_restart_all_pcbs_no_instance();
51715169

5172-
break;
5173-
case ACTION_SERVICES_CLEAR:
5174-
_mdns_send_final_bye(false);
5175-
a = _mdns_server->services;
5176-
_mdns_server->services = NULL;
5177-
while (a) {
5178-
mdns_srv_item_t *s = a;
5179-
a = a->next;
5180-
_mdns_remove_scheduled_service_packets(s->service);
5181-
_mdns_free_service(s->service);
5182-
free(s);
5183-
}
5184-
51855170
break;
51865171
case ACTION_SEARCH_ADD:
51875172
_mdns_search_add(action->data.search_add.search);
@@ -6453,27 +6438,27 @@ esp_err_t mdns_service_remove(const char *service_type, const char *proto)
64536438

64546439
esp_err_t mdns_service_remove_all(void)
64556440
{
6456-
if (!_mdns_server) {
6457-
return ESP_ERR_INVALID_ARG;
6458-
}
64596441
MDNS_SERVICE_LOCK();
6442+
esp_err_t ret = ESP_OK;
6443+
ESP_GOTO_ON_FALSE(_mdns_server, ESP_ERR_INVALID_ARG, done, TAG, "Invalid state");
64606444
if (!_mdns_server->services) {
6461-
MDNS_SERVICE_UNLOCK();
6462-
return ESP_OK;
6445+
goto done;
64636446
}
6464-
MDNS_SERVICE_UNLOCK();
64656447

6466-
mdns_action_t *action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
6467-
if (!action) {
6468-
HOOK_MALLOC_FAILED;
6469-
return ESP_ERR_NO_MEM;
6470-
}
6471-
action->type = ACTION_SERVICES_CLEAR;
6472-
if (xQueueSend(_mdns_server->action_queue, &action, (TickType_t)0) != pdPASS) {
6473-
free(action);
6474-
return ESP_ERR_NO_MEM;
6448+
_mdns_send_final_bye(false);
6449+
mdns_srv_item_t *services = _mdns_server->services;
6450+
_mdns_server->services = NULL;
6451+
while (services) {
6452+
mdns_srv_item_t *s = services;
6453+
services = services->next;
6454+
_mdns_remove_scheduled_service_packets(s->service);
6455+
_mdns_free_service(s->service);
6456+
free(s);
64756457
}
6476-
return ESP_OK;
6458+
6459+
done:
6460+
MDNS_SERVICE_UNLOCK();
6461+
return ret;
64776462
}
64786463

64796464
/*

components/mdns/private_include/mdns_private.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,6 @@ typedef enum {
187187
ACTION_SYSTEM_EVENT,
188188
ACTION_HOSTNAME_SET,
189189
ACTION_INSTANCE_SET,
190-
ACTION_SERVICES_CLEAR,
191190
ACTION_SEARCH_ADD,
192191
ACTION_SEARCH_SEND,
193192
ACTION_SEARCH_END,

0 commit comments

Comments
 (0)