Don't forget BSD..

Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>

src/bench.c

@@ -105,7 +105,7 @@ gt_bench(int argc, char **argv)
         double mbps_max = 0.0;
         double mbps_dlt = INFINITY;
 
-        while (!gt_quit && mbps_dlt > ldexp(mbps, -precision)) {
+        while (!gt_quit && mbps_dlt > ldexp(mbps, -(int)precision)) {
             crypto_aead_aes256gcm_state ctx;
 
             if (!chacha)

src/bind.c

@@ -263,6 +263,7 @@ gt_bind(int argc, char **argv)
                                 perror("sendto(ctl)");
                         }
 
+                        free(paths);
                         res.ret = 0;
                     }
                     break;
@@ -303,88 +304,33 @@ gt_bind(int argc, char **argv)
         }
 
         if (FD_ISSET(tun_fd, &rfds)) {
-            size_t size = 0;
+            struct ip_common ic;
+            const int r = tun_read(tun_fd, buf, bufsize);
 
-            while (bufsize - size >= mtu) {
-                const int r = tun_read(tun_fd, &buf[size], bufsize - size);
-
-                if (r <= 0 || r > mtu)
-                    break;
-
-                struct ip_common ic;
-
-                if (ip_get_common(&ic, &buf[size], r) || ic.size != r)
-                    break;
-
-                size += r;
-            }
-
-            size_t p = 0;
-
-            while (p < size) {
-                size_t q = p;
-                int tc = 0;
-
-                while (q < size) {
-                    struct ip_common ic;
-
-                    if ((ip_get_common(&ic, &buf[q], size - q)) ||
-                        (ic.size > size - q))
-                        break;
-
-                    if (q + ic.size > p + mtu)
-                        break;
-
-                    q += ic.size;
-
-                    if (tc < (ic.tc & 0xFC))
-                        tc = ic.tc & 0xFC;
+            if (r <= 0) {
+                if (r == -1 && errno != EAGAIN)
+                    perror("tun_read");
+            } else if ((!ip_get_common(&ic, buf, r)) &&
+                       (mud_send(mud, buf, r, ic.tc) == -1)) {
+                if (errno == EMSGSIZE) {
+                    mtu = gt_setup_mtu(mud, tun_name);
+                } else if (errno != EAGAIN) {
+                    perror("mud_send");
                 }
-
-                if (p >= q)
-                    break;
-
-                int r = mud_send(mud, &buf[p], q - p, tc);
-
-                if (r == -1) {
-                    if (errno == EMSGSIZE) {
-                        mtu = gt_setup_mtu(mud, tun_name);
-                    } else if (errno != EAGAIN) {
-                        perror("mud_send");
-                    }
-                }
-
-                p = q;
             }
         }
 
         if (FD_ISSET(mud_fd, &rfds)) {
-            size_t size = 0;
+            struct ip_common ic;
+            const int r = mud_recv(mud, buf, bufsize);
 
-            while (bufsize - size >= mtu) {
-                const int r = mud_recv(mud, &buf[size], bufsize - size);
-
-                if (r <= 0) {
-                    if (r == -1 && errno != EAGAIN)
-                        perror("mud_recv");
-                    break;
-                }
-
-                size += r;
-            }
-
-            size_t p = 0;
-
-            while (p < size) {
-                struct ip_common ic;
-
-                if ((ip_get_common(&ic, &buf[p], size - p)) ||
-                    (ic.size > size - p))
-                    break;
-
-                tun_write(tun_fd, &buf[p], ic.size);
-
-                p += ic.size;
+            if (r <= 0) {
+                if (r == -1 && errno != EAGAIN)
+                    perror("mud_recv");
+            } else if ((!ip_get_common(&ic, buf, r)) &&
+                       (tun_write(tun_fd, buf, r) == -1)) {
+                if (errno != EAGAIN)
+                    perror("tun_write");
             }
         }
     }
@@ -394,7 +340,9 @@ gt_bind(int argc, char **argv)
             perror("tun_set_persist");
     }
 
+    mud_delete(mud);
     ctl_delete(ctl_fd);
+    free(buf);
 
     return 0;
 }

src/common.c

@@ -99,6 +99,9 @@ gt_get_port(struct sockaddr *sa)
 int
 gt_toaddr(char *str, size_t size, struct sockaddr *sa)
 {
+    if (str)
+        str[0] = 0;
+
     switch (sa->sa_family) {
     case AF_INET:
         return -!inet_ntop(AF_INET,

src/ctl.c

@@ -133,13 +133,15 @@ ctl_create(const char *dir, const char *file)
 int
 ctl_connect(const char *dir, const char *file)
 {
+    DIR *dp = NULL;
+
     if (str_empty(dir)) {
         errno = EINVAL;
         return -1;
     }
 
     if (!file) {
-        DIR *dp = opendir(dir);
+        dp = opendir(dir);
 
         if (!dp)
             return -1;
@@ -151,20 +153,30 @@ ctl_connect(const char *dir, const char *file)
                 continue;
 
             if (file) {
-                closedir(dp);
-                errno = ENOENT;
-                return -1;
+                file = NULL;
+                break;
             }
 
             file = &d->d_name[0];
         }
 
-        closedir(dp);
+        if (!file) {
+            closedir(dp);
+            errno = ENOENT;
+            return -1;
+        }
     }
 
     struct sockaddr_un sun;
+    const int ret = ctl_setsun(&sun, dir, file);
 
-    if (ctl_setsun(&sun, dir, file))
+    if (dp) {
+        int err = errno;
+        closedir(dp);
+        errno = err;
+    }
+
+    if (ret)
         return -1;
 
     int fd = ctl_create(dir, NULL);

src/ip.h

@@ -3,32 +3,16 @@
 #include <stdint.h>
 
 struct ip_common {
-    uint8_t version;
     uint8_t tc;
     uint8_t proto;
-    uint8_t hdr_size;
-    uint16_t size;
 };
 
-_pure_ static inline uint8_t
-ip_get_version(const uint8_t *data, size_t size)
+static inline uint8_t
+ip_get_version(const uint8_t *data)
 {
-    if (size < 20)
-        return 0;
-
     return data[0] >> 4;
 }
 
-static inline uint32_t
-ip_read32(const uint8_t *src)
-{
-    uint32_t ret = src[3];
-    ret |= ((uint32_t)src[2]) << 8;
-    ret |= ((uint32_t)src[1]) << 16;
-    ret |= ((uint32_t)src[0]) << 24;
-    return ret;
-}
-
 static inline uint16_t
 ip_read16(const uint8_t *src)
 {
@@ -37,45 +21,22 @@ ip_read16(const uint8_t *src)
     return ret;
 }
 
-static inline size_t
-ip_get_mtu(struct ip_common *ic, const uint8_t *data, size_t size)
-{
-    if (ic->hdr_size <= 0 || ic->hdr_size + 8 > size)
-        return 0;
-
-    const uint8_t *p = &data[ic->hdr_size];
-
-    if (ic->version == 4 && ic->proto == 1 && p[0] == 3)
-        return ip_read16(&p[6]);
-
-    // not tested..
-    // if (ic->version == 6 && ic->proto == 58 && p[0] == 2)
-    //    return ip_read32(&p[4]);
-
-    return 0;
-}
-
 static inline int
 ip_get_common(struct ip_common *ic, const uint8_t *data, size_t size)
 {
-    ic->version = ip_get_version(data, size);
+    if (size < 20)
+        return 1;
 
-    switch (ic->version) {
+    switch (ip_get_version(data)) {
     case 4:
         ic->tc = data[1];
         ic->proto = data[9];
-        ic->hdr_size = (data[0] & 0xF) << 2;
-        ic->size = ip_read16(&data[2]);
-        if (ic->size >= 20)
-            return 0;
-        break;
+        return size != ip_read16(&data[2]);
     case 6:
         ic->tc = ((data[0] & 0xF) << 4) | (data[1] >> 4);
         ic->proto = data[6];
-        ic->hdr_size = 40;
-        ic->size = ip_read16(&data[4]) + 40;
-        return 0;
+        return size != ip_read16(&data[4]) + 40;
     }
 
-    return -1;
+    return 1;
 }

src/path.c

@@ -27,17 +27,16 @@ gt_path_status(int fd)
         if (!res.ret)
             return 0;
 
-        char bindstr[INET6_ADDRSTRLEN] = {0};
-        char publstr[INET6_ADDRSTRLEN] = {0};
-        char peerstr[INET6_ADDRSTRLEN] = {0};
+        char bindstr[INET6_ADDRSTRLEN];
+        char publstr[INET6_ADDRSTRLEN];
+        char peerstr[INET6_ADDRSTRLEN];
 
-        if (gt_toaddr(bindstr, sizeof(bindstr),
-                      (struct sockaddr *)&res.path_status.local_addr) ||
-            gt_toaddr(publstr, sizeof(publstr),
-                      (struct sockaddr *)&res.path_status.r_addr) ||
-            gt_toaddr(peerstr, sizeof(peerstr),
-                      (struct sockaddr *)&res.path_status.addr))
-            return -2;
+        gt_toaddr(bindstr, sizeof(bindstr),
+                  (struct sockaddr *)&res.path_status.local_addr);
+        gt_toaddr(publstr, sizeof(publstr),
+                  (struct sockaddr *)&res.path_status.r_addr);
+        gt_toaddr(peerstr, sizeof(peerstr),
+                  (struct sockaddr *)&res.path_status.addr);
 
         const char *statestr = NULL;
 
@@ -49,17 +48,20 @@ gt_path_status(int fd)
         }
 
         printf("path %s\n"
-               "  bind:   %s\n"
+               "  bind:   %s port %"PRIu16"\n"
                "  public: %s port %"PRIu16"\n"
                "  peer:   %s port %"PRIu16"\n"
                "  mtu:    %zu bytes\n"
                "  rtt:    %.3f ms\n",
-               statestr, bindstr,
-               publstr, gt_get_port((struct sockaddr *)&res.path_status.r_addr),
-               peerstr, gt_get_port((struct sockaddr *)&res.path_status.addr),
+               statestr,
+               bindstr[0] ? bindstr : "-",
+               gt_get_port((struct sockaddr *)&res.path_status.local_addr),
+               publstr[0] ? publstr : "-",
+               gt_get_port((struct sockaddr *)&res.path_status.r_addr),
+               peerstr[0] ? peerstr : "-",
+               gt_get_port((struct sockaddr *)&res.path_status.addr),
                res.path_status.mtu.ok + 28U,     /* ip+udp hdr */
                res.path_status.rtt/(double)1e3);
-
     } while (res.ret == EAGAIN);
 
     return 0;

src/show.c

@@ -18,12 +18,11 @@ gt_show_dev_status(int fd, const char *dev)
     if (ctl_reply(fd, &res, &req))
         return -1;
 
-    char bindstr[INET6_ADDRSTRLEN] = {0};
-    char peerstr[INET6_ADDRSTRLEN] = {0};
+    char bindstr[INET6_ADDRSTRLEN];
+    char peerstr[INET6_ADDRSTRLEN];
 
-    if (gt_toaddr(bindstr, sizeof(bindstr),
-                  (struct sockaddr *)&res.status.bind))
-        return -2;
+    gt_toaddr(bindstr, sizeof(bindstr),
+              (struct sockaddr *)&res.status.bind);
 
     int server = gt_toaddr(peerstr, sizeof(peerstr),
                            (struct sockaddr *)&res.status.peer);
@@ -34,7 +33,8 @@ gt_show_dev_status(int fd, const char *dev)
                "  mtu:       %zu\n"
                "  cipher:    %s\n",
                dev,
-               bindstr, gt_get_port((struct sockaddr *)&res.status.bind),
+               bindstr[0] ? bindstr : "-",
+               gt_get_port((struct sockaddr *)&res.status.bind),
                res.status.mtu,
                res.status.chacha ? "chacha20poly1305" : "aes256gcm");
     } else {
@@ -44,8 +44,10 @@ gt_show_dev_status(int fd, const char *dev)
                "  mtu:       %zu\n"
                "  cipher:    %s\n",
                dev,
-               bindstr, gt_get_port((struct sockaddr *)&res.status.bind),
-               peerstr, gt_get_port((struct sockaddr *)&res.status.peer),
+               bindstr[0] ? bindstr : "-",
+               gt_get_port((struct sockaddr *)&res.status.bind),
+               peerstr[0] ? peerstr : "-",
+               gt_get_port((struct sockaddr *)&res.status.peer),
                res.status.mtu,
                res.status.chacha ? "chacha20poly1305" : "aes256gcm");
     }

src/tun.c

@@ -224,7 +224,7 @@ tun_write(int fd, const void *data, size_t size)
 #ifdef GT_BSD_TUN
     uint32_t family;
 
-    switch (ip_get_version(data, size)) {
+    switch (ip_get_version(data)) {
     case 4:
         family = htonl(AF_INET);
         break;