X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=lib%2Ffake-getnameinfo.c;h=6630decc42f90e2a76a7d8df6e44abbd9e0fddb5;hp=8774da2716ff998b9529491f54de72b423e70966;hb=03995ca52ee31ed505902a3c8c3d1119988c8497;hpb=dbfd6f284e0ff0aa04e6d6e62b902966912da516

diff --git a/lib/fake-getnameinfo.c b/lib/fake-getnameinfo.c
index 8774da27..6630decc 100644
--- a/lib/fake-getnameinfo.c
+++ b/lib/fake-getnameinfo.c
@@ -16,41 +16,31 @@
 
 #ifndef HAVE_GETNAMEINFO
 
-int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, 
-                size_t hostlen, char *serv, size_t servlen, int flags)
+int getnameinfo(const struct sockaddr *sa, size_t salen, char *host, size_t hostlen, char *serv, size_t servlen, int flags)
 {
 	struct sockaddr_in *sin = (struct sockaddr_in *)sa;
 	struct hostent *hp;
-	char tmpserv[16];
-
-	if (serv) {
-		snprintf(tmpserv, sizeof(tmpserv), "%d", ntohs(sin->sin_port));
-		if (strlen(tmpserv) >= servlen)
-			return EAI_MEMORY;
-		else
-			strcpy(serv, tmpserv);
-	}
 
-	if (host) {
-		if (flags & NI_NUMERICHOST) {
-			if (strlen(inet_ntoa(sin->sin_addr)) >= hostlen)
-				return EAI_MEMORY;
-
-			strcpy(host, inet_ntoa(sin->sin_addr));
-			return 0;
-		} else {
-			hp = gethostbyaddr((char *)&sin->sin_addr, 
-				sizeof(struct in_addr), AF_INET);
-			if (hp == NULL)
-				return EAI_NODATA;
-			
-			if (strlen(hp->h_name) >= hostlen)
-				return EAI_MEMORY;
-
-			strcpy(host, hp->h_name);
-			return 0;
-		}
+	if(serv)
+		snprintf(serv, sizeof(tmpserv), "%d", ntohs(sin->sin_port));
+
+	if(!host)
+		return 0;
+
+	if(flags & NI_NUMERICHOST) {
+		strncpy(host, inet_ntoa(sin->sin_addr), sizeof(host));
+		return 0;
 	}
+
+	hp = gethostbyaddr((char *)&sin->sin_addr, sizeof(struct in_addr), AF_INET);
+	
+	if(!hp || !hp->h_name)
+		return EAI_NODATA;
+	
+	if(strlen(hp->h_name) >= hostlen)
+		return EAI_MEMORY;
+
+	strncpy(host, hp->h_name, hostlen);
 	return 0;
 }
 #endif /* !HAVE_GETNAMEINFO */