alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

mdns: fixed crashes on network changes

Browse Source 
1) two events AP_STOP, AP_START shortly after each other may cause IGMP config on already stopped netif
2) not properly locked sending packets to queue from timer task

closes #2580
This commit is contained in:
David Cermak 2018-10-22 16:45:42 +02:00
parent 7c29a39d6f
commit 097282a8e3
4 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/mdns/mdns.c
View File

@ -3794,13 +3794,14 @@ static esp_err_t _mdns_send_search_action(mdns_action_type_t type, mdns_search_o
*/
static void _mdns_scheduler_run()
{
MDNS_SERVICE_LOCK();
mdns_tx_packet_t * p = _mdns_server->tx_queue_head;
mdns_action_t * action = NULL;
if (!p) {
MDNS_SERVICE_UNLOCK();
return;
}
MDNS_SERVICE_LOCK();
if ((int32_t)(p->send_at - (xTaskGetTickCount() * portTICK_PERIOD_MS)) < 0) {
action = (mdns_action_t *)malloc(sizeof(mdns_action_t));
if (action) {

6
components/mdns/mdns_networking.c
View File

@ -62,6 +62,12 @@ static esp_err_t _udp_join_group(tcpip_adapter_if_t tcpip_if, mdns_ip_protocol_t
{
struct netif * netif = NULL;
void * nif = NULL;
if (!tcpip_adapter_is_netif_up(tcpip_if)) {
// Network interface went down before event propagated, skipping IGMP config
return ESP_ERR_INVALID_STATE;
}
esp_err_t err = tcpip_adapter_get_netif(tcpip_if, &nif);
if (err) {
return ESP_ERR_INVALID_ARG;

10
components/tcpip_adapter/include/tcpip_adapter.h
View File

@ -618,6 +618,16 @@ esp_err_t tcpip_adapter_get_hostname(tcpip_adapter_if_t tcpip_if, const char **h
*/
esp_err_t tcpip_adapter_get_netif(tcpip_adapter_if_t tcpip_if, void ** netif);
/**
* @brief Test if supplied interface is up or down
*
* @param[in] tcpip_if: the interface which we will get the hostname
*
* @return true: tcpip_if is UP
* false: tcpip_if id DOWN
*/
bool tcpip_adapter_is_netif_up(tcpip_adapter_if_t tcpip_if);
#ifdef __cplusplus
}
#endif

9
components/tcpip_adapter/tcpip_adapter_lwip.c
View File

@ -1222,4 +1222,13 @@ esp_err_t tcpip_adapter_get_netif(tcpip_adapter_if_t tcpip_if, void ** netif)
return ESP_OK;
}
bool tcpip_adapter_is_netif_up(tcpip_adapter_if_t tcpip_if)
{
if (esp_netif[tcpip_if] != NULL && netif_is_up(esp_netif[tcpip_if])) {
return true;
} else {
return false;
}
}
#endif /* CONFIG_TCPIP_LWIP */