Try value 42 for mptcp (fallback to 26)

Chacha20 will be automatically used if aesni is not available.

.gitmodules

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

Makefile.am

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

configure.ac

@@ -14,6 +14,7 @@ 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 @@
-dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29)
+# serial 12 (pkg-config-0.29.2)
-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])
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
 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 $1])
+AC_MSG_CHECKING([for $2])
 
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])

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;