Key exchange may fail for several reasons

README.md

@@ -1,8 +1,9 @@
-# glorytun
+# Glorytun
+Small, Simple and Stupid **TCP** VPN.
 
-**Work In Progress:** Do not touch!
+**Work In Progress:** Do not touch! This code will probably format your harddisk!
 
-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:

configure.ac

@@ -1,11 +1,12 @@
 AC_PREREQ([2.65])
-AC_INIT([glorytun], [0.0.4], [https://github.com/angt/glorytun/issues],
+AC_INIT([glorytun], [0.0.11], [https://github.com/angt/glorytun/issues],
         [glorytun], [https://github.com/angt/glorytun])
 AC_CONFIG_SRCDIR([src/common.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AM_INIT_AUTOMAKE([1.9 -Wall -Werror foreign tar-ustar subdir-objects])
 AM_DEP_TRACK
 AM_SILENT_RULES([yes])
+AM_PROG_CC_C_O
 AC_PROG_CC_C99
 AC_USE_SYSTEM_EXTENSIONS
 AC_SEARCH_LIBS([getaddrinfo], [resolv nsl])

src/common.h

@@ -14,9 +14,13 @@
 #define PALIGN(x)      ((void *)ALIGN((size_t)(x)))
 #define PALIGN_DOWN(x) ((void *)ALIGN_DOWN((size_t)(x)))
 
+#define _1_(x)         (__builtin_expect((x), 1))
+#define _0_(x)         (__builtin_expect((x), 0))
+
 #define _printf_(A,B)  __attribute__((format(printf,A,B)))
 #define _noreturn_     __attribute__((noreturn))
 #define _unused_       __attribute__((unused))
+#define _align_(...)   __attribute__((aligned(__VA_ARGS__)))
 
 typedef struct buffer buffer_t;
 

src/ip-static.h

@@ -28,3 +28,12 @@ static inline ssize_t ip_get_size (const uint8_t *data, size_t size)
     return 0;
 }
 
+static inline int ip_get_dscp (const uint8_t *data, size_t size)
+{
+    switch (ip_get_version(data, size)) {
+    case 4:
+        return data[1]>>2;
+    }
+
+    return 0;
+}

src/main.c

@@ -23,7 +23,10 @@
 #endif
 
 #define GT_BUFFER_SIZE  (4*1024*1024)
-#define GT_TIMEOUT     (1000)
+#define GT_TIMEOUT      (5000)
+#define GT_MTU_MAX      (1500)
+#define GT_TUNR_SIZE    (0x7FFF-16)
+#define GT_TUNW_SIZE    (0x7FFF)
 
 struct fdbuf {
     int fd;
@@ -31,6 +34,11 @@ struct fdbuf {
     buffer_t write;
 };
 
+struct blk {
+    size_t size;
+    uint8_t data[GT_MTU_MAX] _align_(16);
+};
+
 struct crypto_ctx {
     struct {
         crypto_aead_aes256gcm_state state;
@@ -40,6 +48,7 @@ struct crypto_ctx {
 };
 
 volatile sig_atomic_t gt_close = 0;
+volatile sig_atomic_t gt_info = 0;
 
 static int64_t dt_ms (struct timeval *ta, struct timeval *tb)
 {
@@ -75,6 +84,7 @@ enum sk_opt {
     sk_keepintvl,
     sk_congestion,
     sk_defer_accept,
+    sk_quickack,
 };
 
 static void sk_set (int fd, enum sk_opt opt, const void *val, socklen_t len)
@@ -114,6 +124,11 @@ static void sk_set (int fd, enum sk_opt opt, const void *val, socklen_t len)
         [sk_defer_accept] = { "TCP_DEFER_ACCEPT",
 #ifdef TCP_DEFER_ACCEPT
             1, IPPROTO_TCP, TCP_DEFER_ACCEPT,
+#endif
+        },
+        [sk_quickack] = { "TCP_QUICKACK",
+#ifdef TCP_QUICKACK
+            1, IPPROTO_TCP, TCP_QUICKACK,
 #endif
         },
     };
@@ -301,34 +316,44 @@ static struct addrinfo *ai_create (const char *host, const char *port, int liste
     return NULL;
 }
 
-static void gt_sa_stop (int sig)
+static void gt_sa_handler (int sig)
 {
     switch (sig) {
     case SIGINT:
+    case SIGQUIT:
     case SIGTERM:
         gt_close = 1;
+        break;
+    case SIGUSR1:
+        gt_info = 1;
+        break;
     }
 }
 
 static void gt_set_signal (void)
 {
-    struct sigaction sa;
+    struct sigaction sa = {
+        .sa_flags = 0,
+    };
 
-    byte_set(&sa, 0, sizeof(sa));
+    sigemptyset(&sa.sa_mask);
 
-    sa.sa_handler = gt_sa_stop;
+    sa.sa_handler = gt_sa_handler;
     sigaction(SIGINT,  &sa, NULL);
+    sigaction(SIGQUIT, &sa, NULL);
     sigaction(SIGTERM, &sa, NULL);
+    sigaction(SIGUSR1, &sa, NULL);
 
     sa.sa_handler = SIG_IGN;
     sigaction(SIGHUP,  &sa, NULL);
     sigaction(SIGPIPE, &sa, NULL);
+    sigaction(SIGUSR2, &sa, NULL);
 }
 
 static ssize_t fd_read (int fd, void *data, size_t size)
 {
     if (!size)
-        return -2;
+        return -1;
 
     ssize_t ret = read(fd, data, size);
 
@@ -348,7 +373,7 @@ static ssize_t fd_read (int fd, void *data, size_t size)
 static ssize_t fd_write (int fd, const void *data, size_t size)
 {
     if (!size)
-        return -2;
+        return -1;
 
     ssize_t ret = write(fd, data, size);
 
@@ -421,13 +446,13 @@ static ssize_t fd_write_all (int fd, const void *data, size_t size)
 
 static int gt_encrypt (struct crypto_ctx *ctx, buffer_t *dst, buffer_t *src)
 {
-    size_t rs = buffer_read_size(src);
+    const size_t rs = buffer_read_size(src);
-    size_t ws = buffer_write_size(dst);
+    const size_t ws = buffer_write_size(dst);
 
     if (!rs || !ws)
         return 0;
 
-    size_t size = rs+crypto_aead_aes256gcm_ABYTES;
+    const size_t size = rs+crypto_aead_aes256gcm_ABYTES;
 
     if (size+2>ws)
         return 0;
@@ -452,16 +477,16 @@ static int gt_encrypt (struct crypto_ctx *ctx, buffer_t *dst, buffer_t *src)
 
 static int gt_decrypt (struct crypto_ctx *ctx, buffer_t *dst, buffer_t *src)
 {
-    size_t rs = buffer_read_size(src);
+    const size_t rs = buffer_read_size(src);
-    size_t ws = buffer_write_size(dst);
+    const size_t ws = buffer_write_size(dst);
 
     if (!rs || !ws)
         return 0;
 
-    if (rs<=2+16)
+    if (rs<=2+crypto_aead_aes256gcm_ABYTES)
         return 0;
 
-    size_t size = (src->read[0]<<8)|src->read[1];
+    const size_t size = (src->read[0]<<8)|src->read[1];
 
     if (size-crypto_aead_aes256gcm_ABYTES>ws)
         return 0;
@@ -506,7 +531,7 @@ static void dump_ip_header (uint8_t *data, size_t size)
 
 static int gt_setup_secretkey (struct crypto_ctx *ctx, char *keyfile)
 {
-    size_t size = sizeof(ctx->skey);
+    const size_t size = sizeof(ctx->skey);
 
     byte_set(ctx->skey, 1, size);
 
@@ -625,17 +650,17 @@ int main (int argc, char **argv)
     char *dev = PACKAGE_NAME;
     char *keyfile = NULL;
     char *congestion = NULL;
+
     long buffer_size = GT_BUFFER_SIZE;
+
     long ka_count = -1;
     long ka_idle = -1;
     long ka_interval = -1;
 
-#ifdef TCP_INFO
+    long retry_count = 0;
-    struct {
+    long retry_slope = 1000;
-        struct timeval time;
+    long retry_const = 0;
-        struct tcp_info info;
+    long retry_limit = 1000000;
-    } tcpinfo = {0};
-#endif
 
     struct option ka_opts[] = {
         { "count",    &ka_count,    option_long },
@@ -644,6 +669,19 @@ int main (int argc, char **argv)
         { NULL },
     };
 
+    struct option daemon_opts[] = {
+        { "fake", NULL, option_option },
+        { NULL },
+    };
+
+    struct option retry_opts[] = {
+        { "count", &retry_count, option_long },
+        { "slope", &retry_slope, option_long },
+        { "const", &retry_const, option_long },
+        { "limit", &retry_limit, option_long },
+        { NULL },
+    };
+
     struct option opts[] = {
         { "listener",    NULL,         option_option },
         { "host",        &host,        option_str    },
@@ -655,7 +693,10 @@ int main (int argc, char **argv)
         { "multiqueue",  NULL,         option_option },
         { "keepalive",   ka_opts,      option_option },
         { "buffer-size", &buffer_size, option_long   },
-        { "debug",       NULL,         option_option },
+        { "noquickack",  NULL,         option_option },
+        { "retry",       &retry_opts,  option_option },
+        { "daemon",      &daemon_opts, option_option },
+        { "trap",        NULL,         option_option },
         { "version",     NULL,         option_option },
         { NULL },
     };
@@ -668,10 +709,10 @@ int main (int argc, char **argv)
         return 0;
     }
 
-    int listener = option_is_set(opts, "listener");
+    const int listener = option_is_set(opts, "listener");
-    int delay = option_is_set(opts, "delay");
+    const int delay = option_is_set(opts, "delay");
-    int debug = option_is_set(opts, "debug");
+    const int keepalive = option_is_set(opts, "keepalive");
-    int keepalive = option_is_set(opts, "keepalive");
+    const int noquickack = option_is_set(opts, "noquickack");
 
     if (buffer_size < 2048) {
         buffer_size = 2048;
@@ -706,10 +747,18 @@ int main (int argc, char **argv)
     if (tun.fd==-1)
         return 1;
 
+    struct blk *blks = calloc(256, sizeof(struct blk));
+    size_t blk_count = 0;
+    uint8_t blk_read = 0;
+    uint8_t blk_write = 0;
+
+    if (!blks)
+        return 1;
+
     fd_set_nonblock(tun.fd);
 
-    buffer_setup(&tun.write, NULL, 32*1024);
+    buffer_setup(&tun.write, NULL, GT_TUNW_SIZE);
-    buffer_setup(&tun.read, NULL, 32*1024);
+    buffer_setup(&tun.read,  NULL, GT_TUNR_SIZE);
 
     buffer_setup(&sock.write, NULL, buffer_size);
     buffer_setup(&sock.read,  NULL, buffer_size);
@@ -723,18 +772,59 @@ int main (int argc, char **argv)
             return 1;
     }
 
+    if (option_is_set(opts, "daemon")) {
+        switch (fork()) {
+        case -1:
+            perror("fork");
+            return 1;
+        case 0:
+            if (option_is_set(daemon_opts, "fake")) {
+                gt_log("running in fake daemon mode\n");
+            } else if (setsid()==-1) {
+                perror("setsid");
+            }
+            break;
+        default:
+            _exit(0);
+        }
+    }
+
+    long retry = 0;
+
     while (!gt_close) {
         sock.fd = listener?sk_accept(fd):sk_create(ai, sk_connect);
 
         if (sock.fd==-1) {
-            usleep(100000);
+            if (retry<LONG_MAX)
-            goto restart;
+                retry++;
+
+            long usec = retry*retry_slope+retry_const;
+
+            if (retry_count>=0 && retry>=retry_count) {
+                gt_log("couldn't %s (%d attempt%s)\n",
+                        listener?"listen":"connect",
+                        retry, (retry>1)?"s":"");
+                break;
+            }
+
+            if (usec>retry_limit)
+                usec = retry_limit;
+
+            if (usec<=0)
+                usec = 0;
+
+            if (usleep(usec)==-1 && errno==EINVAL)
+                sleep(usec/1000000);
+
+            continue;
         }
 
         char *sockname = sk_get_name(sock.fd);
 
-        if (!sockname)
+        if (!sockname) {
-            goto restart;
+            close(sock.fd);
+            continue;
+        }
 
         gt_log("%s: connected\n", sockname);
 
@@ -757,14 +847,25 @@ int main (int argc, char **argv)
         sk_set(sock.fd, sk_congestion, congestion, str_len(congestion));
 
         switch (gt_setup_crypto(&ctx, sock.fd, listener)) {
-            case -2: gt_log("%s: key exchange could not be verified!\n", sockname);
+        case -2:
-            case -1: goto restart;
+            gt_log("%s: key exchange could not be verified!\n", sockname);
-            default: break;
+            goto restart;
+        case -1:
+            gt_log("%s: key exchange failed\n", sockname);
+            goto restart;
+        default:
+            break;
         }
 
-        fd_set rfds, wfds;
+        retry = 0;
+
+        if (option_is_set(opts, "trap"))
+            kill(0, SIGUSR2);
+
+        gt_log("%s: running\n", sockname);
+
+        fd_set rfds;
         FD_ZERO(&rfds);
-        FD_ZERO(&wfds);
 
         int stop_loop = 0;
 
@@ -772,131 +873,156 @@ int main (int argc, char **argv)
         buffer_format(&sock.read);
 
         while (1) {
-            if (gt_close)
+            if _0_(gt_close)
-                stop_loop = 1;
+                stop_loop |= 1;
 
-            if (stop_loop) {
+            if _0_(stop_loop) {
                 if (((stop_loop&(1<<2)) || !buffer_read_size(&sock.write)) &&
                     ((stop_loop&(1<<1)) || !buffer_read_size(&sock.read)))
                     goto restart;
                 FD_CLR(tun.fd, &rfds);
             } else {
+                if (!blks[blk_write].size) {
                     FD_SET(tun.fd, &rfds);
+                } else {
+                    FD_CLR(tun.fd, &rfds);
+                }
             }
 
+            buffer_shift(&sock.read);
+
+            if (buffer_write_size(&sock.read)) {
                 FD_SET(sock.fd, &rfds);
+            } else {
+                FD_CLR(sock.fd, &rfds);
+            }
 
-            if (buffer_read_size(&tun.read))
+            struct timeval timeout = {
-                FD_SET(sock.fd, &wfds);
+                .tv_usec = 1000,
+            };
 
-            if (buffer_read_size(&sock.read))
+            if _0_(select(sock.fd+1, &rfds, NULL, NULL, &timeout)==-1) {
-                FD_SET(tun.fd, &wfds);
-
-            if (select(sock.fd+1, &rfds, &wfds, NULL, NULL)==-1) {
                 if (errno==EINTR)
                     continue;
                 perror("select");
                 return 1;
             }
 
-#ifdef TCP_INFO
+         // TODO
-            struct timeval now;
+         // struct timeval now;
-            gettimeofday(&now, NULL);
+         // gettimeofday(&now, NULL);
 
-            if (debug && dt_ms(&now, &tcpinfo.time)>1000LL) {
+#ifdef TCP_INFO
-                tcpinfo.time = now;
+            if _0_(gt_info) {
-                if (sk_get_info(sock.fd, &tcpinfo.info))
+                struct tcp_info ti;
-                    print_tcp_info(sockname, &tcpinfo.info);
+
+                if (sk_get_info(sock.fd, &ti))
+                    print_tcp_info(sockname, &ti);
+
+                gt_info = 0;
             }
 #endif
 
+            if (FD_ISSET(tun.fd, &rfds)) {
+                while (!blks[blk_write].size) {
+                    uint8_t *data = blks[blk_write].data;
+                    const ssize_t r = tun_read(tun.fd, data, GT_MTU_MAX);
+
+                    if (r<=0) {
+                        gt_close |= !r;
+                        break;
+                    }
+
+                    const ssize_t ip_size = ip_get_size(data, GT_MTU_MAX);
+
+                    if _0_(ip_size<=0)
+                        continue;
+
+                    if _0_(ip_size!=r) {
+                        dump_ip_header(data, r);
+
+                        if (r>ip_size)
+                            continue;
+
+                        ip_set_size(data, r);
+                    }
+
+                    blks[blk_write++].size = r;
+                    blk_count++;
+                }
+            }
+
+            while (1) {
                 buffer_shift(&tun.read);
 
-            if (FD_ISSET(tun.fd, &rfds)) {
+                if _0_(!stop_loop) {
-                while (1) {
+                    for (; blk_count; blk_read++) {
-                    size_t size = buffer_write_size(&tun.read);
+                        const size_t size = blks[blk_read].size;
 
-                    if (size<1500)
+                        if (!size || buffer_write_size(&tun.read)<size)
                             break;
 
-                    ssize_t r = tun_read(tun.fd, tun.read.write, size);
+                        byte_cpy(tun.read.write, blks[blk_read].data, size);
+                        tun.read.write += size;
 
-                    if (!r)
+                        blks[blk_read].size = 0;
-                        return 2;
+                        blk_count--;
-
-                    if (r<0)
-                        break;
-
-                    ssize_t ip_size = ip_get_size(tun.read.write, size);
-
-                    if (ip_size<=0)
-                        continue;
-
-                    if (ip_size!=r) {
-                        dump_ip_header(tun.read.write, r);
-
-                        if (r<ip_size) {
-                            ip_set_size(tun.read.write, r);
-                        } else {
-                            continue;
-                        }
-                    }
-
-                    tun.read.write += r;
-                }
                     }
 
                     gt_encrypt(&ctx, &sock.write, &tun.read);
+                }
 
-            if (FD_ISSET(sock.fd, &wfds))
+                if (!buffer_read_size(&sock.write))
-                FD_CLR(sock.fd, &wfds);
+                    break;
 
-            if (buffer_read_size(&sock.write)) {
+                const ssize_t r = fd_write(sock.fd, sock.write.read,
-                ssize_t r = fd_write(sock.fd, sock.write.read,
                                            buffer_read_size(&sock.write));
 
-                if (r==-1)
+                if (r>0) {
-                    FD_SET(sock.fd, &wfds);
-
-                if (!r)
-                    stop_loop |= (1<<2);
-
-                if (r>0)
                     sock.write.read += r;
                 } else {
-                if (stop_loop) {
+                    if (!r)
-                    gt_log("%s: shutdown\n", sockname);
+                        stop_loop |= (1<<2);
+                    break;
+                }
+            }
+
+            if _0_(stop_loop && !buffer_read_size(&sock.write)) {
+                if (!(stop_loop&(1<<2))) {
+                    stop_loop |= (1<<2);
                     shutdown(sock.fd, SHUT_WR);
+                    gt_log("%s: shutdown\n", sockname);
                 }
             }
 
             buffer_shift(&sock.write);
-            buffer_shift(&sock.read);
 
             if (FD_ISSET(sock.fd, &rfds)) {
-                ssize_t r = fd_read(sock.fd, sock.read.write,
+                if (noquickack)
+                    sk_set_int(sock.fd, sk_quickack, 0);
+
+                const ssize_t r = fd_read(sock.fd, sock.read.write,
                                           buffer_write_size(&sock.read));
 
-                if (!r)
+                if (r>0) {
-                    stop_loop |= (1<<1);
-
-                if (r>0)
                     sock.read.write += r;
+                } else if (!r) {
+                    stop_loop |= (1<<1);
+                }
             }
 
-            if (gt_decrypt(&ctx, &tun.write, &sock.read)) {
+            while (1) {
+                buffer_shift(&tun.write);
+
+                if _0_(gt_decrypt(&ctx, &tun.write, &sock.read)) {
                     gt_log("%s: message could not be verified!\n", sockname);
                     goto restart;
                 }
 
-            if (FD_ISSET(tun.fd, &wfds))
-                FD_CLR(tun.fd, &wfds);
-
-            while (1) {
                 size_t size = buffer_read_size(&tun.write);
                 ssize_t ip_size = ip_get_size(tun.write.read, size);
 
-                if (!ip_size) {
+                if _0_(!ip_size) {
                     gt_log("%s: bad packet!\n", sockname);
                     goto restart;
                 }
@@ -906,17 +1032,13 @@ int main (int argc, char **argv)
 
                 ssize_t r = tun_write(tun.fd, tun.write.read, ip_size);
 
-                if (!r)
+                if (r>0) {
-                    return 2;
-
-                if (r==-1)
-                    FD_SET(tun.fd, &wfds);
-
-                if (r>0)
                     tun.write.read += r;
+                } else {
+                    gt_close |= !r;
+                    break;
+                }
             }
-
-            buffer_shift(&tun.write);
         }
 
     restart:
@@ -933,8 +1055,13 @@ int main (int argc, char **argv)
 
     freeaddrinfo(ai);
 
+    free(blks);
+
     free(sock.write.data);
     free(sock.read.data);
 
+    free(tun.write.data);
+    free(tun.read.data);
+
     return 0;
 }

src/option.c

@@ -94,18 +94,18 @@ static int option_usage (struct option *opts, int slen)
     if (!opts)
         return 0;
 
-    int len = slen;
+    int len = 0;
 
     for (int k=0; opts[k].name; k++) {
-        if (len>60) {
+        if (len>40) {
-            gt_print("\n%*s", (int)slen, "");
+            gt_print("\n%*s", slen, "");
-            len = slen;
+            len = 0;
         }
 
         len += gt_print(" [%s", opts[k].name);
 
         if (opts[k].call==option_option) {
-            len += option_usage((struct option *)opts[k].data, len);
+            len += option_usage((struct option *)opts[k].data, slen+len);
         } else {
             len += gt_print(" ARG");
         }
@@ -130,12 +130,13 @@ int option (struct option *opts, int argc, char **argv)
 
     int slen = gt_print("usage: %s", argv[0]);
 
-    if (slen>40)
+    if (slen>40) {
         slen = 12;
+        gt_print("\n%*s", slen, "");
+    }
 
     option_usage(opts, slen);
-
+    gt_print("\n");
-    printf("\n");
 
     return 1;
 }

src/tun.c

@@ -124,7 +124,7 @@ int tun_create (_unused_ char *name, _unused_ int mq)
 ssize_t tun_read (int fd, void *data, size_t size)
 {
     if (!size)
-        return -2;
+        return -1;
 
 #ifdef GT_BSD_TUN
     uint32_t family;
@@ -162,7 +162,7 @@ ssize_t tun_read (int fd, void *data, size_t size)
 ssize_t tun_write (int fd, const void *data, size_t size)
 {
     if (!size)
-        return -2;
+        return -1;
 
 #ifdef GT_BSD_TUN
     uint32_t family;