Avoid allocating packet buffers unnecessarily.

[meshlink] / src / netutl.c

diff --git a/src/netutl.c b/src/netutl.c
index d38b1a18aeb8468e1ac82ff40076b4c79720d54f..f4ee5aa0f123151400b9628a1a0decd3a177b6a3 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,
        };
 
@@ -55,6 +53,8 @@ sockaddr_t str2sockaddr(const char *address, const char *port) {
        sockaddr_t result;
        int err;
 
+       memset(&result, 0, sizeof(result));
+
        struct addrinfo hint = {
                .ai_family = AF_UNSPEC,
                .ai_flags = AI_NUMERICHOST,
@@ -128,11 +128,11 @@ 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));
+               abort();
        }
 
        xasprintf(&str, "%s port %s", address, port);
@@ -226,6 +226,23 @@ void sockaddrcpy(sockaddr_t *a, const sockaddr_t *b) {
        }
 }
 
+void sockaddrcpy_setport(sockaddr_t *a, const sockaddr_t *b, uint16_t port) {
+       sockaddrcpy(a, b);
+
+       switch(b->sa.sa_family) {
+       case AF_INET:
+               a->in.sin_port = htons(port);
+               break;
+
+       case AF_INET6:
+               a->in6.sin6_port = htons(port);
+               break;
+
+       default:
+               break;
+       }
+}
+
 void sockaddrfree(sockaddr_t *a) {
        if(a->sa.sa_family == AF_UNKNOWN) {
                free(a->unknown.address);
@@ -239,3 +256,65 @@ void sockaddrunmap(sockaddr_t *sa) {
                sa->in.sin_family = AF_INET;
        }
 }
+
+void packmsg_add_sockaddr(packmsg_output_t *out, const sockaddr_t *sa) {
+       switch(sa->sa.sa_family) {
+       case AF_INET: {
+               uint8_t buf[6];
+               memcpy(buf + 0, &sa->in.sin_port, 2);
+               memcpy(buf + 2, &sa->in.sin_addr, 4);
+               packmsg_add_ext(out, 4, buf, sizeof(buf));
+               break;
+       }
+
+       case AF_INET6: {
+               uint8_t buf[18];
+               memcpy(buf + 0, &sa->in6.sin6_port, 2);
+               memcpy(buf + 2, &sa->in6.sin6_addr, 16);
+               packmsg_add_ext(out, 6, buf, sizeof(buf));
+               break;
+       }
+
+       default:
+               packmsg_output_invalidate(out);
+               break;
+       }
+}
+
+sockaddr_t packmsg_get_sockaddr(packmsg_input_t *in) {
+       sockaddr_t sa = {0};
+
+       int8_t type;
+       const void *data;
+       uint32_t len = packmsg_get_ext_raw(in, &type, &data);
+
+       switch(type) {
+       case 4:
+               if(len != 6) {
+                       packmsg_input_invalidate(in);
+                       return sa;
+               }
+
+               sa.sa.sa_family = AF_INET;
+               memcpy(&sa.in.sin_port, (uint8_t *)data + 0, 2);
+               memcpy(&sa.in.sin_addr, (uint8_t *)data + 2, 4);
+               break;
+
+       case 6:
+               if(len != 18) {
+                       packmsg_input_invalidate(in);
+                       return sa;
+               }
+
+               sa.sa.sa_family = AF_INET6;
+               memcpy(&sa.in6.sin6_port, (uint8_t *)data + 0, 2);
+               memcpy(&sa.in6.sin6_addr, (uint8_t *)data + 2, 16);
+               break;
+
+       default:
+               packmsg_input_invalidate(in);
+               return sa;
+       }
+
+       return sa;
+}