X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnetutl.c;h=5406bbb85e983f6fcfe1a48c0666c722a098e3e6;hb=4b6c01b1d5383b1a7417244a31ad4652aab2d5db;hp=38f4d487db0fbac6897d949fbd13a0308a9891f2;hpb=53522b1c11222273c7b41f72b374e759d13b2165;p=meshlink

diff --git a/src/netutl.c b/src/netutl.c
index 38f4d487..5406bbb8 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,
 	};
 
@@ -59,7 +57,7 @@ sockaddr_t str2sockaddr(const char *address, const char *port) {
 
 	struct addrinfo hint = {
 		.ai_family = AF_UNSPEC,
-		.ai_flags = AI_NUMERICHOST,
+		.ai_flags = NI_NUMERICHOST | NI_NUMERICSERV,
 		.ai_socktype = SOCK_STREAM,
 	};
 
@@ -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));
@@ -285,7 +282,8 @@ void packmsg_add_sockaddr(packmsg_output_t *out, const sockaddr_t *sa) {
 }
 
 sockaddr_t packmsg_get_sockaddr(packmsg_input_t *in) {
-	sockaddr_t sa = {0};
+	sockaddr_t sa;
+	memset(&sa, 0, sizeof sa);
 
 	int8_t type;
 	const void *data;