Update mud

Required on BSD. Doesn't break anything elsewhere.

.build.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+export CC="gcc -static"
+
+git clone https://github.com/jedisct1/libsodium --depth=1 --branch stable
+cd libsodium || exit 1
+./autogen.sh && ./configure --enable-minimal --disable-shared --prefix=/usr && make install
+cd ..
+
+./autogen.sh && ./configure && make
+[ -x glorytun ] || exit 1
+
+mkdir -p deploy
+strip -s glorytun
+mv glorytun deploy/glorytun-$(cat VERSION)-$(uname -m).bin

configure.ac

@@ -14,8 +14,9 @@ AM_SILENT_RULES([yes])
 AM_PROG_CC_C_O
 AC_PROG_CC_C99
 AC_USE_SYSTEM_EXTENSIONS
-AC_SEARCH_LIBS([getaddrinfo], [resolv nsl])
 AC_SEARCH_LIBS([socket], [socket])
+AC_CHECK_LIB([rt], [clock_gettime])
+AC_CHECK_FUNCS([clock_gettime])
 PKG_CHECK_MODULES([libsodium], [libsodium >= 1.0.4])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

src/ip.h

@@ -4,6 +4,7 @@
 
 struct ip_common {
     uint8_t version;
+    uint8_t tc;
     uint8_t proto;
     uint8_t hdr_size;
     uint16_t size;
@@ -24,11 +25,13 @@ static inline int ip_get_common (struct ip_common *ic, const uint8_t *data, size
 
     switch (ic->version) {
     case 4:
+        ic->tc = data[1];
         ic->proto = data[9];
         ic->hdr_size = (data[0]&0xF)<<2;
         ic->size = ((data[2]<<8)|data[3]);
         return 0;
     case 6:
+        ic->tc = ((data[0]&0xF)<<4)|(data[1]>>4);
         ic->proto = data[6];
         ic->hdr_size = 40;
         ic->size = ((data[4]<<8)|data[5])+40;

src/main.c

@@ -189,9 +189,12 @@ static int gt_setup_secretkey (struct mud *mud, char *keyfile)
 
     if (str_empty(keyfile)) {
         char buf[2*sizeof(key)+1];
+        size_t size = sizeof(key);
 
-        mud_get_key(mud, key, sizeof(key));
+        if (mud_get_key(mud, key, &size))
-        gt_tohex(buf, sizeof(buf), key, sizeof(key));
+            return -1;
+
+        gt_tohex(buf, sizeof(buf), key, size);
         state_send(gt.state_fd, "SECRETKEY", buf);
 
         return 0;
@@ -233,33 +236,44 @@ int main (int argc, char **argv)
     gt_set_signal();
 
     char *host = NULL;
-    char *port = "5000";
+    long port = 5000;
+
     char *bind_list = NULL;
-    char *bind_port = "5000";
+    char *bind_backup = NULL;
+    long bind_port = 5000;
+
     char *dev = NULL;
     char *keyfile = NULL;
     char *statefile = NULL;
 
+    long mtu = 1450;
+
     gt.timeout = 5000;
 
     long time_tolerance = 0;
 
     int v4 = 1;
-    int v6 = 1;
+    int v6 = 0;
+
+#ifdef __linux__
+    v6 = 1;
+#endif
 
     struct option opts[] = {
         { "host",           &host,           option_str    },
-        { "port",           &port,           option_str    },
+        { "port",           &port,           option_long   },
         { "bind",           &bind_list,      option_str    },
-        { "bind-port",      &bind_port,      option_str    },
+        { "bind-backup",    &bind_backup,    option_str    },
+        { "bind-port",      &bind_port,      option_long   },
         { "dev",            &dev,            option_str    },
+        { "mtu",            &mtu,            option_long   },
         { "keyfile",        &keyfile,        option_str    },
-        { "multiqueue",     NULL,            option_option },
         { "statefile",      &statefile,      option_str    },
         { "timeout",        &gt.timeout,     option_long   },
         { "time-tolerance", &time_tolerance, option_long   },
         { "v4only",         NULL,            option_option },
         { "v6only",         NULL,            option_option },
+        { "chacha20",       NULL,            option_option },
         { "version",        NULL,            option_option },
         { NULL },
     };
@@ -272,13 +286,18 @@ int main (int argc, char **argv)
         return 0;
     }
 
-    if (option_is_set(opts, "v4only"))
+    if (option_is_set(opts, "v4only")) {
+        v4 = 1;
         v6 = 0;
+    }
 
-    if (option_is_set(opts, "v6only"))
+    if (option_is_set(opts, "v6only")) {
         v4 = 0;
+        v6 = 1;
+    }
 
-    if (!v4 && !v6) {
+    if (option_is_set(opts, "v4only") &&
+        option_is_set(opts, "v6only")) {
         gt_log("v4only and v6only are both set\n");
         return 1;
     }
@@ -293,6 +312,15 @@ int main (int argc, char **argv)
         return 1;
     }
 
+    int icmp_fd = -1;
+
+    if (v4) {
+        icmp_fd = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
+
+        if (icmp_fd==-1)
+            gt_log("couldn't create ICMP socket\n");
+    }
+
     gt.state_fd = state_create(statefile);
 
     if (statefile && gt.state_fd==-1)
@@ -300,16 +328,23 @@ int main (int argc, char **argv)
 
     char *tun_name = NULL;
 
-    int tun_fd = tun_create(dev, &tun_name, option_is_set(opts, "multiqueue"));
+    int tun_fd = tun_create(dev, &tun_name);
 
     if (tun_fd==-1) {
         gt_log("couldn't create tun device\n");
         return 1;
     }
 
+    if (tun_set_mtu(tun_name, mtu)==-1) {
+        perror("tun_set_mtu");
+        return 1;
+    }
+
     fd_set_nonblock(tun_fd);
 
-    struct mud *mud = mud_create(bind_port, v4, v6);
+    int chacha = option_is_set(opts, "chacha20");
+
+    struct mud *mud = mud_create(bind_port, v4, v6, !chacha, mtu);
 
     if (!mud) {
         gt_log("couldn't create mud\n");
@@ -324,108 +359,167 @@ int main (int argc, char **argv)
     if (time_tolerance > 0)
         mud_set_time_tolerance_sec(mud, time_tolerance);
 
-    if (bind_list) {
+    if (host && port) {
-        char tmp[1024];
+        if (bind_backup) {
-        char *name = &tmp[0];
+            if (mud_peer(mud, bind_backup, host, port, 1)) {
-
+                perror("mud_peer (backup)");
-        size_t size = str_cpy(tmp, bind_list, sizeof(tmp)-1);
-
-        for (size_t i=0; i<size; i++) {
-            if (tmp[i]!=',')
-                continue;
-
-            tmp[i] = 0;
-
-            if (mud_bind(mud, name))
                 return 1;
-
+            }
-            name = &tmp[i+1];
         }
 
-        if (name[0] && mud_bind(mud, name))
+        if (bind_list) {
-            return 1;
+            char tmp[1024];
+            char *name = &tmp[0];
+
+            str_cpy(tmp, bind_list, sizeof(tmp)-1);
+
+            while (*name) {
+                char *p = name;
+
+                while (*p && *p!=',')
+                    p++;
+
+                if (*p)
+                    *p++ = 0;
+
+                if (mud_peer(mud, name, host, port, 0)) {
+                    perror("mud_peer");
+                    return 1;
+                }
+
+                name = p;
+            }
+        }
     }
 
-    if (host && mud_peer(mud, host, port))
-        return 1;
-
     int mud_fd = mud_get_fd(mud);
 
+    fd_set_nonblock(mud_fd);
+
     state_send(gt.state_fd, "INITIALIZED", tun_name);
 
     fd_set rfds;
     FD_ZERO(&rfds);
 
-    int started = 0;
+    unsigned char buf[8*1024];
-    unsigned char buf[2048];
 
     while (!gt.quit) {
         FD_SET(tun_fd, &rfds);
+        FD_SET(mud_fd, &rfds);
 
-        if (mud_can_pull(mud)) {
+        if (icmp_fd!=-1)
-            FD_SET(mud_fd, &rfds);
+            FD_SET(icmp_fd, &rfds);
-        } else {
-            FD_CLR(mud_fd, &rfds);
-        }
 
-        struct timeval timeout = {
+        if _0_(select(mud_fd+1, &rfds, NULL, NULL, NULL)==-1) {
-            .tv_usec = 100000,
-        };
-
-        if (mud_can_push(mud))
-            timeout.tv_usec = 1000;
-
-        if _0_(select(mud_fd+1, &rfds, NULL, NULL, &timeout)==-1) {
             if (errno==EINTR)
                 continue;
             perror("select");
             return 1;
         }
 
-        if (mud_is_up(mud)) {
+        if (icmp_fd!=-1 && FD_ISSET(icmp_fd, &rfds)) {
-            if (!started) {
+            struct sockaddr_storage ss;
-                state_send(gt.state_fd, "STARTED", tun_name);
+            socklen_t sl = sizeof(ss);
-                started = 1;
+            ssize_t r = recvfrom(icmp_fd, buf, sizeof(buf), 0, (struct sockaddr *)&ss, &sl);
-            }
+            if (r>=8) {
-        } else {
+                struct ip_common ic;
-            if (started) {
+                if (!ip_get_common(&ic, buf, r) && ic.proto==1) {
-                state_send(gt.state_fd, "STOPPED", tun_name);
+                    unsigned char *data = &buf[ic.hdr_size];
-                started = 0;
+                    if (data[0]==3) {
+                        int new_mtu = (data[6]<<8)|data[7];
+                        if (new_mtu) {
+                            gt_log("received MTU from ICMP: %i\n", new_mtu);
+                            mud_set_mtu(mud, new_mtu-50); // XXX
+                        }
+                    }
+                }
             }
         }
 
         if (FD_ISSET(tun_fd, &rfds)) {
-            while (1) {
+            size_t size = 0;
-                const ssize_t r = tun_read(tun_fd, buf, sizeof(buf));
 
-                if (r<=0) {
+            while (sizeof(buf)-size>mtu) {
-                    gt.quit |= !r;
+                const ssize_t r = tun_read(tun_fd, &buf[size], sizeof(buf)-size);
+
+                if (r<=0)
                     break;
-                }
 
                 struct ip_common ic;
 
-                if (!ip_get_common(&ic, buf, sizeof(buf)) && ic.size==r)
+                if (ip_get_common(&ic, &buf[size], r) || ic.size!=r)
-                    mud_send(mud, buf, r);
+                    break;
+
+                size += r;
+            }
+
+            int p = 0;
+
+            while (p<size) {
+                int tc = 0;
+                int q = p;
+
+                while (q<size) {
+                    struct ip_common ic;
+
+                    if (ip_get_common(&ic, &buf[q], size-q) || ic.size>size-q) {
+                        size = q;
+                        break;
+                    }
+
+                    if (q+ic.size>p+mtu)
+                        break;
+
+                    q += ic.size;
+
+                    if (tc<(ic.tc&0xFC))
+                        tc = ic.tc&0xFC;
+                }
+
+                int r = mud_send(mud, &buf[p], q-p, tc);
+
+                if (r==-1 && errno==EMSGSIZE) {
+                    int new_mtu = mud_get_mtu(mud);
+
+                    if (new_mtu!=mtu) {
+                        mtu = new_mtu;
+
+                        gt_log("MTU changed: %li\n", mtu);
+
+                        if (tun_set_mtu(tun_name, mtu)==-1)
+                            perror("tun_set_mtu");
+                    }
+                } else {
+                    if (r==-1 && errno!=EAGAIN)
+                        perror("mud_send");
+
+                    p = q;
+                }
             }
         }
 
-        mud_push(mud);
+        if (FD_ISSET(mud_fd, &rfds)) {
+            while (1) {
+                const int size = mud_recv(mud, buf, sizeof(buf));
 
-        if (FD_ISSET(mud_fd, &rfds))
+                if (size<=0) {
-            mud_pull(mud);
+                    if (size==-1 && errno!=EAGAIN)
+                        perror("mud_recv");
+                    break;
+                }
 
-        while (1) {
+                int p = 0;
-            const int size = mud_recv(mud, buf, sizeof(buf));
 
-            if (size<=0)
+                while (p<size) {
-                break;
+                    struct ip_common ic;
 
-            const ssize_t r = tun_write(tun_fd, buf, size);
+                    if (ip_get_common(&ic, &buf[p], size-p) || ic.size>size-p)
+                        break;
 
-            if (r<=0) {
+                    tun_write(tun_fd, &buf[p], ic.size);
-                gt.quit |= !r;
+
-                break;
+                    p += ic.size;
+                }
             }
         }
     }

src/tun.c

@@ -11,8 +11,9 @@
 #include <sys/socket.h>
 #include <sys/uio.h>
 
+#include <net/if.h>
+
 #ifdef __linux__
-#include <linux/if.h>
 #include <linux/if_tun.h>
 #endif
 
@@ -28,7 +29,7 @@
 
 #ifdef __APPLE__
 
-static int tun_create_by_id (char *name, size_t size, unsigned id, _unused_ int mq)
+static int tun_create_by_id (char *name, size_t size, unsigned id)
 {
     int fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
 
@@ -63,21 +64,21 @@ static int tun_create_by_id (char *name, size_t size, unsigned id, _unused_ int
     return fd;
 }
 
-static int tun_create_by_name (char *name, size_t size, char *dev_name, int mq)
+static int tun_create_by_name (char *name, size_t size, char *dev_name)
 {
     unsigned id = 0;
 
     if (sscanf(dev_name, "utun%u", &id)!=1)
         return -1;
 
-    return tun_create_by_id(name, size, id, mq);
+    return tun_create_by_id(name, size, id);
 }
 
 #else /* not __APPLE__ */
 
 #ifdef __linux__
 
-static int tun_create_by_name (char *name, size_t size, char *dev_name, int mq)
+static int tun_create_by_name (char *name, size_t size, char *dev_name)
 {
     int fd = open("/dev/net/tun", O_RDWR);
 
@@ -88,12 +89,6 @@ static int tun_create_by_name (char *name, size_t size, char *dev_name, int mq)
         .ifr_flags = IFF_TUN|IFF_NO_PI,
     };
 
-    if (mq) {
-#ifdef IFF_MULTI_QUEUE
-        ifr.ifr_flags |= IFF_MULTI_QUEUE;
-#endif
-    }
-
     str_cpy(ifr.ifr_name, dev_name, IFNAMSIZ-1);
 
     if (ioctl(fd, TUNSETIFF, &ifr)) {
@@ -108,7 +103,7 @@ static int tun_create_by_name (char *name, size_t size, char *dev_name, int mq)
 
 #else /* not __linux__ not __APPLE__ */
 
-static int tun_create_by_name (char *name, size_t size, char *dev_name, _unused_ int mq)
+static int tun_create_by_name (char *name, size_t size, char *dev_name)
 {
     char path[64];
 
@@ -120,32 +115,27 @@ static int tun_create_by_name (char *name, size_t size, char *dev_name, _unused_
 
 #endif /* not __APPLE__ */
 
-static int tun_create_by_id (char *name, size_t size, unsigned id, int mq)
+static int tun_create_by_id (char *name, size_t size, unsigned id)
 {
     char dev_name[64];
 
     snprintf(dev_name, sizeof(dev_name), "tun%u", id);
 
-    return tun_create_by_name(name, size, dev_name, mq);
+    return tun_create_by_name(name, size, dev_name);
 }
 
 #endif
 
-int tun_create (char *dev_name, char **ret_name, int mq)
+int tun_create (char *dev_name, char **ret_name)
 {
     char name[64] = {0};
     int fd = -1;
 
-#ifndef IFF_MULTI_QUEUE
-    if (mq)
-        gt_na("IFF_MULTI_QUEUE");
-#endif
-
     if (str_empty(dev_name)) {
         for (unsigned id=0; id<32 && fd==-1; id++)
-            fd = tun_create_by_id(name, sizeof(name), id, mq);
+            fd = tun_create_by_id(name, sizeof(name), id);
     } else {
-        fd = tun_create_by_name(name, sizeof(name), dev_name, mq);
+        fd = tun_create_by_name(name, sizeof(name), dev_name);
     }
 
     if (fd!=-1 && ret_name)
@@ -240,3 +230,25 @@ ssize_t tun_write (int fd, const void *data, size_t size)
     return ret;
 #endif
 }
+
+int tun_set_mtu (char *dev_name, int mtu)
+{
+    struct ifreq ifr = {
+        .ifr_mtu = mtu,
+    };
+
+    str_cpy(ifr.ifr_name, dev_name, IFNAMSIZ-1);
+
+    int fd = socket(AF_INET, SOCK_DGRAM, 0);
+
+    if (fd==-1)
+        return -1;
+
+    int ret = ioctl(fd, SIOCSIFMTU, &ifr);
+
+    int err = errno;
+    close(fd);
+    errno = err;
+
+    return ret;
+}

src/tun.h

@@ -2,6 +2,7 @@
 
 #include <unistd.h>
 
-int     tun_create (char *, char **, int);
+int     tun_create  (char *, char **);
-ssize_t tun_read   (int, void *, size_t);
+ssize_t tun_read    (int, void *, size_t);
-ssize_t tun_write  (int, const void *, size_t);
+ssize_t tun_write   (int, const void *, size_t);
+int     tun_set_mtu (char *, int);