blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-10 17:49:10 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'bugfix/mdns_send_bye_service_instance' into 'master'

Browse Source 
mdns: fix missing bye packet if services removed with mdns_service_remove_all() or mdns_free()

See merge request espressif/esp-idf!5308
This commit is contained in:
Angus Gratton 2019-08-15 10:50:17 +08:00
commit 0781868c36
1 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
components/mdns/mdns.c
View File

@ -1676,9 +1676,7 @@ static void _mdns_send_final_bye(bool include_ip)
size_t srv_count = 0; size_t srv_count = 0;
mdns_srv_item_t * a = _mdns_server->services; mdns_srv_item_t * a = _mdns_server->services;
while (a) { while (a) {
if (!a->service->instance) { srv_count++;
srv_count++;
}
a = a->next; a = a->next;
} }
if (!srv_count) { if (!srv_count) {
@ -1688,9 +1686,7 @@ static void _mdns_send_final_bye(bool include_ip)
size_t i = 0; size_t i = 0;
a = _mdns_server->services; a = _mdns_server->services;
while (a) { while (a) {
if (!a->service->instance) { services[i++] = a;
services[i++] = a;
}
a = a->next; a = a->next;
} }
_mdns_send_bye(services, srv_count, include_ip); _mdns_send_bye(services, srv_count, include_ip);
@ -1699,7 +1695,7 @@ static void _mdns_send_final_bye(bool include_ip)
/** /**
* @brief Stop the responder on all services without instance * @brief Stop the responder on all services without instance
*/ */
static void _mdns_send_bye_all_pcbs_no_instance(void) static void _mdns_send_bye_all_pcbs_no_instance(bool include_ip)
{ {
size_t srv_count = 0; size_t srv_count = 0;
mdns_srv_item_t * a = _mdns_server->services; mdns_srv_item_t * a = _mdns_server->services;
@ -1721,7 +1717,7 @@ static void _mdns_send_bye_all_pcbs_no_instance(void)
} }
a = a->next; a = a->next;
} }
_mdns_send_bye(services, srv_count, false); _mdns_send_bye(services, srv_count, include_ip);
} }
/** /**
@ -3728,14 +3724,14 @@ static void _mdns_execute_action(mdns_action_t * action)
action->data.sys_event.event_id, action->data.sys_event.interface); action->data.sys_event.event_id, action->data.sys_event.interface);
break; break;
case ACTION_HOSTNAME_SET: case ACTION_HOSTNAME_SET:
_mdns_send_final_bye(true); _mdns_send_bye_all_pcbs_no_instance(true);
free((char*)_mdns_server->hostname); free((char*)_mdns_server->hostname);
_mdns_server->hostname = action->data.hostname; _mdns_server->hostname = action->data.hostname;
_mdns_restart_all_pcbs(); _mdns_restart_all_pcbs();
break; break;
case ACTION_INSTANCE_SET: case ACTION_INSTANCE_SET:
_mdns_send_bye_all_pcbs_no_instance(); _mdns_send_bye_all_pcbs_no_instance(false);
free((char*)_mdns_server->instance); free((char*)_mdns_server->instance);
_mdns_server->instance = action->data.instance; _mdns_server->instance = action->data.instance;
_mdns_restart_all_pcbs_no_instance(); _mdns_restart_all_pcbs_no_instance();