fix(mdns): Host test with IDFv5.1

components/mdns/tests/host_test/CMakeLists.txt

@@ -1,5 +1,7 @@
 cmake_minimum_required(VERSION 3.5)
 
+set(EXTRA_COMPONENT_DIRS "../..")
+
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
-set(COMPONENTS main)
+set(COMPONENTS main esp_netif_linux)
 project(mdns_host)

components/mdns/tests/host_test/README.md

@@ -1,7 +1,10 @@
 # Setup dummy network interfaces
+
+Note: Set two addresses so we could use one as source and another as destination
 ```
 sudo ip link add eth2 type dummy
 sudo ip addr add 192.168.1.200/24 dev eth2
+sudo ip addr add 192.168.1.201/24 dev eth2
 sudo ip link set eth2 up
 sudo ifconfig eth2 multicast
 ```
@@ -12,6 +15,11 @@ sudo ifconfig eth2 multicast
 dig +short -b 192.168.1.200 -p 5353 @224.0.0.251 myesp.local
 ```
 
+or a reverse query:
+```
+dig +short -b 192.168.2.200 -p 5353 @224.0.0.251 -x 192.168.1.200
+```
+
 # Run avahi to browse services
 
 Avahi needs the netif to have the "multicast" flag set

components/mdns/tests/host_test/components/esp_event/CMakeLists.txt

@@ -1,3 +1,3 @@
 idf_component_register(SRCS esp_event_mock.c
                        INCLUDE_DIRS include
-                       REQUIRES esp_system_protocols_linux)
+                       REQUIRES)

components/mdns/tests/host_test/components/esp_event/include/esp_event.h

@@ -8,16 +8,12 @@
 #include "stdbool.h"
 #include "esp_err.h"
 #include "esp_event_base.h"
-#include "bsd_strings.h"
+//#include "bsd_strings.h"
 
-#define ESP_EVENT_DECLARE_BASE(x)
-#define ESP_EVENT_ANY_ID       (-1)
 
-typedef void *esp_event_base_t;
-typedef void *system_event_t;
 
-const char *WIFI_EVENT;
-const char *IP_EVENT;
+//const char *WIFI_EVENT;
+//const char *IP_EVENT;
 
 esp_err_t esp_event_handler_register(const char *event_base, int32_t event_id, void *event_handler, void *event_handler_arg);
 

components/mdns/tests/host_test/components/esp_event/include/esp_event_base.h

@@ -11,3 +11,9 @@ typedef enum {
     WIFI_EVENT_AP_START,                 /**< ESP32 soft-AP start */
     WIFI_EVENT_AP_STOP,                  /**< ESP32 soft-AP stop */
 } mdns_used_event_t;
+
+#define ESP_EVENT_DECLARE_BASE(x)
+#define ESP_EVENT_ANY_ID       (-1)
+
+typedef void *esp_event_base_t;
+typedef void *system_event_t;

components/mdns/tests/host_test/components/esp_netif_linux/CMakeLists.txt

@@ -1,3 +1,3 @@
 idf_component_register(SRCS esp_netif_linux.c
-                       INCLUDE_DIRS include
-                       REQUIRES esp_system_protocols_linux)
+                       INCLUDE_DIRS include $ENV{IDF_PATH}/components/esp_netif/include
+                       REQUIRES esp_event)

components/mdns/tests/host_test/components/esp_netif_linux/esp_netif_linux.c

@@ -50,9 +50,7 @@ esp_err_t esp_netif_get_ip_info(esp_netif_t *esp_netif, esp_netif_ip_info_t *ip_
             struct sockaddr_in *pAddr = (struct sockaddr_in *) tmp->ifa_addr;
             inet_ntop(AF_INET, &pAddr->sin_addr, addr, sizeof(addr) );
             if (strcmp(esp_netif->if_desc, tmp->ifa_name) == 0) {
-                printf("AF_INET: %s: %s\n", tmp->ifa_name, addr);
                 memcpy(&ip_info->ip.addr, &pAddr->sin_addr, 4);
-                break;
             }
         }
         tmp = tmp->ifa_next;

components/mdns/tests/host_test/components/esp_system_protocols_linux/CMakeLists.txt

@@ -1,3 +0,0 @@
-idf_component_register(SRCS esp_log_impl.c strlcat.c
-                       INCLUDE_DIRS include
-                       REQUIRES esp_netif_linux esp_timer_linux freertos_linux esp_event_mock esp_netif log esp_common)

components/mdns/tests/host_test/components/esp_system_protocols_linux/esp_log_impl.c

@@ -1,27 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#include "esp_err.h"
-#include "esp_log.h"
-#include <stdlib.h>
-
-void _esp_error_check_failed(esp_err_t rc, const char *file, int line, const char *function, const char *expression)
-{
-    ESP_LOGE("ESP_ERROR_CHECK", "Failed with esp_err_t: 0x%x", rc);
-    ESP_LOGE("ESP_ERROR_CHECK", "Expression: %s", expression);
-    ESP_LOGE("ESP_ERROR_CHECK", "Functions: %s %s(%d)", function, file, line);
-    abort();
-}
-
-void esp_log_buffer_hexdump_internal(const char *tag, const void *buffer, uint16_t buff_len, esp_log_level_t log_level)
-{
-    if ( LOG_LOCAL_LEVEL >= log_level ) {
-        ESP_LOG_LEVEL(log_level, tag, "Buffer:%p length:%d", buffer, buff_len);
-        for (int i = 0; i < buff_len; ++i) {
-            printf("%02x ", ((uint8_t *)buffer)[i]);
-        }
-        printf("\n");
-    }
-}

components/mdns/tests/host_test/components/esp_system_protocols_linux/include/bsd_strings.h

@@ -1,8 +0,0 @@
-/*
- * SPDX-FileCopyrightText: 2021-2022 Espressif Systems (Shanghai) CO LTD
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-#pragma once
-
-size_t strlcat(char *dest, const char *src, size_t size);

components/mdns/tests/host_test/components/esp_system_protocols_linux/strlcat.c

@@ -1,70 +0,0 @@
-/*  $OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp $ */
-
-/*-
- * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
- * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
- * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
- * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "string.h"
-
-/*
- * Appends src to string dst of size siz (unlike strncat, siz is the
- * full size of dst, not space left).  At most siz-1 characters
- * will be copied.  Always NUL terminates (unless siz <= strlen(dst)).
- * Returns strlen(src) + MIN(siz, strlen(initial dst)).
- * If retval >= siz, truncation occurred.
- */
-size_t
-strlcat(dst, src, siz)
-char *dst;
-const char *src;
-size_t siz;
-{
-    char *d = dst;
-    const char *s = src;
-    size_t n = siz;
-    size_t dlen;
-
-    /* Find the end of dst and adjust bytes left but don't go past end */
-    while (n-- != 0 && *d != '\0') {
-        d++;
-    }
-    dlen = d - dst;
-    n = siz - dlen;
-
-    if (n == 0) {
-        return (dlen + strlen(s));
-    }
-    while (*s != '\0') {
-        if (n != 1) {
-            *d++ = *s;
-            n--;
-        }
-        s++;
-    }
-    *d = '\0';
-
-    return (dlen + (s - src));  /* count does not include NUL */
-}

components/mdns/tests/host_test/components/esp_timer_linux/CMakeLists.txt

@@ -1,6 +1,6 @@
 idf_component_register(SRCS esp_timer_linux.c timer_task.cpp
                        INCLUDE_DIRS include
-                       REQUIRES esp_system_protocols_linux freertos_linux)
+                       REQUIRES esp_event)
 
 set_target_properties(${COMPONENT_LIB} PROPERTIES
     CXX_STANDARD 17

components/mdns/tests/host_test/components/esp_timer_linux/timer_task.hpp

@@ -16,7 +16,7 @@ typedef void (*cb_t)(void *arg);
 
 class TimerTaskMock {
 public:
-    TimerTaskMock(cb_t cb): cb(cb), t(run_static, this), active(false), ms(INT32_MAX) {}
+    TimerTaskMock(cb_t cb): cb(cb), active(false), ms(INT32_MAX) {}
     ~TimerTaskMock(void)
     {
         active = false;
@@ -27,6 +27,7 @@ public:
     {
         ms = m;
         active = true;
+        t = std::thread(run_static, this);
     }
 
 private:

components/mdns/tests/host_test/components/freertos/CMakeLists.txt

@@ -1,6 +1,6 @@
 idf_component_register(SRCS freertos_linux.c queue_unique_ptr.cpp
                        INCLUDE_DIRS include
-                       REQUIRES esp_system_protocols_linux)
+                       REQUIRES)
 
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)

components/mdns/tests/host_test/components/freertos/freertos_linux.c

@@ -158,15 +158,15 @@ void xTaskCreate(TaskFunction_t pvTaskCode, const char *const pcName, const uint
     }
 }
 
-uint32_t esp_get_free_heap_size(void)
-{
-    return 0;
-}
-
-uint32_t esp_random(void)
-{
-    return rand();
-}
+//uint32_t esp_get_free_heap_size(void)
+//{
+//    return 0;
+//}
+//
+//uint32_t esp_random(void)
+//{
+//    return rand();
+//}
 
 void xTaskNotifyGive(TaskHandle_t task)
 {

components/mdns/tests/host_test/components/freertos/include/freertos/FreeRTOS.h

@@ -32,3 +32,4 @@ typedef int             BaseType_t;
 
 uint32_t esp_get_free_heap_size(void);
 uint32_t esp_random(void);
+void vTaskSuspendAll(void);

components/mdns/tests/host_test/components/freertos/include/freertos/queue.h

@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
+//
+// Created by david on 1/13/23.
+//
+
+#ifndef _QUEUE_H_
+#define _QUEUE_H_
+
+#endif //_QUEUE_H_

components/mdns/tests/host_test/components/freertos/include/freertos/semphr.h

@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: 2023 Espressif Systems (Shanghai) CO LTD
+ *
+ * SPDX-License-Identifier: Unlicense OR CC0-1.0
+ */
+//
+// Created by david on 1/13/23.
+//
+
+#ifndef _SEMAPHR_H_
+#define _SEMAPHR_H_
+
+#endif //_SEMAPHR_H_

components/mdns/tests/host_test/main/Kconfig.projbuild

@@ -0,0 +1,15 @@
+menu "Test Configuration"
+
+    config TEST_HOSTNAME
+        string "mDNS Hostname"
+        default "esp32-mdns"
+        help
+            mDNS Hostname for example to use
+
+    config TEST_NETIF_NAME
+        string "Network interface name"
+        default "eth2"
+        help
+            Name/ID if the network interface on which we run the mDNS host test
+
+endmenu

components/mdns/tests/host_test/main/main.c

@@ -1,5 +1,5 @@
 /*
- * SPDX-FileCopyrightText: 2022 Espressif Systems (Shanghai) CO LTD
+ * SPDX-FileCopyrightText: 2022-2023 Espressif Systems (Shanghai) CO LTD
  *
  * SPDX-License-Identifier: Unlicense OR CC0-1.0
  */
@@ -35,27 +35,34 @@ int main(int argc, char *argv[])
 {
 
     setvbuf(stdout, NULL, _IONBF, 0);
-    const esp_netif_inherent_config_t base_cg = { .if_key = "WIFI_STA_DEF", .if_desc = "eth2" };
+    const esp_netif_inherent_config_t base_cg = { .if_key = "WIFI_STA_DEF", .if_desc = CONFIG_TEST_NETIF_NAME };
     esp_netif_config_t cfg = { .base = &base_cg  };
     esp_netif_t *sta = esp_netif_new(&cfg);
+    ESP_ERROR_CHECK(mdns_init());
+    ESP_ERROR_CHECK(mdns_register_netif(sta));
+    ESP_ERROR_CHECK(mdns_netif_action(sta, MDNS_EVENT_ENABLE_IP4));
 
-    mdns_init();
+    mdns_hostname_set(CONFIG_TEST_HOSTNAME);
+    ESP_LOGI(TAG, "mdns hostname set to: [%s]", CONFIG_TEST_HOSTNAME);
+    mdns_ip_addr_t addr4 = { .addr.u_addr.ip4.addr = 0x1020304 };
+    addr4.addr.type = ESP_IPADDR_TYPE_V4;
+    const char *delegated_hostname = "200.0.168.192.in-addr";
+    addr4.addr.type = ESP_IPADDR_TYPE_V4;
+    ESP_ERROR_CHECK( mdns_delegate_hostname_add(delegated_hostname, &addr4) );
 
-    mdns_hostname_set("myesp");
-    ESP_LOGI(TAG, "mdns hostname set to: [%s]", "myesp");
     //set default mDNS instance name
-    mdns_instance_name_set("myesp-inst");
+    //mdns_instance_name_set("myesp-inst");
     //structure with TXT records
-    mdns_txt_item_t serviceTxtData[3] = {
-        {"board", "esp32"},
-        {"u", "user"},
-        {"p", "password"}
-    };
-    vTaskDelay(1000);
-    ESP_ERROR_CHECK(mdns_service_add("myesp-service2", "_http", "_tcp", 80, serviceTxtData, 3));
-    vTaskDelay(2000);
-
-    query_mdns_host("david-comp");
+//    mdns_txt_item_t serviceTxtData[3] = {
+//        {"board", "esp32"},
+//        {"u", "user"},
+//        {"p", "password"}
+//    };
+//    vTaskDelay(pdMS_TO_TICKS(1000));
+    vTaskDelay(pdMS_TO_TICKS(10000));
+    // ESP_ERROR_CHECK(mdns_service_add("myesp-service2", "_http", "_tcp", 80, serviceTxtData, 3));
+    // vTaskDelay(2000);
+    query_mdns_host("david-work");
     vTaskDelay(2000);
     esp_netif_destroy(sta);
     mdns_free();

components/mdns/tests/host_test/make_eth2_netif

@@ -0,0 +1,5 @@
+sudo ip link add eth2 type dummy
+sudo ip addr add 192.168.1.200/24 dev eth2
+sudo ip addr add 192.168.1.201/24 dev eth2
+sudo ip link set eth2 up
+sudo ifconfig eth2 multicast

components/mdns/tests/host_test/sdkconfig.defaults

@@ -0,0 +1,7 @@
+CONFIG_IDF_TARGET="linux"
+CONFIG_MDNS_NETWORKING_SOCKET=y
+CONFIG_MDNS_SKIP_SUPPRESSING_OWN_QUERIES=y
+CONFIG_TEST_NETIF_NAME="eth0"
+CONFIG_TEST_HOSTNAME="myesp"
+# CONFIG_MDNS_PREDEF_NETIF_STA is not set
+# CONFIG_MDNS_PREDEF_NETIF_AP is not set