diff --git a/.github/workflows/target-test.yml b/.github/workflows/target-test.yml index a7ffe4fe2..a56c22b47 100644 --- a/.github/workflows/target-test.yml +++ b/.github/workflows/target-test.yml @@ -65,6 +65,9 @@ jobs: rm sdkconfig.defaults cat sdkconfig.ci.eth_socket >> sdkconfig.defaults idf.py build + rm sdkconfig.defaults + cat sdkconfig.ci.eth_no_ipv6 >> sdkconfig.defaults + idf.py build cd $GITHUB_WORKSPACE/esp-protocols/components/mdns/tests/test_apps/ idf.py set-target ${{ matrix.idf_target }} idf.py build diff --git a/components/mdns/examples/sdkconfig.ci.eth_no_ipv6 b/components/mdns/examples/sdkconfig.ci.eth_no_ipv6 new file mode 100644 index 000000000..42f26f6ba --- /dev/null +++ b/components/mdns/examples/sdkconfig.ci.eth_no_ipv6 @@ -0,0 +1,15 @@ +CONFIG_IDF_TARGET="esp32" +CONFIG_MDNS_RESOLVE_TEST_SERVICES=y +CONFIG_MDNS_ADD_MAC_TO_HOSTNAME=y +CONFIG_MDNS_PUBLISH_DELEGATE_HOST=y +CONFIG_LWIP_DNS_SUPPORT_MDNS_QUERIES=y +CONFIG_LWIP_IPV6=n +CONFIG_EXAMPLE_CONNECT_ETHERNET=y +CONFIG_EXAMPLE_CONNECT_WIFI=n +CONFIG_EXAMPLE_USE_INTERNAL_ETHERNET=y +CONFIG_EXAMPLE_ETH_PHY_IP101=y +CONFIG_EXAMPLE_ETH_MDC_GPIO=23 +CONFIG_EXAMPLE_ETH_MDIO_GPIO=18 +CONFIG_EXAMPLE_ETH_PHY_RST_GPIO=5 +CONFIG_EXAMPLE_ETH_PHY_ADDR=1 +CONFIG_MDNS_BUTTON_GPIO=32 diff --git a/components/mdns/idf_component.yml b/components/mdns/idf_component.yml index 953eb8099..53538f8d3 100644 --- a/components/mdns/idf_component.yml +++ b/components/mdns/idf_component.yml @@ -1,4 +1,4 @@ -version: "1.0.5" +version: "1.0.6" description: mDNS dependencies: idf: diff --git a/components/mdns/mdns_networking_lwip.c b/components/mdns/mdns_networking_lwip.c index 86b4c6c5e..f600ada25 100644 --- a/components/mdns/mdns_networking_lwip.c +++ b/components/mdns/mdns_networking_lwip.c @@ -339,8 +339,12 @@ size_t _mdns_udp_pcb_write(mdns_if_t tcpip_if, mdns_ip_protocol_t ip_protocol, c memcpy((uint8_t *)pbt->payload, data, len); ip_addr_t ip_add_copy; +#if CONFIG_LWIP_IPV6 ip_add_copy.type = ip->type; - memcpy(&(ip_add_copy.u_addr),&(ip->u_addr),sizeof(ip_add_copy.u_addr)); + memcpy(&(ip_add_copy.u_addr), &(ip->u_addr), sizeof(ip_add_copy.u_addr)); +#else + memcpy(&(ip_add_copy.addr), &(ip->u_addr), sizeof(ip_addr_copy.addr)); +#endif // CONFIG_LWIP_IPV6 mdns_api_call_t msg = { .tcpip_if = tcpip_if,