X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Ffake-getaddrinfo.c;h=576d79f464047d051755effbb0af85cc4322902c;hb=a5a8005b2d89712e124ab7295165a3e229abdad5;hp=db50f739b6778a791bc8b4394127f16bca8ec14c;hpb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;p=meshlink

diff --git a/src/fake-getaddrinfo.c b/src/fake-getaddrinfo.c
index db50f739..576d79f4 100644
--- a/src/fake-getaddrinfo.c
+++ b/src/fake-getaddrinfo.c
@@ -2,32 +2,33 @@
  * fake library for ssh
  *
  * This file includes getaddrinfo(), freeaddrinfo() and gai_strerror().
- * These funtions are defined in rfc2133.
+ * These functions are defined in rfc2133.
  *
  * But these functions are not implemented correctly. The minimum subset
- * is implemented for ssh use only. For exapmle, this routine assumes
+ * is implemented for ssh use only. For example, this routine assumes
  * that ai_family is AF_INET. Don't use it for another purpose.
  */
 
 #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 */
@@ -48,7 +49,7 @@ 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);
@@ -67,32 +68,36 @@ 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)
+	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])
+	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)
+		if(prev) {
 			prev->ai_next = *res;
+		}
 
 		prev = *res;
 	}