Add trap option to use SIGUSR2

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.65])
-AC_INIT([glorytun], [0.0.7], [https://github.com/angt/glorytun/issues],
+AC_INIT([glorytun], [0.0.10], [https://github.com/angt/glorytun/issues],
         [glorytun], [https://github.com/angt/glorytun])
 AC_CONFIG_SRCDIR([src/common.h])
 AC_CONFIG_AUX_DIR([build-aux])

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/main.c

@@ -35,9 +35,8 @@ struct fdbuf {
 };
 
 struct blk {
-    uint8_t prio;
     size_t size;
-    uint8_t data[GT_MTU_MAX];
+    uint8_t data[GT_MTU_MAX] _align_(16);
 };
 
 struct crypto_ctx {
@@ -49,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)
 {
@@ -84,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)
@@ -123,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
         },
     };
@@ -310,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);
 
@@ -357,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);
 
@@ -430,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);
-    size_t ws = buffer_write_size(dst);
+    const size_t rs = buffer_read_size(src);
+    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;
@@ -461,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);
-    size_t ws = buffer_write_size(dst);
+    const size_t rs = buffer_read_size(src);
+    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;
@@ -515,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);
 
@@ -634,19 +650,16 @@ 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;
-    long prio_dscp = 46;
-    long prio_size = (GT_TUNR_SIZE*3)/4;
 
-#ifdef TCP_INFO
-    struct {
-        struct timeval time;
-        struct tcp_info info;
-    } tcpinfo = {0};
-#endif
+    long retry_count = 0;
+    long retry_slope = 1000;
+    long retry_limit = 1000000;
 
     struct option ka_opts[] = {
         { "count",    &ka_count,    option_long },
@@ -655,9 +668,15 @@ int main (int argc, char **argv)
         { NULL },
     };
 
-    struct option prio_opts[] = {
-        { "dscp",  &prio_dscp, option_long },
-        { "size",  &prio_size, option_long },
+    struct option daemon_opts[] = {
+        { "fake", NULL, option_option },
+        { NULL },
+    };
+
+    struct option retry_opts[] = {
+        { "count", &retry_count, option_long },
+        { "slope", &retry_slope, option_long },
+        { "limit", &retry_limit, option_long },
         { NULL },
     };
 
@@ -672,9 +691,10 @@ int main (int argc, char **argv)
         { "multiqueue",  NULL,         option_option },
         { "keepalive",   ka_opts,      option_option },
         { "buffer-size", &buffer_size, option_long   },
-        { "priority",    prio_opts,    option_option },
-        { "daemon",      NULL,         option_option },
-        { "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 },
     };
@@ -687,26 +707,16 @@ int main (int argc, char **argv)
         return 0;
     }
 
-    int listener = option_is_set(opts, "listener");
-    int delay = option_is_set(opts, "delay");
-    int debug = option_is_set(opts, "debug");
-    int keepalive = option_is_set(opts, "keepalive");
+    const int listener = option_is_set(opts, "listener");
+    const int delay = option_is_set(opts, "delay");
+    const int keepalive = option_is_set(opts, "keepalive");
+    const int noquickack = option_is_set(opts, "noquickack");
 
     if (buffer_size < 2048) {
         buffer_size = 2048;
         gt_log("buffer size must be greater than 2048!\n");
     }
 
-    if (prio_size < 0) {
-        prio_size = 0;
-        gt_log("priority size must be positive!\n");
-    }
-
-    if (prio_size > GT_TUNR_SIZE) {
-        prio_size = GT_TUNR_SIZE;
-        gt_log("priority size must be less than or equal to %zu\n", GT_TUNR_SIZE);
-    }
-
     if (sodium_init()==-1) {
         gt_log("libsodium initialization has failed!\n");
         return 1;
@@ -737,7 +747,6 @@ int main (int argc, char **argv)
 
     struct blk *blks = calloc(256, sizeof(struct blk));
     size_t blk_count = 0;
-    size_t blk_prio = 0;
     uint8_t blk_read = 0;
     uint8_t blk_write = 0;
 
@@ -767,22 +776,49 @@ int main (int argc, char **argv)
             perror("fork");
             return 1;
         case 0:
-            if (setsid()==-1)
+            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)
+                retry++;
+
+            long usec = retry*retry_slope;
+
+            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;
         }
 
+        retry = 0;
+
         char *sockname = sk_get_name(sock.fd);
 
         if (!sockname) {
@@ -790,6 +826,9 @@ int main (int argc, char **argv)
             continue;
         }
 
+        if (option_is_set(opts, "trap"))
+            kill(0, SIGUSR2);
+
         gt_log("%s: connected\n", sockname);
 
         fd_set_nonblock(sock.fd);
@@ -826,10 +865,10 @@ int main (int argc, char **argv)
         buffer_format(&sock.read);
 
         while (1) {
-            if (gt_close)
+            if _0_(gt_close)
                 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;
@@ -840,13 +879,7 @@ int main (int argc, char **argv)
 
             FD_SET(sock.fd, &rfds);
 
-            if (buffer_read_size(&tun.read) || blk_count)
-                FD_SET(sock.fd, &wfds);
-
-            if (buffer_read_size(&sock.read))
-                FD_SET(tun.fd, &wfds);
-
-            if (select(sock.fd+1, &rfds, &wfds, NULL, NULL)==-1) {
+            if _0_(select(sock.fd+1, &rfds, &wfds, NULL, NULL)==-1) {
                 if (errno==EINTR)
                     continue;
                 perror("select");
@@ -856,48 +889,43 @@ int main (int argc, char **argv)
             FD_CLR(sock.fd, &wfds);
             FD_CLR(tun.fd, &wfds);
 
-#ifdef TCP_INFO
-            struct timeval now;
-            gettimeofday(&now, NULL);
+         // TODO
+         // struct timeval now;
+         // gettimeofday(&now, NULL);
 
-            if (debug && dt_ms(&now, &tcpinfo.time)>1000LL) {
-                tcpinfo.time = now;
-                if (sk_get_info(sock.fd, &tcpinfo.info))
-                    print_tcp_info(sockname, &tcpinfo.info);
+#ifdef TCP_INFO
+            if _0_(gt_info) {
+                struct tcp_info ti;
+
+                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;
-                    ssize_t r = tun_read(tun.fd, data, GT_MTU_MAX);
+                    const ssize_t r = tun_read(tun.fd, data, GT_MTU_MAX);
 
-                    if (!r)
-                        return 2;
-
-                    if (r<0)
+                    if (r<=0) {
+                        gt_close |= !r;
                         break;
-
-                    ssize_t ip_size = ip_get_size(data, GT_MTU_MAX);
-
-                    if (ip_size<=0)
-                        continue;
-
-                    if (ip_size!=r) {
-                        dump_ip_header(data, r);
-
-                        if (r<ip_size) {
-                            ip_set_size(data, r);
-                        } else {
-                            continue;
-                        }
                     }
 
-                    if (ip_get_dscp(data, GT_MTU_MAX)==prio_dscp) {
-                        blks[blk_write].prio = 1;
-                        blk_prio++;
-                    } else {
-                        blks[blk_write].prio = 0;
+                    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;
@@ -905,71 +933,49 @@ int main (int argc, char **argv)
                 }
             }
 
-            buffer_shift(&tun.read);
+            while (1) {
+                buffer_shift(&tun.read);
 
-            // XXX prio code needs a full rewrite :)
+                if _0_(!stop_loop) {
+                    for (; blk_count; blk_read++) {
+                        const size_t size = blks[blk_read].size;
 
-            if (blk_prio) {
-                uint8_t k = blk_read;
+                        if (!size || buffer_write_size(&tun.read)<size)
+                            break;
 
-                while (blk_prio && buffer_read_size(&tun.read)<(size_t)prio_size) {
-                    while (!blks[k].prio || !blks[k].size)
-                        k++;
+                        byte_cpy(tun.read.write, blks[blk_read].data, size);
+                        tun.read.write += size;
 
-                    if (buffer_write_size(&tun.read)<blks[k].size)
-                        break;
+                        blks[blk_read].size = 0;
+                        blk_count--;
+                    }
 
-                    byte_cpy(tun.read.write, blks[k].data, blks[k].size);
-                    tun.read.write += blks[k].size;
-
-                    blks[k].size = 0;
-                    blk_count--;
-                    blk_prio--;
-
-                    if (blk_read==k)
-                        blk_read++;
-
-                    k++;
-                }
-            }
-
-            while (blk_count) {
-                if (!blks[blk_read].size) {
-                    blk_read++;
-                    continue;
+                    gt_encrypt(&ctx, &sock.write, &tun.read);
                 }
 
-                if (buffer_write_size(&tun.read)<blks[blk_read].size)
+                if (!buffer_read_size(&sock.write))
                     break;
 
-                byte_cpy(tun.read.write, blks[blk_read].data, blks[blk_read].size);
-                tun.read.write += blks[blk_read].size;
+                const ssize_t r = fd_write(sock.fd, sock.write.read,
+                                           buffer_read_size(&sock.write));
 
-                if (blks[blk_read].prio)
-                    blk_prio--;
-
-                blks[blk_read++].size = 0;
-                blk_count--;
+                if (r>0) {
+                    sock.write.read += r;
+                } else {
+                    if (!r) {
+                        stop_loop |= (1<<2);
+                    } else {
+                        FD_SET(sock.fd, &wfds);
+                    }
+                    break;
+                }
             }
 
-            gt_encrypt(&ctx, &sock.write, &tun.read);
-
-            if (buffer_read_size(&sock.write)) {
-                ssize_t r = fd_write(sock.fd, sock.write.read,
-                                     buffer_read_size(&sock.write));
-
-                if (r==-1)
-                    FD_SET(sock.fd, &wfds);
-
-                if (!r)
+            if _0_(stop_loop && !buffer_read_size(&sock.write)) {
+                if (!(stop_loop&(1<<2))) {
                     stop_loop |= (1<<2);
-
-                if (r>0)
-                    sock.write.read += r;
-            } else {
-                if (stop_loop) {
-                    gt_log("%s: shutdown\n", sockname);
                     shutdown(sock.fd, SHUT_WR);
+                    gt_log("%s: shutdown\n", sockname);
                 }
             }
 
@@ -977,18 +983,23 @@ int main (int argc, char **argv)
             buffer_shift(&sock.read);
 
             if (FD_ISSET(sock.fd, &rfds)) {
-                ssize_t r = fd_read(sock.fd, sock.read.write,
-                                    buffer_write_size(&sock.read));
+                if (noquickack)
+                    sk_set_int(sock.fd, sk_quickack, 0);
 
-                if (!r)
-                    stop_loop |= (1<<1);
+                const ssize_t r = fd_read(sock.fd, sock.read.write,
+                                          buffer_write_size(&sock.read));
 
-                if (r>0)
+                if (r>0) {
                     sock.read.write += r;
+                } else if (!r) {
+                    stop_loop |= (1<<1);
+                }
             }
 
             while (1) {
-                if (gt_decrypt(&ctx, &tun.write, &sock.read)) {
+                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;
                 }
@@ -996,7 +1007,7 @@ int main (int argc, char **argv)
                 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;
                 }
@@ -1006,17 +1017,14 @@ int main (int argc, char **argv)
 
                 ssize_t r = tun_write(tun.fd, tun.write.read, ip_size);
 
-                if (!r)
-                    return 2;
-
-                if (r==-1)
-                    FD_SET(tun.fd, &wfds);
-
-                if (r>0)
+                if (r>0) {
                     tun.write.read += r;
+                } else {
+                    gt_close |= !r;
+                    FD_SET(tun.fd, &wfds);
+                    break;
+                }
             }
-
-            buffer_shift(&tun.write);
         }
 
     restart:

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;