Don't use assert() to check the results of pthread_*() calls.

[meshlink] / src / netutl.c

diff --git a/src/netutl.c b/src/netutl.c
index 1d0181b80d48046b3b4e82b627c7e98ca0c5007a..5406bbb85e983f6fcfe1a48c0666c722a098e3e6 100644 (file)
--- 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));
@@ -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:
@@ -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;