Fix a few build problems after merging IPv6 zones

This commit is contained in:
Dirk Ziegelmeier 2017-02-04 11:59:35 +01:00
parent 4fb7d74165
commit f60a2e8f85
2 changed files with 3 additions and 3 deletions

View File

@ -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 {

View File

@ -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)))
/**