feedc0de/esp-protocols
1
0
Fork 0
forked from espressif/esp-protocols
Code Pull Requests Activity

fix(mdns): Fix API races when removing all services

Browse Source 
Fixes **API race issue** (described in 8a690503) for API
mdns_service_remove_all()
This commit is contained in:
David Cermak
2024-07-23 11:11:11 +02:00
parent 643dc6d43b
commit 169405b534
2 changed files with 16 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
components/mdns/mdns.c
View File

@ -5148,8 +5148,6 @@ static void _mdns_free_action(mdns_action_t *action)
*/
static void _mdns_execute_action(mdns_action_t *action)
{
mdns_srv_item_t *a = NULL;
switch (action->type) {
case ACTION_SYSTEM_EVENT:
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)
_mdns_server->instance = action->data.instance;
_mdns_restart_all_pcbs_no_instance();
break;
case ACTION_SERVICES_CLEAR:
_mdns_send_final_bye(false);
a = _mdns_server->services;
_mdns_server->services = NULL;
while (a) {
mdns_srv_item_t *s = a;
a = a->next;
_mdns_remove_scheduled_service_packets(s->service);
_mdns_free_service(s->service);
free(s);
}
break;
case ACTION_SEARCH_ADD:
_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)
esp_err_t mdns_service_remove_all(void)
{
if (!_mdns_server) {
return ESP_ERR_INVALID_ARG;
}
MDNS_SERVICE_LOCK();
esp_err_t ret = ESP_OK;
ESP_GOTO_ON_FALSE(_mdns_server, ESP_ERR_INVALID_ARG, done, TAG, "Invalid state");
if (!_mdns_server->services) {
MDNS_SERVICE_UNLOCK();
return ESP_OK;
goto done;
}
MDNS_SERVICE_UNLOCK();
mdns_action_t *action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
if (!action) {
HOOK_MALLOC_FAILED;
return ESP_ERR_NO_MEM;
_mdns_send_final_bye(false);
mdns_srv_item_t *services = _mdns_server->services;
_mdns_server->services = NULL;
while (services) {
mdns_srv_item_t *s = services;
services = services->next;
_mdns_remove_scheduled_service_packets(s->service);
_mdns_free_service(s->service);
free(s);
}
action->type = ACTION_SERVICES_CLEAR;
if (xQueueSend(_mdns_server->action_queue, &action, (TickType_t)0) != pdPASS) {
free(action);
return ESP_ERR_NO_MEM;
}
return ESP_OK;
done:
MDNS_SERVICE_UNLOCK();
return ret;
}
/*

1
components/mdns/private_include/mdns_private.h
View File

@ -187,7 +187,6 @@ typedef enum {
ACTION_SYSTEM_EVENT,
ACTION_HOSTNAME_SET,
ACTION_INSTANCE_SET,
ACTION_SERVICES_CLEAR,
ACTION_SEARCH_ADD,
ACTION_SEARCH_SEND,
ACTION_SEARCH_END,