espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-29 18:27:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(mdns): Fix API races while setting txt for services

Browse Source 
Fixes **API race issue** (described in 8a690503) for API
mdns_service_txt_set_for_host()
This commit is contained in:
David Cermak
2024-07-23 09:05:30 +02:00
parent 99d5fb27e9
commit a927bf3a8d
2 changed files with 18 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
components/mdns/mdns.c
View File

@ -5111,9 +5111,6 @@ static void _mdns_free_action(mdns_action_t *action)
case ACTION_SERVICE_INSTANCE_SET: case ACTION_SERVICE_INSTANCE_SET:
free(action->data.srv_instance.instance); free(action->data.srv_instance.instance);
break; break;
case ACTION_SERVICE_TXT_REPLACE:
_mdns_free_linked_txt(action->data.srv_txt_replace.txt);
break;
case ACTION_SERVICE_TXT_SET: case ACTION_SERVICE_TXT_SET:
free(action->data.srv_txt_set.key); free(action->data.srv_txt_set.key);
free(action->data.srv_txt_set.value); free(action->data.srv_txt_set.value);
@ -5200,15 +5197,6 @@ static void _mdns_execute_action(mdns_action_t *action)
action->data.srv_instance.service->service->instance = action->data.srv_instance.instance; action->data.srv_instance.service->service->instance = action->data.srv_instance.instance;
_mdns_probe_all_pcbs(&action->data.srv_instance.service, 1, false, false); _mdns_probe_all_pcbs(&action->data.srv_instance.service, 1, false, false);
break;
case ACTION_SERVICE_TXT_REPLACE:
service = action->data.srv_txt_replace.service->service;
txt = service->txt;
service->txt = NULL;
_mdns_free_linked_txt(txt);
service->txt = action->data.srv_txt_replace.txt;
_mdns_announce_all_pcbs(&action->data.srv_txt_replace.service, 1, false);
break; break;
case ACTION_SERVICE_TXT_SET: case ACTION_SERVICE_TXT_SET:
service = action->data.srv_txt_set.service->service; service = action->data.srv_txt_set.service->service;
@ -6254,44 +6242,34 @@ esp_err_t mdns_service_port_set(const char *service, const char *proto, uint16_t
return mdns_service_port_set_for_host(NULL, service, proto, NULL, port); return mdns_service_port_set_for_host(NULL, service, proto, NULL, port);
} }
esp_err_t mdns_service_txt_set_for_host(const char *instance, const char *service, const char *proto, const char *hostname, esp_err_t mdns_service_txt_set_for_host(const char *instance, const char *service, const char *proto, const char *host,
mdns_txt_item_t txt[], uint8_t num_items) mdns_txt_item_t txt_items[], uint8_t num_items)
{ {
MDNS_SERVICE_LOCK(); MDNS_SERVICE_LOCK();
if (!_mdns_server || !_mdns_server->services || _str_null_or_empty(service) || _str_null_or_empty(proto) || (num_items && txt == NULL)) { esp_err_t ret = ESP_OK;
MDNS_SERVICE_UNLOCK(); const char *hostname = host ? host : _mdns_server->hostname;
return ESP_ERR_INVALID_ARG; ESP_GOTO_ON_FALSE(_mdns_server && _mdns_server->services && !_str_null_or_empty(service) && !_str_null_or_empty(proto) && !(num_items && txt_items == NULL),
} ESP_ERR_INVALID_ARG, err, TAG, "Invalid state or arguments");
mdns_srv_item_t *s = _mdns_get_service_item_instance(instance, service, proto, hostname); mdns_srv_item_t *s = _mdns_get_service_item_instance(instance, service, proto, hostname);
MDNS_SERVICE_UNLOCK(); ESP_GOTO_ON_FALSE(s, ESP_ERR_NOT_FOUND, err, TAG, "Service doesn't exist");
if (!s) {
return ESP_ERR_NOT_FOUND;
}
mdns_txt_linked_item_t *new_txt = NULL; mdns_txt_linked_item_t *new_txt = NULL;
if (num_items) { if (num_items) {
new_txt = _mdns_allocate_txt(num_items, txt); new_txt = _mdns_allocate_txt(num_items, txt_items);
if (!new_txt) { if (!new_txt) {
return ESP_ERR_NO_MEM; return ESP_ERR_NO_MEM;
} }
} }
mdns_service_t *srv = s->service;
mdns_txt_linked_item_t *txt = srv->txt;
srv->txt = NULL;
_mdns_free_linked_txt(txt);
srv->txt = new_txt;
_mdns_announce_all_pcbs(&s, 1, false);
mdns_action_t *action = (mdns_action_t *)malloc(sizeof(mdns_action_t)); err:
if (!action) { MDNS_SERVICE_UNLOCK();
HOOK_MALLOC_FAILED; return ret;
_mdns_free_linked_txt(new_txt);
return ESP_ERR_NO_MEM;
}
action->type = ACTION_SERVICE_TXT_REPLACE;
action->data.srv_txt_replace.service = s;
action->data.srv_txt_replace.txt = new_txt;
if (xQueueSend(_mdns_server->action_queue, &action, (TickType_t)0) != pdPASS) {
_mdns_free_linked_txt(new_txt);
free(action);
return ESP_ERR_NO_MEM;
}
return ESP_OK;
} }
esp_err_t mdns_service_txt_set(const char *service, const char *proto, mdns_txt_item_t txt[], uint8_t num_items) esp_err_t mdns_service_txt_set(const char *service, const char *proto, mdns_txt_item_t txt[], uint8_t num_items)
@ -6299,7 +6277,7 @@ esp_err_t mdns_service_txt_set(const char *service, const char *proto, mdns_txt_
if (!_mdns_server) { if (!_mdns_server) {
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;
} }
return mdns_service_txt_set_for_host(NULL, service, proto, _mdns_server->hostname, txt, num_items); return mdns_service_txt_set_for_host(NULL, service, proto, NULL, txt, num_items);
} }
esp_err_t mdns_service_txt_item_set_for_host_with_explicit_value_len(const char *instance, const char *service, const char *proto, esp_err_t mdns_service_txt_item_set_for_host_with_explicit_value_len(const char *instance, const char *service, const char *proto,

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

@ -188,7 +188,6 @@ typedef enum {
ACTION_HOSTNAME_SET, ACTION_HOSTNAME_SET,
ACTION_INSTANCE_SET, ACTION_INSTANCE_SET,
ACTION_SERVICE_INSTANCE_SET, ACTION_SERVICE_INSTANCE_SET,
ACTION_SERVICE_TXT_REPLACE,
ACTION_SERVICE_TXT_SET, ACTION_SERVICE_TXT_SET,
ACTION_SERVICE_TXT_DEL, ACTION_SERVICE_TXT_DEL,
ACTION_SERVICE_SUBTYPE_ADD, ACTION_SERVICE_SUBTYPE_ADD,
@ -447,14 +446,6 @@ typedef struct {
mdns_srv_item_t *service; mdns_srv_item_t *service;
char *instance; char *instance;
} srv_instance; } srv_instance;
struct {
mdns_srv_item_t *service;
uint16_t port;
} srv_port;
struct {
mdns_srv_item_t *service;
mdns_txt_linked_item_t *txt;
} srv_txt_replace;
struct { struct {
mdns_srv_item_t *service; mdns_srv_item_t *service;
char *key; char *key;