X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Ffake-getaddrinfo.c;h=161c826f3728e2cbaf531ebc61242e4f6e9001db;hp=5e95a2a2efdd9601ab8a8d6b88c26768b1c06e3f;hb=2236e05e518c9e317d82c027596bea5228725214;hpb=2a7f11c0e90f5f0465bbc3c75de715454066ff72

diff --git a/lib/fake-getaddrinfo.c b/lib/fake-getaddrinfo.c
index 5e95a2a2..161c826f 100644
--- a/lib/fake-getaddrinfo.c
+++ b/lib/fake-getaddrinfo.c
@@ -9,18 +9,10 @@
  * that ai_family is AF_INET. Don't use it for another purpose.
  */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-#include <netdb.h>
-#include <string.h>
-
-#include <system.h>
+#include "system.h"
 
+#include "ipv4.h"
+#include "ipv6.h"
 #include "fake-getaddrinfo.h"
 
 #ifndef HAVE_GAI_STRERROR
@@ -28,11 +20,13 @@ char *gai_strerror(int ecode)
 {
 	switch (ecode) {
 		case EAI_NODATA:
-			return "no address associated with hostname.";
+			return "No address associated with hostname";
 		case EAI_MEMORY:
-			return "memory allocation failure.";
+			return "Memory allocation failure";
+		case EAI_FAMILY:
+			return "Address family not supported";
 		default:
-			return "unknown error.";
+			return "Unknown error";
 	}
 }    
 #endif /* !HAVE_GAI_STRERROR */
@@ -42,91 +36,69 @@ void freeaddrinfo(struct addrinfo *ai)
 {
 	struct addrinfo *next;
 
-	do {
+	while(ai) {
 		next = ai->ai_next;
 		free(ai);
-	} while (NULL != (ai = next));
+		ai = next;
+	}
 }
 #endif /* !HAVE_FREEADDRINFO */
 
 #ifndef HAVE_GETADDRINFO
-static struct addrinfo *malloc_ai(int port, u_long addr)
+static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr)
 {
 	struct addrinfo *ai;
 
-	ai = malloc(sizeof(struct addrinfo) + sizeof(struct sockaddr_in));
-	if (ai == NULL)
-		return(NULL);
-	
-	memset(ai, 0, sizeof(struct addrinfo) + sizeof(struct sockaddr_in));
+	ai = xmalloc_and_zero(sizeof(struct addrinfo) + sizeof(struct sockaddr_in));
 	
 	ai->ai_addr = (struct sockaddr *)(ai + 1);
-	/* XXX -- ssh doesn't use sa_len */
 	ai->ai_addrlen = sizeof(struct sockaddr_in);
 	ai->ai_addr->sa_family = ai->ai_family = AF_INET;
 
 	((struct sockaddr_in *)(ai)->ai_addr)->sin_port = port;
 	((struct sockaddr_in *)(ai)->ai_addr)->sin_addr.s_addr = addr;
 	
-	return(ai);
+	return ai;
 }
 
-int getaddrinfo(const char *hostname, const char *servname, 
-                const struct addrinfo *hints, struct addrinfo **res)
+int getaddrinfo(const char *hostname, const char *servname, const struct addrinfo *hints, struct addrinfo **res)
 {
-	struct addrinfo *cur, *prev = NULL;
+	struct addrinfo *prev = NULL;
 	struct hostent *hp;
-	struct in_addr in;
-	int i, port;
+	struct in_addr in = {0};
+	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));
-	else
-		port = 0;
 
 	if (hints && hints->ai_flags & AI_PASSIVE) {
-		if (NULL != (*res = malloc_ai(port, htonl(0x00000000))))
-			return 0;
-		else
-			return EAI_MEMORY;
+		*res = malloc_ai(port, htonl(0x00000000));
+		return 0;
 	}
 		
 	if (!hostname) {
-		if (NULL != (*res = malloc_ai(port, htonl(0x7f000001))))
-			return 0;
-		else
-			return EAI_MEMORY;
-	}
-	
-#ifdef HAVE_INET_ATON
-	if (inet_aton(hostname, &in)) {
-		if (NULL != (*res = malloc_ai(port, in.s_addr)))
-			return 0;
-		else
-			return EAI_MEMORY;
+		*res = malloc_ai(port, htonl(0x7f000001));
+		return 0;
 	}
-#endif
 	
 	hp = gethostbyname(hostname);
-	if (hp && hp->h_name && hp->h_name[0] && hp->h_addr_list[0]) {
-		for (i = 0; hp->h_addr_list[i]; i++) {
-			cur = malloc_ai(port, ((struct in_addr *)hp->h_addr_list[i])->s_addr);
-			if (cur == NULL) {
-				if (*res)
-					freeaddrinfo(*res);
-				return EAI_MEMORY;
-			}
-			
-			if (prev)
-				prev->ai_next = cur;
-			else
-				*res = cur;
-
-			prev = cur;
-		}
-		return 0;
+
+	if(!hp || !hp->h_addr_list || !hp->h_addr_list[0])
+		return EAI_NODATA;
+
+	for (i = 0; hp->h_addr_list[i]; i++) {
+		*res = malloc_ai(port, ((struct in_addr *)hp->h_addr_list[i])->s_addr);
+
+		if(prev)
+			prev->ai_next = *res;
+
+		prev = *res;
 	}
-	
-	return EAI_NODATA;
+
+	return 0;
 }
 #endif /* !HAVE_GETADDRINFO */