X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Ffake-getaddrinfo.c;h=10672b7e6f07eee8749a120c66eeff1a2703cbf8;hp=0c9fae94dda83b5d18f67256cf9b1c372b29a87f;hb=fa9bedd47cf8c143e801889c78f0a0979ac4d2fc;hpb=03995ca52ee31ed505902a3c8c3d1119988c8497

diff --git a/lib/fake-getaddrinfo.c b/lib/fake-getaddrinfo.c
index 0c9fae94..10672b7e 100644
--- a/lib/fake-getaddrinfo.c
+++ b/lib/fake-getaddrinfo.c
@@ -14,8 +14,9 @@
 #include "ipv4.h"
 #include "ipv6.h"
 #include "fake-getaddrinfo.h"
+#include "xalloc.h"
 
-#ifndef HAVE_GAI_STRERROR
+#if !HAVE_DECL_GAI_STRERROR
 char *gai_strerror(int ecode)
 {
 	switch (ecode) {
@@ -23,13 +24,15 @@ char *gai_strerror(int ecode)
 			return "No address associated with hostname";
 		case EAI_MEMORY:
 			return "Memory allocation failure";
+		case EAI_FAMILY:
+			return "Address family not supported";
 		default:
 			return "Unknown error";
 	}
 }    
 #endif /* !HAVE_GAI_STRERROR */
 
-#ifndef HAVE_FREEADDRINFO
+#if !HAVE_DECL_FREEADDRINFO
 void freeaddrinfo(struct addrinfo *ai)
 {
 	struct addrinfo *next;
@@ -42,7 +45,7 @@ void freeaddrinfo(struct addrinfo *ai)
 }
 #endif /* !HAVE_FREEADDRINFO */
 
-#ifndef HAVE_GETADDRINFO
+#if !HAVE_DECL_GETADDRINFO
 static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr)
 {
 	struct addrinfo *ai;
@@ -67,6 +70,9 @@ int getaddrinfo(const char *hostname, const char *servname, const struct addrinf
 	int i;
 	uint16_t port = 0;
 
+	if(hints && hints->ai_family != AF_INET && hints->ai_family != AF_UNSPEC)
+		return EAI_FAMILY;
+
 	if (servname)
 		port = htons(atoi(servname));
 
@@ -82,7 +88,7 @@ int getaddrinfo(const char *hostname, const char *servname, const struct addrinf
 	
 	hp = gethostbyname(hostname);
 
-	if(!hp || !hp->h_addr_list[0])
+	if(!hp || !hp->h_addr_list || !hp->h_addr_list[0])
 		return EAI_NODATA;
 
 	for (i = 0; hp->h_addr_list[i]; i++) {