Version 0.0.8

configure.ac

@@ -1,5 +1,5 @@
 AC_PREREQ([2.65])
-AC_INIT([glorytun], [0.0.6], [https://github.com/angt/glorytun/issues],
+AC_INIT([glorytun], [0.0.8], [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

@@ -22,9 +22,11 @@
 #define O_CLOEXEC 0
 #endif
 
-#define GT_BUFFER_SIZE (4*1024*1024)
+#define GT_BUFFER_SIZE  (4*1024*1024)
-#define GT_TIMEOUT     (1000)
+#define GT_TIMEOUT      (1000)
-#define GT_MTU_MAX     (1500)
+#define GT_MTU_MAX      (1500)
+#define GT_TUNR_SIZE    (0x7FFF-16)
+#define GT_TUNW_SIZE    (0x7FFF)
 
 struct fdbuf {
     int fd;
@@ -33,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 {
@@ -82,6 +83,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)
@@ -121,6 +123,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
         },
     };
@@ -636,7 +643,6 @@ int main (int argc, char **argv)
     long ka_count = -1;
     long ka_idle = -1;
     long ka_interval = -1;
-    long dscp_prio = 0x3F;
 
 #ifdef TCP_INFO
     struct {
@@ -663,7 +669,7 @@ int main (int argc, char **argv)
         { "multiqueue",  NULL,         option_option },
         { "keepalive",   ka_opts,      option_option },
         { "buffer-size", &buffer_size, option_long   },
-        { "dscp-prio",   &dscp_prio,   option_long   },
+        { "noquickack",  NULL,         option_option },
         { "daemon",      NULL,         option_option },
         { "debug",       NULL,         option_option },
         { "version",     NULL,         option_option },
@@ -682,6 +688,7 @@ int main (int argc, char **argv)
     int delay = option_is_set(opts, "delay");
     int debug = option_is_set(opts, "debug");
     int keepalive = option_is_set(opts, "keepalive");
+    int noquickack = option_is_set(opts, "noquickack");
 
     if (buffer_size < 2048) {
         buffer_size = 2048;
@@ -718,7 +725,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;
 
@@ -727,11 +733,11 @@ int main (int argc, char **argv)
 
     fd_set_nonblock(tun.fd);
 
-    buffer_setup(&tun.write, NULL, 0x7FFF);
+    buffer_setup(&tun.write, NULL, GT_TUNW_SIZE);
-    buffer_setup(&tun.read, NULL, 0x7FFF-16);
+    buffer_setup(&tun.read,  NULL, GT_TUNR_SIZE);
 
     buffer_setup(&sock.write, NULL, buffer_size);
-    buffer_setup(&sock.read, NULL, buffer_size);
+    buffer_setup(&sock.read,  NULL, buffer_size);
 
     int fd = -1;
 
@@ -874,11 +880,6 @@ int main (int argc, char **argv)
                         }
                     }
 
-                    if (ip_get_dscp(data, GT_MTU_MAX)==dscp_prio) {
-                        blks[blk_write].prio = 1;
-                        blk_prio++;
-                    }
-
                     blks[blk_write++].size = r;
                     blk_count++;
                 }
@@ -886,29 +887,6 @@ int main (int argc, char **argv)
 
             buffer_shift(&tun.read);
 
-            // XXX prio code needs a full rewrite :)
-
-            if (blk_prio) {
-                uint8_t k = blk_read;
-
-                while (blk_prio && buffer_write_size(&tun.read)>8*GT_MTU_MAX) {
-                    while (!blks[k].prio)
-                        k++;
-
-                    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++;
@@ -921,9 +899,6 @@ int main (int argc, char **argv)
                 byte_cpy(tun.read.write, blks[blk_read].data, blks[blk_read].size);
                 tun.read.write += blks[blk_read].size;
 
-                if (blks[blk_read].prio)
-                    blk_prio--;
-
                 blks[blk_read++].size = 0;
                 blk_count--;
             }
@@ -943,7 +918,8 @@ int main (int argc, char **argv)
                 if (r>0)
                     sock.write.read += r;
             } else {
-                if (stop_loop) {
+                if (stop_loop && !(stop_loop>>2)) {
+                    stop_loop |= (1<<2);
                     gt_log("%s: shutdown\n", sockname);
                     shutdown(sock.fd, SHUT_WR);
                 }
@@ -953,6 +929,9 @@ int main (int argc, char **argv)
             buffer_shift(&sock.read);
 
             if (FD_ISSET(sock.fd, &rfds)) {
+                if (noquickack)
+                    sk_set_int(sock.fd, sk_quickack, 0);
+
                 ssize_t r = fd_read(sock.fd, sock.read.write,
                                     buffer_write_size(&sock.read));
 
@@ -1009,8 +988,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

@@ -97,7 +97,7 @@ static int option_usage (struct option *opts, int slen)
     int len = slen;
 
     for (int k=0; opts[k].name; k++) {
-        if (len>60) {
+        if (len>slen+40) {
             gt_print("\n%*s", (int)slen, "");
             len = slen;
         }
@@ -130,8 +130,10 @@ 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", (int)slen, "");
+    }
 
     option_usage(opts, slen);