X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnetutl.c;h=f4ee5aa0f123151400b9628a1a0decd3a177b6a3;hp=38f4d487db0fbac6897d949fbd13a0308a9891f2;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hpb=53522b1c11222273c7b41f72b374e759d13b2165 diff --git a/src/netutl.c b/src/netutl.c index 38f4d487..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));