Update mud

.build.sh

@@ -1,15 +0,0 @@
-#!/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

README.md

@@ -1,10 +1,15 @@
-# π₁(Glorytun)=0
+# π₁(Glorytun)=ℤ²
 
 Small, Simple and Stupid VPN over [mud](https://github.com/angt/mud).
 
+#### Work In Progress
+
+This code will probably format your harddisk!
+
 #### Build and Install
 
-Glorytun depends on [libsodium](https://github.com/jedisct1/libsodium) version >= 1.0.4.
+Glorytun depends on [libsodium](https://github.com/jedisct1/libsodium) version >= 1.0.4
+and needs an AES-NI capable CPU.
 
 To build and install the latest version:
 

configure.ac

@@ -14,9 +14,8 @@ 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/common.c

@@ -1,10 +1,9 @@
 #include "common.h"
 
-#include <stdarg.h>
 #include <stdio.h>
+#include <stdarg.h>
 
-int
+int gt_print (const char *fmt, ...)
-gt_print(const char *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);
@@ -17,8 +16,7 @@ gt_print(const char *fmt, ...)
     return ret;
 }
 
-void
+void gt_log (const char *fmt, ...)
-gt_log(const char *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);
@@ -26,8 +24,7 @@ gt_log(const char *fmt, ...)
     va_end(ap);
 }
 
-void
+void gt_fatal (const char *fmt, ...)
-gt_fatal(const char *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);
@@ -37,19 +34,17 @@ gt_fatal(const char *fmt, ...)
     exit(EXIT_FAILURE);
 }
 
-void
+void gt_na (const char *name)
-gt_na(const char *name)
 {
     gt_log("%s is not available on your platform\n", name);
 }
 
-int
+int gt_tohex (char *dst, size_t dst_size, const uint8_t *src, size_t src_size)
-gt_tohex(char *dst, size_t dst_size, const uint8_t *src, size_t src_size)
 {
-    if (_0_(!dst_size))
+    if _0_(!dst_size)
         return -1;
 
-    if (_0_(((dst_size - 1) / 2) < src_size))
+    if _0_(((dst_size-1)/2)<src_size)
         return -1;
 
     static const char tbl[] = "0123456789ABCDEF";
@@ -64,8 +59,8 @@ gt_tohex(char *dst, size_t dst_size, const uint8_t *src, size_t src_size)
     return 0;
 }
 
-_const_ static inline int
+_const_
-fromhex(const char c)
+static inline int fromhex (const char c)
 {
     if (c>='0' && c<='9')
         return c-'0';
@@ -79,20 +74,19 @@ fromhex(const char c)
     return -1;
 }
 
-int
+int gt_fromhex (uint8_t *dst, size_t dst_size, const char *src, size_t src_size)
-gt_fromhex(uint8_t *dst, size_t dst_size, const char *src, size_t src_size)
 {
-    if (_0_(src_size & 1))
+    if _0_(src_size&1)
         return -1;
 
-    if (_0_(dst_size < (src_size / 2)))
+    if _0_(dst_size<(src_size/2))
         return -1;
 
     for (size_t i=0; i<src_size; i+=2) {
         const int a = fromhex(src[i]);
         const int b = fromhex(src[i+1]);
 
-        if (_0_(a == -1 || b == -1))
+        if _0_(a==-1 || b==-1)
             return -1;
 
         *dst++ = (a<<4)|b;

src/db.c

@@ -12,14 +12,14 @@ struct node {
     uint32_t point;
 };
 
-_pure_ static inline size_t
+_pure_
-db_size(const uint8_t *a)
+static inline size_t db_size (const uint8_t *a)
 {
     return (a[0]?:str_len((char *)a+1))+1;
 }
 
-_pure_ static inline size_t
+_pure_
-db_cmp(const uint8_t *a, const uint8_t *b)
+static inline size_t db_cmp (const uint8_t *a, const uint8_t *b)
 {
     const size_t size = a[0];
 
@@ -39,8 +39,8 @@ db_cmp(const uint8_t *a, const uint8_t *b)
     return 0;
 }
 
-_pure_ static inline int
+_pure_
-db_dir(const uint32_t point, uint8_t *data, const size_t size)
+static inline int db_dir (const uint32_t point, uint8_t *data, const size_t size)
 {
     const size_t pos = point>>8;
 
@@ -50,10 +50,9 @@ db_dir(const uint32_t point, uint8_t *data, const size_t size)
     return ((point|data[pos])&255)==255;
 }
 
-uint8_t *
+uint8_t *db_search (uint8_t **p, uint8_t *data)
-db_search(uint8_t **p, uint8_t *data)
 {
-    if (_0_(!*p))
+    if _0_(!*p)
         return NULL;
 
     uint8_t *r = *p;
@@ -70,13 +69,12 @@ db_search(uint8_t **p, uint8_t *data)
     return NULL;
 }
 
-uint8_t *
+uint8_t *db_insert (uint8_t **p, uint8_t *data)
-db_insert(uint8_t **p, uint8_t *data)
 {
-    if (_0_(CBIT(data)))
+    if _0_(CBIT(data))
         return NULL;
 
-    if (_0_(!*p)) {
+    if _0_(!*p) {
         *p = data;
         return data;
     }
@@ -91,7 +89,7 @@ db_insert(uint8_t **p, uint8_t *data)
 
     const size_t diff = db_cmp(r, data);
 
-    if (_0_(!diff))
+    if _0_(!diff)
         return r;
 
     const size_t pos = diff-1;
@@ -109,7 +107,7 @@ db_insert(uint8_t **p, uint8_t *data)
 
     struct node *node = malloc(sizeof(struct node));
 
-    if (_0_(!node))
+    if _0_(!node)
         return NULL;
 
     const int dir = (mask|r[pos])==255;
@@ -123,10 +121,9 @@ db_insert(uint8_t **p, uint8_t *data)
     return data;
 }
 
-uint8_t *
+uint8_t *db_remove (uint8_t **p, uint8_t *data)
-db_remove(uint8_t **p, uint8_t *data)
 {
-    if (_0_(!*p))
+    if _0_(!*p)
         return NULL;
 
     const size_t size = db_size(data);
@@ -142,7 +139,7 @@ db_remove(uint8_t **p, uint8_t *data)
         p = node->child+dir;
     }
 
-    if (_0_(db_cmp(data, *p)))
+    if _0_(db_cmp(data, *p))
         return NULL;
 
     uint8_t *r = *p;

src/ip.h

@@ -4,7 +4,6 @@
 
 struct ip_common {
     uint8_t version;
-    uint8_t tc;
     uint8_t proto;
     uint8_t hdr_size;
     uint16_t size;
@@ -25,13 +24,11 @@ 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

@@ -1,25 +1,27 @@
 #include "common.h"
 
 #include "buffer.h"
-#include "db.h"
 #include "ip.h"
-#include "option.h"
-#include "state.h"
 #include "str.h"
+#include "option.h"
 #include "tun.h"
+#include "db.h"
+#include "state.h"
 
-#include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
-#include <poll.h>
-#include <signal.h>
 #include <stdio.h>
+#include <signal.h>
+#include <poll.h>
+#include <fcntl.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 
 #include <arpa/inet.h>
 #include <netdb.h>
 
+#include <sodium.h>
+
 #include "mud.h"
 
 #ifndef O_CLOEXEC
@@ -27,14 +29,13 @@
 #endif
 
 static struct {
+    int timeout;
     volatile sig_atomic_t quit;
     volatile sig_atomic_t info;
-    int timeout;
+    uint8_t key[crypto_generichash_KEYBYTES];
-    int state_fd;
 } gt;
 
-static void
+static void fd_set_nonblock (int fd)
-fd_set_nonblock(int fd)
 {
     int ret;
 
@@ -52,8 +53,7 @@ fd_set_nonblock(int fd)
         perror("fcntl O_NONBLOCK");
 }
 
-static void
+static void gt_sa_handler (int sig)
-gt_sa_handler(int sig)
 {
     switch (sig) {
     case SIGINT:
@@ -67,8 +67,7 @@ gt_sa_handler(int sig)
     }
 }
 
-static void
+static void gt_set_signal (void)
-gt_set_signal(void)
 {
     struct sigaction sa = {
         .sa_flags = 0,
@@ -87,8 +86,7 @@ gt_set_signal(void)
     sigaction(SIGPIPE, &sa, NULL);
 }
 
-static ssize_t
+static ssize_t fd_read (int fd, void *data, size_t size)
-fd_read(int fd, void *data, size_t size)
 {
     if ((fd==-1) || !size)
         return -1;
@@ -108,8 +106,7 @@ fd_read(int fd, void *data, size_t size)
     return ret;
 }
 
-static ssize_t
+static ssize_t fd_write (int fd, const void *data, size_t size)
-fd_write(int fd, const void *data, size_t size)
 {
     if ((fd==-1) || !size)
         return -1;
@@ -132,8 +129,7 @@ fd_write(int fd, const void *data, size_t size)
     return ret;
 }
 
-static size_t
+static size_t fd_read_all (int fd, void *data, size_t size)
-fd_read_all(int fd, void *data, size_t size)
 {
     size_t done = 0;
 
@@ -161,8 +157,7 @@ fd_read_all(int fd, void *data, size_t size)
     return done;
 }
 
-static size_t
+static size_t fd_write_all (int fd, const void *data, size_t size)
-fd_write_all(int fd, const void *data, size_t size)
 {
     size_t done = 0;
 
@@ -190,20 +185,16 @@ fd_write_all(int fd, const void *data, size_t size)
     return done;
 }
 
-static int
+static int gt_setup_secretkey (char *keyfile)
-gt_setup_secretkey(struct mud *mud, char *keyfile)
 {
-    unsigned char key[32];
+    const size_t size = sizeof(gt.key);
 
     if (str_empty(keyfile)) {
-        char buf[2 * sizeof(key) + 1];
+        char buf[2*size+1];
-        size_t size = sizeof(key);
 
-        if (mud_get_key(mud, key, &size))
+        randombytes_buf(gt.key, size);
-            return -1;
+        gt_tohex(buf, sizeof(buf), gt.key, size);
-
+        state("SECRETKEY", buf);
-        gt_tohex(buf, sizeof(buf), key, size);
-        state_send(gt.state_fd, "SECRETKEY", buf);
 
         return 0;
     }
@@ -219,75 +210,50 @@ gt_setup_secretkey(struct mud *mud, char *keyfile)
         return -1;
     }
 
-    char buf[2 * sizeof(key)];
+    char key[2*size];
-    size_t r = fd_read_all(fd, buf, sizeof(buf));
+    size_t r = fd_read_all(fd, key, sizeof(key));
 
     close(fd);
 
-    if (r != sizeof(buf)) {
+    if (r!=sizeof(key)) {
         gt_log("unable to read secret key\n");
         return -1;
     }
 
-    if (gt_fromhex(key, sizeof(key), buf, sizeof(buf))) {
+    if (gt_fromhex(gt.key, size, key, sizeof(key))) {
         gt_log("secret key is not valid\n");
         return -1;
     }
 
-    mud_set_key(mud, key, sizeof(key));
-
     return 0;
 }
 
-int
+int main (int argc, char **argv)
-main(int argc, char **argv)
 {
     gt_set_signal();
 
     char *host = NULL;
-    long port = 5000;
+    char *port = "5000";
-
     char *bind_list = NULL;
-    char *bind_backup = NULL;
+    char *bind_port = "5000";
-    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 = 0;
-
-#ifdef __linux__
-    v6 = 1;
-#endif
-
     struct option opts[] = {
-        // clang-format off
         { "host",        &host,         option_str    },
-        { "port",           &port,           option_long   },
+        { "port",        &port,         option_str    },
         { "bind",        &bind_list,    option_str    },
-        { "bind-backup",    &bind_backup,    option_str    },
+        { "bind-port",   &bind_port,    option_str    },
-        { "bind-port",      &bind_port,      option_long   },
         { "dev",         &dev,          option_str    },
-        { "mtu",            &mtu,            option_long   },
-        { "mtu-auto",       NULL,            option_option },
         { "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 },
-        // clang-format on
     };
 
     if (option(opts, argc, argv))
@@ -298,23 +264,7 @@ main(int argc, char **argv)
         return 0;
     }
 
-    if (option_is_set(opts, "v4only")) {
+    if (!option_is_set(opts, "keyfile")) {
-        v4 = 1;
-        v6 = 0;
-    }
-
-    if (option_is_set(opts, "v6only")) {
-        v4 = 0;
-        v6 = 1;
-    }
-
-    if (option_is_set(opts, "v4only") &&
-        option_is_set(opts, "v6only")) {
-        gt_log("v4only and v6only are both set\n");
-        return 1;
-    }
-
-    if (host && !option_is_set(opts, "keyfile")) {
         gt_log("keyfile option must be set\n");
         return 1;
     }
@@ -324,218 +274,133 @@ main(int argc, char **argv)
         return 1;
     }
 
-    int icmp_fd = -1;
+    if (sodium_init()==-1) {
-
+        gt_log("libsodium initialization has failed\n");
-    if (v4 && option_is_set(opts, "mtu-auto")) {
+        return 1;
-        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 (!crypto_aead_aes256gcm_is_available()) {
+        gt_na("AES-256-GCM");
+        return 1;
+    }
 
-    if (statefile && gt.state_fd == -1)
+    if (state_init(statefile))
         return 1;
 
     char *tun_name = NULL;
 
-    int tun_fd = tun_create(dev, &tun_name);
+    int tun_fd = tun_create(dev, &tun_name, option_is_set(opts, "multiqueue"));
 
     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);
 
-    int chacha = option_is_set(opts, "chacha20");
+    if (gt_setup_secretkey(keyfile))
+        return 1;
 
-    struct mud *mud = mud_create(bind_port, v4, v6, !chacha, mtu);
+    struct mud *mud = mud_create(bind_port);
 
     if (!mud) {
         gt_log("couldn't create mud\n");
         return 1;
     }
 
-    if (gt_setup_secretkey(mud, keyfile))
+    mud_set_key(mud, gt.key, sizeof(gt.key));
-        return 1;
-
-    mud_set_send_timeout_msec(mud, gt.timeout);
-
-    if (time_tolerance > 0)
-        mud_set_time_tolerance_sec(mud, time_tolerance);
-
-    if (host && port) {
-        if (bind_backup) {
-            if (mud_peer(mud, bind_backup, host, port, 1)) {
-                perror("mud_peer (backup)");
-                return 1;
-            }
-        }
 
     if (bind_list) {
         char tmp[1024];
         char *name = &tmp[0];
 
-            str_cpy(tmp, bind_list, sizeof(tmp) - 1);
+        size_t size = str_cpy(tmp, bind_list, sizeof(tmp)-1);
 
-            while (*name) {
+        for (size_t i=0; i<size; i++) {
-                char *p = name;
+            if (tmp[i]!=',')
+                continue;
 
-                while (*p && *p != ',')
+            tmp[i] = 0;
-                    p++;
 
-                if (*p)
+            if (mud_bind(mud, name))
-                    *p++ = 0;
+                return 1;
 
-                if (mud_peer(mud, name, host, port, 0)) {
+            name = &tmp[i+1];
-                    perror("mud_peer");
+        }
+
+        if (name[0] && mud_bind(mud, name))
             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("INITIALIZED", tun_name);
-
-    state_send(gt.state_fd, "INITIALIZED", tun_name);
 
     fd_set rfds;
     FD_ZERO(&rfds);
 
-    unsigned char buf[8 * 1024];
+    int started = 0;
+    unsigned char buf[2048];
 
     while (!gt.quit) {
         FD_SET(tun_fd, &rfds);
+
+        if (mud_can_pull(mud)) {
             FD_SET(mud_fd, &rfds);
+        } else {
+            FD_CLR(mud_fd, &rfds);
+        }
 
-        if (icmp_fd != -1)
+        struct timeval timeout = {
-            FD_SET(icmp_fd, &rfds);
+            .tv_usec = 1000,
+        };
 
-        if (select(mud_fd + 1, &rfds, NULL, NULL, NULL) == -1) {
+        if _0_(select(mud_fd+1, &rfds, NULL, NULL, &timeout)==-1) {
             if (errno==EINTR)
                 continue;
             perror("select");
             return 1;
         }
 
-        if (icmp_fd != -1 && FD_ISSET(icmp_fd, &rfds)) {
+        if (mud_is_up(mud)) {
-            struct sockaddr_storage ss;
+            if (!started) {
-            socklen_t sl = sizeof(ss);
+                state("STARTED", NULL);
-            ssize_t r = recvfrom(icmp_fd, buf, sizeof(buf), 0,
+                started = 1;
-                                 (struct sockaddr *)&ss, &sl);
-            if (r >= 8) {
-                struct ip_common ic;
-                if (!ip_get_common(&ic, buf, r) && ic.proto == 1) {
-                    unsigned char *data = &buf[ic.hdr_size];
-                    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
-                        }
-                    }
-                }
             }
+        } else if (started) {
+            state("STOPPED", NULL);
+            started = 0;
         }
 
         if (FD_ISSET(tun_fd, &rfds)) {
-            size_t size = 0;
+            while (1) {
+                const ssize_t r = tun_read(tun_fd, buf, sizeof(buf));
 
-            while (sizeof(buf) - size > mtu) {
-                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[size], r) || ic.size != r)
+                if (!ip_get_common(&ic, buf, sizeof(buf)) && ic.size==r)
-                    break;
+                    mud_send(mud, buf, r);
-
-                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;
-                }
             }
         }
 
-        if (FD_ISSET(mud_fd, &rfds)) {
+        mud_push(mud);
+
+        if (FD_ISSET(mud_fd, &rfds))
+            mud_pull(mud);
+
         while (1) {
-                const int size = mud_recv(mud, buf, sizeof(buf));
+            const int r = mud_recv(mud, buf, sizeof(buf));
 
-                if (size <= 0) {
+            if (r<=0)
-                    if (size == -1 && errno != EAGAIN)
-                        perror("mud_recv");
-                    break;
-                }
-
-                int 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);
+            tun_write(tun_fd, buf, r);
-
-                    p += ic.size;
-                }
-            }
         }
     }
 

src/option.c

@@ -3,8 +3,7 @@
 #include "option.h"
 #include "str.h"
 
-int
+int option_str (void *data, int argc, char **argv)
-option_str(void *data, int argc, char **argv)
 {
     if (argc<2 || str_empty(argv[1])) {
         gt_print("option `%s' need a string argument\n", argv[0]);
@@ -16,8 +15,7 @@ option_str(void *data, int argc, char **argv)
     return 1;
 }
 
-int
+int option_long (void *data, int argc, char **argv)
-option_long(void *data, int argc, char **argv)
 {
     if (argc<2 || str_empty(argv[1])) {
         gt_print("option `%s' need an integer argument\n", argv[0]);
@@ -38,8 +36,7 @@ option_long(void *data, int argc, char **argv)
     return 1;
 }
 
-int
+int option_is_set (struct option *opts, const char *name)
-option_is_set(struct option *opts, const char *name)
 {
     for (int k=0; opts[k].name; k++) {
         if (!str_cmp(opts[k].name, name))
@@ -49,8 +46,7 @@ option_is_set(struct option *opts, const char *name)
     return 0;
 }
 
-int
+int option_option (void *data, int argc, char **argv)
-option_option(void *data, int argc, char **argv)
 {
     if (!data)
         return 0;
@@ -91,8 +87,7 @@ option_option(void *data, int argc, char **argv)
     return argc;
 }
 
-static int
+static int option_usage (struct option *opts, int slen)
-option_usage(struct option *opts, int slen)
 {
     if (!opts)
         return 0;
@@ -119,8 +114,7 @@ option_usage(struct option *opts, int slen)
     return len;
 }
 
-int
+int option (struct option *opts, int argc, char **argv)
-option(struct option *opts, int argc, char **argv)
 {
     int ret = option_option(opts, argc, argv);
 

src/state.c

@@ -3,19 +3,20 @@
 #include "state.h"
 #include "str.h"
 
-#include <fcntl.h>
 #include <stdio.h>
+#include <fcntl.h>
 #include <sys/stat.h>
 
-int
+static int state_fd = -1;
-state_create(const char *filename)
+
+int state_init (const char *filename)
 {
     if (str_empty(filename))
-        return -1;
+        return 0;
 
-    int fd = open(filename, O_WRONLY);
+    state_fd = open(filename, O_WRONLY);
 
-    if (fd == -1) {
+    if (state_fd==-1) {
         if (errno!=EINTR)
             perror("open");
         return -1;
@@ -23,42 +24,38 @@ state_create(const char *filename)
 
     struct stat st = {0};
 
-    if (fstat(fd, &st) == -1) {
+    if (fstat(state_fd, &st)==-1) {
         perror("fstat");
-        close(fd);
+        close(state_fd);
+        state_fd = -1;
         return -1;
     }
 
     if (!S_ISFIFO(st.st_mode)) {
         gt_log("`%s' is not a fifo\n", filename);
-        close(fd);
+        close(state_fd);
+        state_fd = -1;
         return -1;
     }
 
-    return fd;
+    return 0;
 }
 
-void
+void state (const char *state, const char *info)
-state_send(int fd, const char *state, const char *info)
 {
     if (str_empty(state))
         return;
 
-    if (fd == -1) {
-        gt_print("%s %s\n", state, info);
-        return;
-    }
-
     const char *strs[] = { state, " ", info, "\n" };
     char *str = str_cat(strs, COUNT(strs));
 
-    if (!str) {
+    if (!str)
-        perror("str_cat");
         return;
-    }
 
-    if (write(fd, str, str_len(str)) == -1 && errno != EINTR)
+    if (state_fd==-1) {
+        gt_print("%s", str);
+    } else {
+        if (write(state_fd, str, str_len(str))==-1 && errno!=EINTR)
             perror("write");
-
+    }
-    free(str);
 }

src/state.h

@@ -1,4 +1,4 @@
 #pragma once
 
-int  state_create (const char *);
+int  state_init (const char *);
-void state_send   (int, const char *, const char *);
+void state      (const char *, const char *);

src/tun.c

@@ -1,26 +1,25 @@
 #include "common.h"
 
-#include "ip.h"
-#include "str.h"
 #include "tun.h"
+#include "str.h"
+#include "ip.h"
 
-#include <fcntl.h>
 #include <stdio.h>
+#include <fcntl.h>
 
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 
-#include <net/if.h>
-
 #ifdef __linux__
+#include <linux/if.h>
 #include <linux/if_tun.h>
 #endif
 
 #ifdef __APPLE__
-#include <net/if_utun.h>
-#include <sys/kern_control.h>
 #include <sys/sys_domain.h>
+#include <sys/kern_control.h>
+#include <net/if_utun.h>
 #endif
 
 #if defined(__APPLE__) || defined(__OpenBSD__)
@@ -29,8 +28,7 @@
 
 #ifdef __APPLE__
 
-static int
+static int tun_create_by_id (char *name, size_t size, unsigned id, _unused_ int mq)
-tun_create_by_id(char *name, size_t size, unsigned id)
 {
     int fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
 
@@ -65,23 +63,21 @@ tun_create_by_id(char *name, size_t size, unsigned id)
     return fd;
 }
 
-static int
+static int tun_create_by_name (char *name, size_t size, char *dev_name, int mq)
-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);
+    return tun_create_by_id(name, size, id, mq);
 }
 
 #else /* not __APPLE__ */
 
 #ifdef __linux__
 
-static int
+static int tun_create_by_name (char *name, size_t size, char *dev_name, int mq)
-tun_create_by_name(char *name, size_t size, char *dev_name)
 {
     int fd = open("/dev/net/tun", O_RDWR);
 
@@ -92,6 +88,12 @@ tun_create_by_name(char *name, size_t size, char *dev_name)
         .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)) {
@@ -106,8 +108,7 @@ tun_create_by_name(char *name, size_t size, char *dev_name)
 
 #else /* not __linux__ not __APPLE__ */
 
-static int
+static int tun_create_by_name (char *name, size_t size, char *dev_name, _unused_ int mq)
-tun_create_by_name(char *name, size_t size, char *dev_name)
 {
     char path[64];
 
@@ -119,29 +120,32 @@ tun_create_by_name(char *name, size_t size, char *dev_name)
 
 #endif /* not __APPLE__ */
 
-static int
+static int tun_create_by_id (char *name, size_t size, unsigned id, int mq)
-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);
+    return tun_create_by_name(name, size, dev_name, mq);
 }
 
 #endif
 
-int
+int tun_create (char *dev_name, char **ret_name, int mq)
-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);
+            fd = tun_create_by_id(name, sizeof(name), id, mq);
     } else {
-        fd = tun_create_by_name(name, sizeof(name), dev_name);
+        fd = tun_create_by_name(name, sizeof(name), dev_name, mq);
     }
 
     if (fd!=-1 && ret_name)
@@ -150,8 +154,7 @@ tun_create(char *dev_name, char **ret_name)
     return fd;
 }
 
-ssize_t
+ssize_t tun_read (int fd, void *data, size_t size)
-tun_read(int fd, void *data, size_t size)
 {
     if (!size)
         return -1;
@@ -160,14 +163,8 @@ tun_read(int fd, void *data, size_t size)
     uint32_t family;
 
     struct iovec iov[2] = {
-        {
+        { .iov_base = &family, .iov_len = sizeof(family) },
-            .iov_base = &family,
+        { .iov_base = data, .iov_len = size }
-            .iov_len = sizeof(family),
-        },
-        {
-            .iov_base = data,
-            .iov_len = size,
-        },
     };
 
     ssize_t ret = readv(fd, iov, 2);
@@ -195,8 +192,7 @@ tun_read(int fd, void *data, size_t size)
 #endif
 }
 
-ssize_t
+ssize_t tun_write (int fd, const void *data, size_t size)
-tun_write(int fd, const void *data, size_t size)
 {
     if (!size)
         return -1;
@@ -216,14 +212,8 @@ tun_write(int fd, const void *data, size_t size)
     }
 
     struct iovec iov[2] = {
-        {
+        { .iov_base = &family, .iov_len = sizeof(family) },
-            .iov_base = &family,
+        { .iov_base = (void *) data, .iov_len = size },
-            .iov_len = sizeof(family),
-        },
-        {
-            .iov_base = (void *)data,
-            .iov_len = size,
-        },
     };
 
     ssize_t ret = writev(fd, iov, 2);
@@ -250,26 +240,3 @@ 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,7 +2,6 @@
 
 #include <unistd.h>
 
-int     tun_create  (char *, char **);
+int     tun_create (char *, char **, int);
 ssize_t tun_read   (int, void *, size_t);
 ssize_t tun_write  (int, const void *, size_t);
-int     tun_set_mtu (char *, int);