Try value 42 for mptcp (fallback to 26)

.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

@@ -16,6 +16,8 @@ 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

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])
@@ -152,11 +152,11 @@ 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`
-        else 
+        else
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -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/main.c

@@ -14,6 +14,7 @@
 #include <signal.h>
 #include <poll.h>
 #include <fcntl.h>
+#include <time.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 
@@ -36,6 +37,10 @@
 
 #include <sodium.h>
 
+#ifdef __APPLE__
+#include <mach/mach_time.h>
+#endif
+
 #ifndef O_CLOEXEC
 #define O_CLOEXEC 0
 #endif
@@ -48,8 +53,6 @@
 #define GT_ABYTES    (16)
 #define GT_KEYBYTES  (32)
 
-#define MPTCP_ENABLED (26)
-
 static struct {
     volatile sig_atomic_t quit;
     volatile sig_atomic_t info;
@@ -111,13 +114,16 @@ enum sk_opt {
     sk_acceptfilter,
     sk_quickack,
     sk_user_timeout,
-    sk_mptcp,
+    sk_mptcp_26,
+    sk_mptcp_42,
 };
 
-static void sk_set (int fd, enum sk_opt opt, const void *val, socklen_t len)
+static int sk_set (int fd, enum sk_opt opt, const void *val, socklen_t len)
 {
-    if (!val || len<=0)
+    if (!val || len<=0) {
-        return;
+        errno = EINVAL;
+        return -1;
+    }
 
     struct {
         const char *name;
@@ -168,33 +174,44 @@ static void sk_set (int fd, enum sk_opt opt, const void *val, socklen_t len)
             1, IPPROTO_TCP, TCP_USER_TIMEOUT,
 #endif
         },
-        [sk_mptcp] = { "MPTCP_ENABLED",
+        [sk_mptcp_26] = { "MPTCP_ENABLED (26)", 1, IPPROTO_TCP, 26 },
-#ifdef MPTCP_ENABLED
+        [sk_mptcp_42] = { "MPTCP_ENABLED (42)", 1, IPPROTO_TCP, 42 },
-            1, IPPROTO_TCP, MPTCP_ENABLED,
-#endif
-        },
     };
 
     if (!opts[opt].present) {
         gt_na(opts[opt].name);
-        return;
+        errno = EINVAL;
+        return -1;
     }
 
-    if (setsockopt(fd, opts[opt].level, opts[opt].option, val, len)==-1)
+    int ret = setsockopt(fd, opts[opt].level, opts[opt].option, val, len);
+
+    if (ret==-1) {
+        int err = errno;
         gt_log("couldn't set socket option `%s'\n", opts[opt].name);
+        errno = err;
+    }
+
+    return ret;
 }
 
-static void sk_set_int (int fd, enum sk_opt opt, int val)
+static int sk_set_int (int fd, enum sk_opt opt, int val)
 {
     return sk_set(fd, opt, &val, sizeof(val));
 }
 
+static void sk_set_mptcp (int fd)
+{
+    if (sk_set_int(fd, sk_mptcp_42, 1)==-1)
+        sk_set_int(fd, sk_mptcp_26, 1);
+}
+
 static int sk_listen (int fd, struct addrinfo *ai)
 {
     sk_set_int(fd, sk_reuseaddr, 1);
 
     if (gt.mptcp)
-        sk_set_int(fd, sk_mptcp, 1);
+        sk_set_mptcp(fd);
 
     if (bind(fd, ai->ai_addr, ai->ai_addrlen)==-1) {
         perror("bind");
@@ -221,7 +238,7 @@ static int sk_connect (int fd, struct addrinfo *ai)
     fd_set_nonblock(fd);
 
     if (gt.mptcp)
-        sk_set_int(fd, sk_mptcp, 1);
+        sk_set_mptcp(fd);
 
     int ret = connect(fd, ai->ai_addr, ai->ai_addrlen);
 
@@ -277,8 +294,11 @@ static int sk_accept (int fd)
 
     int ret = accept(fd, (struct sockaddr *)&addr, &addr_size);
 
-    if (ret==-1 && errno!=EINTR)
+    if (ret==-1) {
-        perror("accept");
+        if (errno!=EINTR)
+            perror("accept");
+        return -1;
+    }
 
     fd_set_nonblock(ret);
 
@@ -986,50 +1006,78 @@ static int gt_track (uint8_t **db, struct ip_common *ic, uint8_t *data, int rev)
     return 0;
 }
 
+static unsigned long long gt_now (void)
+{
+#if defined __APPLE__
+    static mach_timebase_info_data_t mtid;
+    if (!mtid.denom) mach_timebase_info(&mtid);
+    return (mach_absolute_time()*mtid.numer/mtid.denom)/1000ULL;
+#elif defined CLOCK_MONOTONIC
+    struct timespec tv;
+    clock_gettime(CLOCK_MONOTONIC, &tv);
+    return tv.tv_sec*1000000ULL+tv.tv_nsec/1000ULL;
+#else
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return tv.tv_sec*1000000ULL+tv.tv_usec;
+#endif
+}
+
 static void gt_bench (int chacha)
 {
     unsigned char npub[crypto_aead_aes256gcm_NPUBBYTES];
     memset(npub, 0, sizeof(npub));
 
     unsigned char key[crypto_aead_aes256gcm_KEYBYTES];
-    memset(key,  1, sizeof(key));
+    memset(key, 1, sizeof(key));
 
     crypto_aead_aes256gcm_state ctx;
 
     if (!chacha)
         crypto_aead_aes256gcm_beforenm(&ctx, key);
 
-    int count = 2000000;
-    size_t size = 8;
-
     gt_print("bench: %s\n", chacha?"chacha20poly1305":"aes256gcm");
 
     _align_(16) unsigned char buf[32*1024+crypto_aead_aes256gcm_ABYTES];
 
-    for (size_t size=8; size<=sizeof(buf); size*=2) {
+    size_t bs = 8;
-        struct timeval tv1;
-        gettimeofday(&tv1, NULL);
 
-        for (int i=0; !gt.quit && i<count; i++) {
+    while (!gt.quit && bs<=sizeof(buf)) {
-            if (chacha) {
+        size_t total_size = 0;
-                crypto_aead_chacha20poly1305_encrypt(buf, NULL,
+        unsigned long long total_dt = 0.0;
-                        buf, size, NULL, 0, NULL, npub, key);
+        double mbps = 0.0;
-            } else {
+
-                crypto_aead_aes256gcm_encrypt_afternm(buf, NULL,
+        while (!gt.quit) {
-                        buf, size, NULL, 0, NULL, npub,
+            unsigned long long now = gt_now();
-                        (const crypto_aead_aes256gcm_state *)&ctx);
+
+            size_t size = 0;
+
+            while (!gt.quit && size<16*1024*1024) {
+                if (chacha) {
+                    crypto_aead_chacha20poly1305_encrypt(buf, NULL,
+                            buf, bs, NULL, 0, NULL, npub, key);
+                } else {
+                    crypto_aead_aes256gcm_encrypt_afternm(buf, NULL,
+                            buf, bs, NULL, 0, NULL, npub,
+                            (const crypto_aead_aes256gcm_state *)&ctx);
+                }
+                size += bs;
             }
+
+            total_dt += gt_now()-now;
+            total_size += size;
+
+            double last_mbps = mbps;
+            mbps = total_size*8.0/total_dt;
+
+            double diff = mbps-last_mbps;
+
+            if (-0.1<diff && diff<0.1)
+                break;
         }
 
-        if (gt.quit)
+        gt_print("%6zu bytes %9.2f Mbps\n", bs, mbps);
-            break;
+        bs *= 2;
-
-        struct timeval tv2;
-        gettimeofday(&tv2, NULL);
-
-        double dt = (tv2.tv_usec+tv2.tv_sec*1e6)-(tv1.tv_usec+tv1.tv_sec*1e6);
-
-        gt_print("block size: %-6zu bps: %.2f\n", size, size*count*8.0/dt);
     }
 }
 
@@ -1112,7 +1160,7 @@ static int gt_setup_crypto (struct crypto_ctx *ctx, int fd, int listener)
         return -1;
 
     if (memcmp(&data_r[size-hash_size-sizeof(proto)], proto, 3)) {
-        gt_log("bad packet [%02X%02X%02X] !\n",
+        gt_log("bad packet [%02"PRIX8"%02"PRIX8"%02"PRIX8"] !\n",
             &data_r[size-hash_size-sizeof(proto)+0],
             &data_r[size-hash_size-sizeof(proto)+1],
             &data_r[size-hash_size-sizeof(proto)+2]);