From 78825e4d5eb3c39df686fdf4c254218a7eff2a08 Mon Sep 17 00:00:00 2001 From: WanqQixiang Date: Fri, 17 Nov 2023 11:33:21 +0800 Subject: [PATCH] fix(mdns): define CONFIG_LWIP_IPV4 in mdns_private.h if it is not defined for IDF v5.0 --- components/mdns/mdns_networking_socket.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/components/mdns/mdns_networking_socket.c b/components/mdns/mdns_networking_socket.c index 8411e26e6d..c752bb1013 100644 --- a/components/mdns/mdns_networking_socket.c +++ b/components/mdns/mdns_networking_socket.c @@ -144,7 +144,7 @@ static inline char *get_string_address(struct sockaddr_storage *source_addr) } #endif #ifdef CONFIG_LWIP_IPV6 - if (source_addr->ss_family == PF_INET6) { + else if (source_addr->ss_family == PF_INET6) { res = inet6_ntoa_r(((struct sockaddr_in6 *)source_addr)->sin6_addr, address_str, sizeof(address_str)); } #endif @@ -172,7 +172,7 @@ static inline size_t espaddr_to_inet(const esp_ip_addr_t *addr, const uint16_t p } #endif // CONFIG_LWIP_IPV4 #ifdef CONFIG_LWIP_IPV6 - if (ip_protocol == MDNS_IP_PROTOCOL_V6 && addr->type == ESP_IPADDR_TYPE_V6) { + else if (ip_protocol == MDNS_IP_PROTOCOL_V6 && addr->type == ESP_IPADDR_TYPE_V6) { memset(in_addr, 0, sizeof(struct sockaddr_storage)); in_addr->ss_family = PF_INET6; #if !defined(CONFIG_IDF_TARGET_LINUX) @@ -226,7 +226,7 @@ static inline void inet_to_espaddr(const struct sockaddr_storage *in_addr, esp_i } #endif /* CONFIG_LWIP_IPV4 */ #ifdef CONFIG_LWIP_IPV6 - if (in_addr->ss_family == PF_INET6) { + else if (in_addr->ss_family == PF_INET6) { struct sockaddr_in6 *in_addr_ip6 = (struct sockaddr_in6 *)in_addr; memset(addr, 0, sizeof(esp_ip_addr_t)); *port = in_addr_ip6->sin6_port;