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

mdns: fix static analysis warnings

Browse Source 
* Original commit: espressif/esp-idf@c34de4cba6
This commit is contained in:
David Cermak
2019-05-29 17:07:39 +02:00
committed by suren-gabrielyan-espressif
parent 181a22ec2b
commit 4912bef740
1 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
components/mdns/mdns.c
View File

@ -1312,6 +1312,7 @@ static mdns_tx_packet_t * _mdns_create_probe_packet(tcpip_adapter_if_t tcpip_if,
q->domain = MDNS_DEFAULT_DOMAIN; q->domain = MDNS_DEFAULT_DOMAIN;
if (!q->host || _mdns_question_exists(q, packet->questions)) { if (!q->host || _mdns_question_exists(q, packet->questions)) {
free(q); free(q);
continue;
} else { } else {
queueToEnd(mdns_out_question_t, packet->questions, q); queueToEnd(mdns_out_question_t, packet->questions, q);
} }
@ -2801,7 +2802,7 @@ void mdns_parse_packet(mdns_rx_packet_t * packet)
col = 1; col = 1;
} else if (!clas) { } else if (!clas) {
col = -1; col = -1;
} else { } else if (service) { // only detect srv collision if service existed
col = _mdns_check_srv_collision(service->service, priority, weight, port, name->host, name->domain); col = _mdns_check_srv_collision(service->service, priority, weight, port, name->host, name->domain);
} }
if (col && (parsed_packet->probe || parsed_packet->authoritative)) { if (col && (parsed_packet->probe || parsed_packet->authoritative)) {
@ -3831,23 +3832,25 @@ static void _mdns_execute_action(mdns_action_t * action)
break; break;
case ACTION_SERVICE_DEL: case ACTION_SERVICE_DEL:
a = _mdns_server->services; a = _mdns_server->services;
if (_mdns_server->services == action->data.srv_del.service) { if (action->data.srv_del.service) {
_mdns_server->services = a->next; if (_mdns_server->services == action->data.srv_del.service) {
_mdns_send_bye(&a, 1, false); _mdns_server->services = a->next;
_mdns_remove_scheduled_service_packets(a->service); _mdns_send_bye(&a, 1, false);
_mdns_free_service(a->service); _mdns_remove_scheduled_service_packets(a->service);
free(a); _mdns_free_service(a->service);
} else { free(a);
while (a->next && a->next != action->data.srv_del.service) { } else {
a = a->next; while (a->next && a->next != action->data.srv_del.service) {
} a = a->next;
if (a->next == action->data.srv_del.service) { }
mdns_srv_item_t * b = a->next; if (a->next == action->data.srv_del.service) {
a->next = a->next->next; mdns_srv_item_t * b = a->next;
_mdns_send_bye(&b, 1, false); a->next = a->next->next;
_mdns_remove_scheduled_service_packets(b->service); _mdns_send_bye(&b, 1, false);
_mdns_free_service(b->service); _mdns_remove_scheduled_service_packets(b->service);
free(b); _mdns_free_service(b->service);
free(b);
}
} }
} }