From ee9b04f598f46a4900a8617d2a03b4e318374cff Mon Sep 17 00:00:00 2001
From: Anton Maklakov <anton@espressif.com>
Date: Tue, 13 Dec 2022 10:10:15 +0700
Subject: [PATCH] fix(mdns): socket networking to init interfaces properly

---
 components/mdns/mdns_networking_socket.c | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/components/mdns/mdns_networking_socket.c b/components/mdns/mdns_networking_socket.c
index 67d486d99..2a62de384 100644
--- a/components/mdns/mdns_networking_socket.c
+++ b/components/mdns/mdns_networking_socket.c
@@ -57,6 +57,14 @@ struct pbuf  {
 #define s6_addr32 un.u32_addr
 #endif // CONFIG_IDF_TARGET_LINUX
 
+static void __attribute__((constructor)) ctor_networking_socket(void)
+{
+    for (int i = 0; i < sizeof(s_interfaces) / sizeof(s_interfaces[0]); ++i) {
+        s_interfaces[i].sock = -1;
+        s_interfaces[i].proto = 0;
+    }
+}
+
 static void delete_socket(int sock)
 {
     close(sock);
@@ -326,10 +334,6 @@ void sock_recv_task(void *arg)
 static void mdns_networking_init(void)
 {
     if (s_run_sock_recv_task == false) {
-        for (int i = 0; i < sizeof(s_interfaces) / sizeof(s_interfaces[0]); ++i) {
-            s_interfaces[i].sock = -1;
-            s_interfaces[i].proto = 0;
-        }
         s_run_sock_recv_task = true;
         xTaskCreate( sock_recv_task, "mdns recv task", 3 * 1024, NULL, 5, NULL );
     }
@@ -362,16 +366,18 @@ static bool create_pcb(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
         ESP_LOGE(TAG, "Failed to add ipv6 multicast group for protocol %d", ip_protocol);
     }
     s_interfaces[tcpip_if].proto |= (ip_protocol == MDNS_IP_PROTOCOL_V4 ? PROTO_IPV4 : PROTO_IPV6);
+    s_interfaces[tcpip_if].sock = sock;
     return true;
 }
 
 esp_err_t _mdns_pcb_init(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol)
 {
-    mdns_networking_init();
     ESP_LOGI(TAG, "_mdns_pcb_init(tcpip_if=%d, ip_protocol=%d)", tcpip_if, ip_protocol);
     if (!create_pcb(tcpip_if, ip_protocol)) {
         return ESP_FAIL;
     }
+
+    mdns_networking_init();
     return ESP_OK;
 }