Update mud

Required on BSD. Doesn't break anything elsewhere.

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "mud"]
+	path = mud
+	url = https://github.com/angt/mud.git

Makefile.am

@@ -20,6 +20,11 @@ glorytun_SOURCES = \
     src/state.c \
     src/state.h
 
+glorytun_CFLAGS  += -I$(srcdir)/mud
+glorytun_SOURCES += \
+    mud/mud.h \
+    mud/mud.c
+
 EXTRA_DIST = \
     LICENSE \
     README.md \

README.md

@@ -1,6 +1,6 @@
 # π₁(Glorytun)=ℤ²
 
-Small, Simple and Stupid TCP VPN.
+Small, Simple and Stupid VPN over [mud](https://github.com/angt/mud).
 
 #### Work In Progress
 
@@ -8,11 +8,12 @@ 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:
 
-    $ git clone https://github.com/angt/glorytun
+    $ git clone https://github.com/angt/glorytun --recursive --branch mud
     $ cd glorytun
     $ ./autogen.sh
     $ ./configure

configure.ac

@@ -14,7 +14,6 @@ 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])

m4/pkg.m4

@@ -1,6 +1,6 @@
-# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-# serial 12 (pkg-config-0.29.2)
-
+dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+dnl serial 11 (pkg-config-0.29)
+dnl
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
 dnl
@@ -41,7 +41,7 @@ dnl
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29.2])
+[m4_define([PKG_MACROS_VERSION], [0.29])
 m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
     [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ
@@ -142,7 +142,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 
 pkg_failed=no
-AC_MSG_CHECKING([for $2])
+AC_MSG_CHECKING([for $1])
 
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -152,7 +152,7 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
-        AC_MSG_RESULT([no])
+   	AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
@@ -173,7 +173,7 @@ installed software in a non-standard prefix.
 _PKG_TEXT])[]dnl
         ])
 elif test $pkg_failed = untried; then
-        AC_MSG_RESULT([no])
+     	AC_MSG_RESULT([no])
 	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full

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/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);
-ssize_t tun_read   (int, void *, size_t);
-ssize_t tun_write  (int, const void *, size_t);
+int     tun_create  (char *, char **);
+ssize_t tun_read    (int, void *, size_t);
+ssize_t tun_write   (int, const void *, size_t);
+int     tun_set_mtu (char *, int);