From c8b65f6c1d2aaa6b3bb1b3d600e54137f294a2d6 Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Wed, 30 Mar 2016 11:20:54 +0200 Subject: [PATCH] Fix #define IPADDR_STRLEN_MAX in IPv6 only and dual-stack case --- src/include/lwip/ip4_addr.h | 1 - src/include/lwip/ip_addr.h | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/include/lwip/ip4_addr.h b/src/include/lwip/ip4_addr.h index 9483a2f7..14363a33 100644 --- a/src/include/lwip/ip4_addr.h +++ b/src/include/lwip/ip4_addr.h @@ -233,7 +233,6 @@ u8_t ip4_addr_netmask_valid(u32_t netmask); #define ip4_addr4_16(ipaddr) ((u16_t)ip4_addr4(ipaddr)) #define IP4ADDR_STRLEN_MAX 16 -#define IPADDR_STRLEN_MAX IP4ADDR_STRLEN_MAX /** For backwards compatibility */ #define ip_ntoa(ipaddr) ipaddr_ntoa(ipaddr) diff --git a/src/include/lwip/ip_addr.h b/src/include/lwip/ip_addr.h index 6ca3327f..30ddbc62 100644 --- a/src/include/lwip/ip_addr.h +++ b/src/include/lwip/ip_addr.h @@ -154,6 +154,8 @@ extern const ip_addr_t ip_addr_any_type; ((IP_IS_V6(addr)) ? ip6addr_ntoa_r(ip_2_ip6(addr), buf, buflen) : ip4addr_ntoa_r(ip_2_ip4(addr), buf, buflen))) int ipaddr_aton(const char *cp, ip_addr_t *addr); +#define IPADDR_STRLEN_MAX IP6ADDR_STRLEN_MAX + #else /* LWIP_IPV4 && LWIP_IPV6 */ #define IP_ADDR_PCB_VERSION_MATCH(addr, pcb) 1 @@ -198,6 +200,8 @@ typedef ip4_addr_t ip_addr_t; #define ipaddr_ntoa_r(ipaddr, buf, buflen) ip4addr_ntoa_r(ipaddr, buf, buflen) #define ipaddr_aton(cp, addr) ip4addr_aton(cp, addr) +#define IPADDR_STRLEN_MAX IP4ADDR_STRLEN_MAX + #else /* LWIP_IPV4 */ typedef ip6_addr_t ip_addr_t; @@ -235,6 +239,8 @@ typedef ip6_addr_t ip_addr_t; #define ipaddr_ntoa_r(ipaddr, buf, buflen) ip6addr_ntoa_r(ipaddr, buf, buflen) #define ipaddr_aton(cp, addr) ip6addr_aton(cp, addr) +#define IPADDR_STRLEN_MAX IP6ADDR_STRLEN_MAX + #endif /* LWIP_IPV4 */ #endif /* LWIP_IPV4 && LWIP_IPV6 */