From f60a2e8f8559b755c90710633f7f9890f42fc4ff Mon Sep 17 00:00:00 2001 From: Dirk Ziegelmeier Date: Sat, 4 Feb 2017 11:59:35 +0100 Subject: [PATCH] Fix a few build problems after merging IPv6 zones --- src/api/netdb.c | 2 +- src/include/lwip/ip6_zone.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/api/netdb.c b/src/api/netdb.c index e2353d82..6cf74692 100644 --- a/src/api/netdb.c +++ b/src/api/netdb.c @@ -376,7 +376,7 @@ lwip_getaddrinfo(const char *nodename, const char *servname, sa6->sin6_family = AF_INET6; sa6->sin6_len = sizeof(struct sockaddr_in6); sa6->sin6_port = lwip_htons((u16_t)port_nr); - sa6->sin6_scope_id = ip6_addr_zone(&addr); + sa6->sin6_scope_id = ip6_addr_zone(ip_2_ip6(&addr)); ai->ai_family = AF_INET6; #endif /* LWIP_IPV6 */ } else { diff --git a/src/include/lwip/ip6_zone.h b/src/include/lwip/ip6_zone.h index d16a6b8a..41a9c909 100644 --- a/src/include/lwip/ip6_zone.h +++ b/src/include/lwip/ip6_zone.h @@ -157,8 +157,8 @@ * @return 1 if the address has a constrained scope, 0 if it does not. */ #define ip6_addr_has_scope(ip6addr, type) \ - (ip6_addr_islinklocal(ip6addr) || (((type) != IP6_UNICAST) && \ - ip6_addr_ismulticast_iflocal(ip6addr) || \ + (ip6_addr_islinklocal(ip6addr) || ((((type) != IP6_UNICAST) && \ + ip6_addr_ismulticast_iflocal(ip6addr)) || \ ip6_addr_ismulticast_linklocal(ip6addr))) /**