alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-09-21 06:56:11 -04:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/mdns_add_service_fail_if_nohostname' into 'release/v4.4'

Browse Source 
mdns: Fix add_service() to report error if no-hostname

See merge request espressif/esp-idf!19679
This commit is contained in:
David Čermák 2022-09-09 18:38:31 +08:00
commit ef5a87ea20
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
components/mdns/mdns.c
View File

@ -149,7 +149,7 @@ static char * _mdns_mangle_name(char* in) {
static bool _mdns_service_match(const mdns_service_t * srv, const char * service, const char * proto, static bool _mdns_service_match(const mdns_service_t * srv, const char * service, const char * proto,
const char * hostname) const char * hostname)
{ {
if (!service || !proto) { if (!service || !proto || !srv->hostname) {
return false; return false;
} }
return !strcasecmp(srv->service, service) && !strcasecmp(srv->proto, proto) && return !strcasecmp(srv->service, service) && !strcasecmp(srv->proto, proto) &&
@ -4267,7 +4267,8 @@ static void _mdns_remap_self_service_hostname(const char * old_hostname, const c
mdns_srv_item_t * service = _mdns_server->services; mdns_srv_item_t * service = _mdns_server->services;
while (service) { while (service) {
if (strcmp(service->service->hostname, old_hostname) == 0) { if (service->service->hostname &&
strcmp(service->service->hostname, old_hostname) == 0) {
free((char *)service->service->hostname); free((char *)service->service->hostname);
service->service->hostname = strdup(new_hostname); service->service->hostname = strdup(new_hostname);
} }
@ -5043,7 +5044,7 @@ esp_err_t mdns_instance_name_set(const char * instance)
esp_err_t mdns_service_add_for_host(const char * instance, const char * service, const char * proto, const char * hostname, esp_err_t mdns_service_add_for_host(const char * instance, const char * service, const char * proto, const char * hostname,
uint16_t port, mdns_txt_item_t txt[], size_t num_items) uint16_t port, mdns_txt_item_t txt[], size_t num_items)
{ {
if (!_mdns_server || _str_null_or_empty(service) || _str_null_or_empty(proto) || !port) { if (!_mdns_server || _str_null_or_empty(service) || _str_null_or_empty(proto) || !port || !hostname) {
return ESP_ERR_INVALID_ARG; return ESP_ERR_INVALID_ARG;
} }