X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Ffake-getaddrinfo.c;h=37a65b894b46c687277753f95b24d4366dc0c184;hb=d5de0bca747e9ba43bc28fbef54aaf5cfc321f5b;hp=df3d34764dc9680dd1d625cd10ed94e2bdfb19d0;hpb=103543aa2c15d9f1e2aa313a2e593a7524cce484;p=meshlink

diff --git a/src/fake-getaddrinfo.c b/src/fake-getaddrinfo.c
index df3d3476..37a65b89 100644
--- a/src/fake-getaddrinfo.c
+++ b/src/fake-getaddrinfo.c
@@ -11,25 +11,23 @@
 
 #include "system.h"
 
-#include "ipv4.h"
-#include "ipv6.h"
 #include "fake-getaddrinfo.h"
 #include "xalloc.h"
 
 
 #if !HAVE_DECL_GAI_STRERROR
 char *gai_strerror(int ecode) {
-	switch (ecode) {
-		case EAI_NODATA:
-			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";
+	switch(ecode) {
+	case EAI_NODATA:
+		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 */
 
 #if !HAVE_DECL_FREEADDRINFO
@@ -48,15 +46,15 @@ void freeaddrinfo(struct addrinfo *ai) {
 static struct addrinfo *malloc_ai(uint16_t port, uint32_t addr) {
 	struct addrinfo *ai;
 
-	ai = xmalloc_and_zero(sizeof(struct addrinfo) + sizeof(struct sockaddr_in));
-	
+	ai = xzalloc(sizeof(struct addrinfo) + sizeof(struct sockaddr_in));
+
 	ai->ai_addr = (struct sockaddr *)(ai + 1);
 	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;
 }
 
@@ -70,25 +68,25 @@ int getaddrinfo(const char *hostname, const char *servname, const struct addrinf
 	if(hints && hints->ai_family != AF_INET && hints->ai_family != AF_UNSPEC)
 		return EAI_FAMILY;
 
-	if (servname)
+	if(servname)
 		port = htons(atoi(servname));
 
-	if (hints && hints->ai_flags & AI_PASSIVE) {
+	if(hints && hints->ai_flags & AI_PASSIVE) {
 		*res = malloc_ai(port, htonl(0x00000000));
 		return 0;
 	}
-		
-	if (!hostname) {
+
+	if(!hostname) {
 		*res = malloc_ai(port, htonl(0x7f000001));
 		return 0;
 	}
-	
+
 	hp = gethostbyname(hostname);
 
 	if(!hp || !hp->h_addr_list || !hp->h_addr_list[0])
 		return EAI_NODATA;
 
-	for (i = 0; hp->h_addr_list[i]; i++) {
+	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)