From 6af9b23df5d6a7ea70db450cd15219ce53d7b907 Mon Sep 17 00:00:00 2001 From: Gregory Nutt Date: Thu, 25 Feb 2016 13:59:42 -0600 Subject: [PATCH] libc/netdb: Fix some compile issues when IPv6 is enabled --- libc/netdb/lib_dnsquery.c | 4 ++-- libc/netdb/lib_gethostbynamer.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libc/netdb/lib_dnsquery.c b/libc/netdb/lib_dnsquery.c index 283b3ae8fe..54a5046fab 100644 --- a/libc/netdb/lib_dnsquery.c +++ b/libc/netdb/lib_dnsquery.c @@ -190,7 +190,7 @@ static int dns_send_query(int sd, FAR const char *name, #ifdef CONFIG_NET_IPv4 #ifdef CONFIG_NET_IPv6 - if (uaddr->addr.sa_family == AF_INET) + if (uaddr->ipv4.sin_family == AF_INET) #endif { addrlen = sizeof(struct sockaddr_in); @@ -521,7 +521,7 @@ static int dns_query_callback(FAR void *arg, FAR struct sockaddr *addr, #ifdef CONFIG_NET_IPv6 /* Is this an IPv4 address? */ - if (query->addr.sa_family == AF_INET6) + if (query->addr->sa_family == AF_INET6) { /* Yes.. verify the address size */ diff --git a/libc/netdb/lib_gethostbynamer.c b/libc/netdb/lib_gethostbynamer.c index 747cf6a0c5..80109dfe77 100644 --- a/libc/netdb/lib_gethostbynamer.c +++ b/libc/netdb/lib_gethostbynamer.c @@ -382,7 +382,7 @@ static int lib_find_answer(FAR const char *name, FAR struct hostent *host, DEBUGASSERT(addrlen == sizeof(struct sockaddr_in6)); addrlen = sizeof(struct sockaddr_in6); addrtype = AF_INET6; - addrdata = &((FAR struct sockaddr_in6 *)ptr)->sin_addr; + addrdata = &((FAR struct sockaddr_in6 *)ptr)->sin6_addr; } #endif @@ -524,7 +524,7 @@ static int lib_dns_lookup(FAR const char *name, FAR struct hostent *host, DEBUGASSERT(addrlen == sizeof(struct sockaddr_in6)); addrlen = sizeof(struct sockaddr_in6); addrtype = AF_INET6; - addrdata = &((FAR struct sockaddr_in6 *)ptr)->sin_addr; + addrdata = &((FAR struct sockaddr_in6 *)ptr)->sin6_addr; } #endif