Merge branch 'feature/sync_mdns_from_espidf' into 'master'

mdns: sync code from esp-idf

See merge request sdk/ESP8266_RTOS_SDK!943

Author: donghengqaz

components/esp8266/include/esp_event.h

@@ -23,6 +23,11 @@
 #include "lwip/ip_addr.h"
 #include "tcpip_adapter.h"
 
+#include "freertos/FreeRTOS.h"
+#include "freertos/task.h"
+#include "freertos/queue.h"
+#include "freertos/semphr.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif

components/mdns/CMakeLists.txt

@@ -1,6 +1,5 @@
 if(CONFIG_ENABLE_MDNS)
 set(COMPONENT_SRCS "src/mdns.c"
-                   "src/mdns_console.c"
                    "src/mdns_networking.c")
 
 set(COMPONENT_PRIV_INCLUDEDIRS "private_include")
@@ -9,5 +8,12 @@ endif()
 set(COMPONENT_ADD_INCLUDEDIRS "include")
 set(COMPONENT_REQUIRES "lwip" "ssl" "tcpip_adapter")
 
+if(CONFIG_ENABLE_MDNS_CONSOLE)
+set(COMPONENT_SRCS "${COMPONENT_SRCS}"
+                   "src/mdns_console.c")
+endif()
+
+set(COMPONENT_REQUIRES "console" "tcpip_adapter" "newlib")
+
 register_component()
 

components/mdns/Kconfig

@@ -7,6 +7,14 @@ config ENABLE_MDNS
     help
         Enable this option and then mDNS is to be used.
 
+config ENABLE_MDNS_CONSOLE
+    bool "Enable mDNS console"
+    default n
+    depends on ENABLE_MDNS
+    select USING_ESP_CONSOLE
+    help
+        Enable this option and then mDNS console is to be used.
+
 config MDNS_MAX_SERVICES
     int "Max number of services"
     range 1 64

components/mdns/component.mk

@@ -4,3 +4,7 @@ COMPONENT_PRIV_INCLUDEDIRS := private_include
 ifdef CONFIG_ENABLE_MDNS
 COMPONENT_SRCDIRS := src
 endif
+
+ifndef CONFIG_ENABLE_MDNS_CONSOLE
+COMPONENT_OBJEXCLUDE := src/mdns_console.o
+endif

components/mdns/private_include/mdns_networking.h

@@ -5,6 +5,8 @@
  * MDNS Server Networking -- private include
  * 
  */
+#include "mdns.h"
+
 #include "sdkconfig.h"
 #include "freertos/FreeRTOS.h"
 #include "freertos/queue.h"
@@ -19,8 +21,7 @@
 #include "esp_system.h"
 #include "esp_timer.h"
 #include "esp_event_loop.h"
-#include "mdns.h"
-#include "mdns_private.h"
+
 
 /**
  * @brief  Queue RX packet action

components/mdns/private_include/mdns_private.h

@@ -14,6 +14,12 @@
 #ifndef MDNS_PRIVATE_H_
 #define MDNS_PRIVATE_H_
 
+#include <stdint.h>
+#include <stdbool.h>
+#include "tcpip_adapter.h"
+#include "esp_timer.h"
+#include "mdns.h"
+
 //#define MDNS_ENABLE_DEBUG
 
 #ifdef MDNS_ENABLE_DEBUG
@@ -52,7 +58,7 @@
 #define MDNS_ANSWER_SDPTR           0x80
 
 #define MDNS_SERVICE_PORT           5353                    // UDP port that the server runs on
-#define MDNS_SERVICE_STACK_DEPTH    CONFIG_MDNS_STACKSIZE   // Stack size for the service thread
+#define MDNS_SERVICE_STACK_DEPTH    4096                    // Stack size for the service thread
 #define MDNS_PACKET_QUEUE_LEN       16                      // Maximum packets that can be queued for parsing
 #define MDNS_ACTION_QUEUE_LEN       16                      // Maximum actions pending to the server
 #define MDNS_TXT_MAX_LEN            1024                    // Maximum string length of text data in TXT record
@@ -115,9 +121,9 @@
 #define PCB_STATE_IS_ANNOUNCING(s) (s->state > PCB_PROBE_3 && s->state < PCB_RUNNING)
 #define PCB_STATE_IS_RUNNING(s) (s->state == PCB_RUNNING)
 
-#define MDNS_SEARCH_LOCK()      xSemaphoreTake(_mdns_server->search.lock, portMAX_DELAY)
-#define MDNS_SEARCH_UNLOCK()    xSemaphoreGive(_mdns_server->search.lock)
-
+#ifndef HOOK_MALLOC_FAILED
+#define HOOK_MALLOC_FAILED  ESP_LOGE(TAG, "Cannot allocate memory (line: %d, free heap: %d bytes)", __LINE__, esp_get_free_heap_size());
+#endif
 
 typedef enum {
     PCB_OFF, PCB_DUP, PCB_INIT,
@@ -289,6 +295,7 @@ typedef struct mdns_tx_packet_s {
     mdns_out_answer_t * answers;
     mdns_out_answer_t * servers;
     mdns_out_answer_t * additional;
+    bool queued;
 } mdns_tx_packet_t;
 
 typedef struct {
@@ -315,7 +322,7 @@ typedef struct mdns_search_once_s {
     uint32_t started_at;
     uint32_t sent_at;
     uint32_t timeout;
-    SemaphoreHandle_t lock;
+    SemaphoreHandle_t done_semaphore;
     uint16_t type;
     uint8_t max_results;
     uint8_t num_results;