X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnetutl.c;h=f4ee5aa0f123151400b9628a1a0decd3a177b6a3;hp=1d0181b80d48046b3b4e82b627c7e98ca0c5007a;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=fa05f996c5500c056a36c1d43e33a407f876643c

diff --git a/src/netutl.c b/src/netutl.c
index 1d0181b8..f4ee5aa0 100644
--- a/src/netutl.c
+++ b/src/netutl.c
@@ -25,8 +25,6 @@
 #include "utils.h"
 #include "xalloc.h"
 
-bool hostnames = false;
-
 /*
   Turn a string into a struct addrinfo.
   Return NULL on failure.
@@ -36,7 +34,7 @@ struct addrinfo *str2addrinfo(const char *address, const char *service, int sock
 	int err;
 
 	struct addrinfo hint = {
-		.ai_family = addressfamily,
+		.ai_family = AF_UNSPEC,
 		.ai_socktype = socktype,
 	};
 
@@ -130,8 +128,7 @@ char *sockaddr2hostname(const sockaddr_t *sa) {
 		return str;
 	}
 
-	err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port),
-	                  hostnames ? 0 : (NI_NUMERICHOST | NI_NUMERICSERV));
+	err = getnameinfo(&sa->sa, SALEN(sa->sa), address, sizeof(address), port, sizeof(port), NI_NUMERICHOST | NI_NUMERICSERV);
 
 	if(err) {
 		logger(NULL, MESHLINK_ERROR, "Error while looking up hostname: %s", err == EAI_SYSTEM ? strerror(errno) : gai_strerror(err));
@@ -234,11 +231,11 @@ void sockaddrcpy_setport(sockaddr_t *a, const sockaddr_t *b, uint16_t port) {
 
 	switch(b->sa.sa_family) {
 	case AF_INET:
-		a->in.sin_port = port;
+		a->in.sin_port = htons(port);
 		break;
 
 	case AF_INET6:
-		a->in6.sin6_port = port;
+		a->in6.sin6_port = htons(port);
 		break;
 
 	default: