Update mud

.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

@@ -252,7 +252,11 @@ int main (int argc, char **argv)
     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    },
@@ -268,6 +272,7 @@ int main (int argc, char **argv)
         { "time-tolerance", &time_tolerance, option_long   },
         { "v4only",         NULL,            option_option },
         { "v6only",         NULL,            option_option },
+        { "chacha20",       NULL,            option_option },
         { "version",        NULL,            option_option },
         { NULL },
     };
@@ -280,13 +285,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;
     }
@@ -317,7 +327,9 @@ int main (int argc, char **argv)
 
     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);
 
     if (!mud) {
         gt_log("couldn't create mud\n");
@@ -372,6 +384,8 @@ int main (int argc, char **argv)
 
     size_t send_size = 0;
     size_t send_limit = 0;
+    int send_tc = 0;
+    int send_next_tc = 0;
 
     while (!gt.quit) {
         FD_SET(tun_fd, &rfds);
@@ -386,7 +400,7 @@ int main (int argc, char **argv)
             .tv_usec = 100000,
         };
 
-        if (mud_can_push(mud))
+        if (mud_can_push(mud) || send_size)
             timeout.tv_usec = 1000;
 
         if _0_(select(mud_fd+1, &rfds, NULL, NULL, &timeout)==-1) {
@@ -426,28 +440,49 @@ int main (int argc, char **argv)
 
                 send_size += r;
 
-                if (send_size<=mtu)
+                int update_tc = (ic.tc&0xFC)>(send_tc&0xFC);
+
+                if (send_size<=mtu) {
                     send_limit = send_size;
+                    if ((ic.tc&0xFC)>(send_tc&0xFC))
+                        send_tc = ic.tc;
+                } else {
+                    if ((ic.tc&0xFC)>(send_next_tc&0xFC))
+                        send_next_tc = ic.tc;
+                }
             }
         }
 
-        if (send_limit && mud_send(mud, send.buf, send_limit)==send_limit) {
-            if (send_size>send_limit)
-                memmove(&send.buf[0], &send.buf[send_limit], send_size-send_limit);
-            send_size -= send_limit;
-            send_limit = send_size;
+        if (send_limit) {
+            int r = mud_send(mud, send.buf, send_limit, send_tc);
+            if (r==-1 && errno!=EAGAIN) {
+                perror("mud_send");
+            } else if (r==send_limit) {
+                if (send_size>send_limit)
+                    memmove(&send.buf[0], &send.buf[send_limit], send_size-send_limit);
+                send_size -= send_limit;
+                send_limit = send_size;
+                send_tc = send_next_tc;
+                send_next_tc = 0;
+            }
         }
 
-        mud_push(mud);
+        if (mud_push(mud)==-1 && errno!=EAGAIN)
+            perror("mud_push");
 
-        if (FD_ISSET(mud_fd, &rfds))
-            mud_pull(mud);
+        if (FD_ISSET(mud_fd, &rfds)) {
+            if (mud_pull(mud)==-1 && errno!=EAGAIN)
+                perror("mud_pull");
+        }
 
         while (!gt.quit) {
             const int size = mud_recv(mud, recv.buf, mtu);
 
-            if (size<=0)
+            if (size<=0) {
+                if (size==-1 && errno!=EAGAIN)
+                    perror("mud_recv");
                 break;
+            }
 
             int p = 0;