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

mdns: skip sending search when finished, not properly locked timer task

Browse Source 
* Original commit: espressif/esp-idf@31163f02d5
This commit is contained in:
David Cermak
2018-11-30 17:00:05 +01:00
committed by suren-gabrielyan-espressif
parent dce0b26ef8
commit 2763bcdb8d
1 changed files with 18 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
components/mdns/mdns.c
View File

@ -3480,6 +3480,22 @@ static void _mdns_search_send_pcb(mdns_search_once_t * search, tcpip_adapter_if_
*/ */
static void _mdns_search_send(mdns_search_once_t * search) static void _mdns_search_send(mdns_search_once_t * search)
{ {
mdns_search_once_t* queue = _mdns_server->search_once;
bool found = false;
// looking for this search in active searches
while (queue) {
if (queue == search) {
found = true;
break;
}
queue = queue->next;
}
if (!found) {
// no longer active -> skip sending this search
return;
}
uint8_t i, j; uint8_t i, j;
for (i=0; i<TCPIP_ADAPTER_IF_MAX; i++) { for (i=0; i<TCPIP_ADAPTER_IF_MAX; i++) {
for (j=0; j<MDNS_IP_PROTOCOL_MAX; j++) { for (j=0; j<MDNS_IP_PROTOCOL_MAX; j++) {
@ -3822,12 +3838,13 @@ static void _mdns_scheduler_run()
*/ */
static void _mdns_search_run() static void _mdns_search_run()
{ {
MDNS_SERVICE_LOCK();
mdns_search_once_t * s = _mdns_server->search_once; mdns_search_once_t * s = _mdns_server->search_once;
uint32_t now = xTaskGetTickCount() * portTICK_PERIOD_MS; uint32_t now = xTaskGetTickCount() * portTICK_PERIOD_MS;
if (!s) { if (!s) {
MDNS_SERVICE_UNLOCK();
return; return;
} }
MDNS_SERVICE_LOCK();
while (s) { while (s) {
if (s->state != SEARCH_OFF) { if (s->state != SEARCH_OFF) {
if (now > (s->started_at + s->timeout)) { if (now > (s->started_at + s->timeout)) {