Update mud and merge from master

src/main.c

@@ -20,8 +20,6 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 
-#include <sodium.h>
-
 #include "mud.h"
 
 #ifndef O_CLOEXEC
@@ -29,10 +27,10 @@
 #endif
 
 static struct {
-    int timeout;
     volatile sig_atomic_t quit;
     volatile sig_atomic_t info;
-    uint8_t key[crypto_generichash_KEYBYTES];
+    int timeout;
+    int state_fd;
 } gt;
 
 static void fd_set_nonblock (int fd)
@@ -185,16 +183,16 @@ static size_t fd_write_all (int fd, const void *data, size_t size)
     return done;
 }
 
-static int gt_setup_secretkey (char *keyfile)
+static int gt_setup_secretkey (struct mud *mud, char *keyfile)
 {
-    const size_t size = sizeof(gt.key);
+    unsigned char key[32];
 
     if (str_empty(keyfile)) {
-        char buf[2*size+1];
+        char buf[2*sizeof(key)+1];
 
-        randombytes_buf(gt.key, size);
+        mud_get_key(mud, key, sizeof(key));
-        gt_tohex(buf, sizeof(buf), gt.key, size);
+        gt_tohex(buf, sizeof(buf), key, sizeof(key));
-        state("SECRETKEY", buf);
+        state_send(gt.state_fd, "SECRETKEY", buf);
 
         return 0;
     }
@@ -210,21 +208,23 @@ static int gt_setup_secretkey (char *keyfile)
         return -1;
     }
 
-    char key[2*size];
+    char buf[2*sizeof(key)];
-    size_t r = fd_read_all(fd, key, sizeof(key));
+    size_t r = fd_read_all(fd, buf, sizeof(buf));
 
     close(fd);
 
-    if (r!=sizeof(key)) {
+    if (r!=sizeof(buf)) {
         gt_log("unable to read secret key\n");
         return -1;
     }
 
-    if (gt_fromhex(gt.key, size, key, sizeof(key))) {
+    if (gt_fromhex(key, sizeof(key), buf, sizeof(buf))) {
         gt_log("secret key is not valid\n");
         return -1;
     }
 
+    mud_set_key(mud, key, sizeof(key));
+
     return 0;
 }
 
@@ -242,11 +242,11 @@ int main (int argc, char **argv)
 
     gt.timeout = 5000;
 
-    long down_timeout = 0;
-    long send_timeout = 0;
-    long pong_timeout = 0;
     long time_tolerance = 0;
 
+    int v4 = 1;
+    int v6 = 1;
+
     struct option opts[] = {
         { "host",           &host,           option_str    },
         { "port",           &port,           option_str    },
@@ -257,10 +257,9 @@ int main (int argc, char **argv)
         { "multiqueue",     NULL,            option_option },
         { "statefile",      &statefile,      option_str    },
         { "timeout",        &gt.timeout,     option_long   },
-        { "down-timeout",   &down_timeout,   option_long   },
-        { "send-timeout",   &send_timeout,   option_long   },
-        { "pong-timeout",   &pong_timeout,   option_long   },
         { "time-tolerance", &time_tolerance, option_long   },
+        { "v4only",         NULL,            option_option },
+        { "v6only",         NULL,            option_option },
         { "version",        NULL,            option_option },
         { NULL },
     };
@@ -273,7 +272,18 @@ int main (int argc, char **argv)
         return 0;
     }
 
-    if (!option_is_set(opts, "keyfile")) {
+    if (option_is_set(opts, "v4only"))
+        v6 = 0;
+
+    if (option_is_set(opts, "v6only"))
+        v4 = 0;
+
+    if (!v4 && !v6) {
+        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;
     }
@@ -283,12 +293,9 @@ int main (int argc, char **argv)
         return 1;
     }
 
-    if (sodium_init()==-1) {
+    gt.state_fd = state_create(statefile);
-        gt_log("libsodium initialization has failed\n");
-        return 1;
-    }
 
-    if (state_init(statefile))
+    if (statefile && gt.state_fd==-1)
         return 1;
 
     char *tun_name = NULL;
@@ -302,26 +309,17 @@ int main (int argc, char **argv)
 
     fd_set_nonblock(tun_fd);
 
-    if (gt_setup_secretkey(keyfile))
+    struct mud *mud = mud_create(bind_port, v4, v6);
-        return 1;
-
-    struct mud *mud = mud_create(bind_port);
 
     if (!mud) {
         gt_log("couldn't create mud\n");
         return 1;
     }
 
-    mud_set_key(mud, gt.key, sizeof(gt.key));
+    if (gt_setup_secretkey(mud, keyfile))
+        return 1;
 
-    if (down_timeout > 0)
+    mud_set_send_timeout_msec(mud, gt.timeout);
-        mud_set_down_timeout_msec(mud, down_timeout);
-
-    if (send_timeout > 0)
-        mud_set_send_timeout_msec(mud, send_timeout);
-
-    if (pong_timeout > 0)
-        mud_set_pong_timeout_msec(mud, pong_timeout);
 
     if (time_tolerance > 0)
         mud_set_time_tolerance_sec(mud, time_tolerance);
@@ -353,7 +351,7 @@ int main (int argc, char **argv)
 
     int mud_fd = mud_get_fd(mud);
 
-    state("INITIALIZED", tun_name);
+    state_send(gt.state_fd, "INITIALIZED", tun_name);
 
     fd_set rfds;
     FD_ZERO(&rfds);
@@ -371,9 +369,12 @@ int main (int argc, char **argv)
         }
 
         struct timeval timeout = {
-            .tv_usec = 1000,
+            .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;
@@ -383,12 +384,12 @@ int main (int argc, char **argv)
 
         if (mud_is_up(mud)) {
             if (!started) {
-                state("STARTED", tun_name);
+                state_send(gt.state_fd, "STARTED", tun_name);
                 started = 1;
             }
         } else {
             if (started) {
-                state("STOPPED", tun_name);
+                state_send(gt.state_fd, "STOPPED", tun_name);
                 started = 0;
             }
         }
@@ -397,8 +398,10 @@ int main (int argc, char **argv)
             while (1) {
                 const ssize_t r = tun_read(tun_fd, buf, sizeof(buf));
 
-                if (r<=0)
+                if (r<=0) {
+                    gt.quit |= !r;
                     break;
+                }
 
                 struct ip_common ic;
 
@@ -413,12 +416,17 @@ int main (int argc, char **argv)
             mud_pull(mud);
 
         while (1) {
-            const int r = mud_recv(mud, buf, sizeof(buf));
+            const int size = mud_recv(mud, buf, sizeof(buf));
 
-            if (r<=0)
+            if (size<=0)
                 break;
 
-            tun_write(tun_fd, buf, r);
+            const ssize_t r = tun_write(tun_fd, buf, size);
+
+            if (r<=0) {
+                gt.quit |= !r;
+                break;
+            }
         }
     }
 

src/state.c

@@ -7,16 +7,14 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
-static int state_fd = -1;
+int state_create (const char *filename)
-
-int state_init (const char *filename)
 {
     if (str_empty(filename))
-        return 0;
+        return -1;
 
-    state_fd = open(filename, O_WRONLY);
+    int fd = open(filename, O_WRONLY);
 
-    if (state_fd==-1) {
+    if (fd==-1) {
         if (errno!=EINTR)
             perror("open");
         return -1;
@@ -24,38 +22,41 @@ int state_init (const char *filename)
 
     struct stat st = {0};
 
-    if (fstat(state_fd, &st)==-1) {
+    if (fstat(fd, &st)==-1) {
         perror("fstat");
-        close(state_fd);
+        close(fd);
-        state_fd = -1;
         return -1;
     }
 
     if (!S_ISFIFO(st.st_mode)) {
         gt_log("`%s' is not a fifo\n", filename);
-        close(state_fd);
+        close(fd);
-        state_fd = -1;
         return -1;
     }
 
-    return 0;
+    return fd;
 }
 
-void state (const char *state, const char *info)
+void 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 (state_fd==-1) {
-        gt_print("%s", str);
-    } else {
-        if (write(state_fd, str, str_len(str))==-1 && errno!=EINTR)
-            perror("write");
     }
+
+    if (write(fd, str, str_len(str))==-1 && errno!=EINTR)
+        perror("write");
+
+    free(str);
 }

src/state.h

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