Version 0.0.7

configure.ac

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

@@ -24,6 +24,9 @@
 
 #define GT_BUFFER_SIZE  (4*1024*1024)
 #define GT_TIMEOUT      (1000)
+#define GT_MTU_MAX      (1500)
+#define GT_TUNR_SIZE    (0x7FFF-16)
+#define GT_TUNW_SIZE    (0x7FFF)
 
 struct fdbuf {
     int fd;
@@ -31,6 +34,12 @@ struct fdbuf {
     buffer_t write;
 };
 
+struct blk {
+    uint8_t prio;
+    size_t size;
+    uint8_t data[GT_MTU_MAX];
+};
+
 struct crypto_ctx {
     struct {
         crypto_aead_aes256gcm_state state;
@@ -629,6 +638,8 @@ int main (int argc, char **argv)
     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 {
@@ -644,6 +655,12 @@ int main (int argc, char **argv)
         { NULL },
     };
 
+    struct option prio_opts[] = {
+        { "dscp",  &prio_dscp, option_long },
+        { "size",  &prio_size, option_long },
+        { NULL },
+    };
+
     struct option opts[] = {
         { "listener",    NULL,         option_option },
         { "host",        &host,        option_str    },
@@ -655,6 +672,7 @@ 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 },
         { "version",     NULL,         option_option },
@@ -679,6 +697,16 @@ int main (int argc, char **argv)
         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;
@@ -707,10 +735,19 @@ 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;
+    size_t blk_prio = 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.read, NULL, 32*1024);
+    buffer_setup(&tun.write, NULL, GT_TUNW_SIZE);
+    buffer_setup(&tun.read,  NULL, GT_TUNR_SIZE);
 
     buffer_setup(&sock.write, NULL, buffer_size);
     buffer_setup(&sock.read,  NULL, buffer_size);
@@ -743,13 +780,15 @@ int main (int argc, char **argv)
 
         if (sock.fd==-1) {
             usleep(100000);
-            goto restart;
+            continue;
         }
 
         char *sockname = sk_get_name(sock.fd);
 
-        if (!sockname)
-            goto restart;
+        if (!sockname) {
+            close(sock.fd);
+            continue;
+        }
 
         gt_log("%s: connected\n", sockname);
 
@@ -801,7 +840,7 @@ int main (int argc, char **argv)
 
             FD_SET(sock.fd, &rfds);
 
-            if (buffer_read_size(&tun.read))
+            if (buffer_read_size(&tun.read) || blk_count)
                 FD_SET(sock.fd, &wfds);
 
             if (buffer_read_size(&sock.read))
@@ -828,16 +867,10 @@ int main (int argc, char **argv)
             }
 #endif
 
-            buffer_shift(&tun.read);
-
             if (FD_ISSET(tun.fd, &rfds)) {
-                while (1) {
-                    size_t size = buffer_write_size(&tun.read);
-
-                    if (size<1500)
-                        break;
-
-                    ssize_t r = tun_read(tun.fd, tun.read.write, size);
+                while (!blks[blk_write].size) {
+                    uint8_t *data = blks[blk_write].data;
+                    ssize_t r = tun_read(tun.fd, data, GT_MTU_MAX);
 
                     if (!r)
                         return 2;
@@ -845,23 +878,78 @@ int main (int argc, char **argv)
                     if (r<0)
                         break;
 
-                    ssize_t ip_size = ip_get_size(tun.read.write, size);
+                    ssize_t ip_size = ip_get_size(data, GT_MTU_MAX);
 
                     if (ip_size<=0)
                         continue;
 
                     if (ip_size!=r) {
-                        dump_ip_header(tun.read.write, r);
+                        dump_ip_header(data, r);
 
                         if (r<ip_size) {
-                            ip_set_size(tun.read.write, r);
+                            ip_set_size(data, r);
                         } else {
                             continue;
                         }
                     }
 
-                    tun.read.write += r;
+                    if (ip_get_dscp(data, GT_MTU_MAX)==prio_dscp) {
+                        blks[blk_write].prio = 1;
+                        blk_prio++;
+                    } else {
+                        blks[blk_write].prio = 0;
                     }
+
+                    blks[blk_write++].size = r;
+                    blk_count++;
+                }
+            }
+
+            buffer_shift(&tun.read);
+
+            // XXX prio code needs a full rewrite :)
+
+            if (blk_prio) {
+                uint8_t k = blk_read;
+
+                while (blk_prio && buffer_read_size(&tun.read)<(size_t)prio_size) {
+                    while (!blks[k].prio || !blks[k].size)
+                        k++;
+
+                    if (buffer_write_size(&tun.read)<blks[k].size)
+                        break;
+
+                    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;
+                }
+
+                if (buffer_write_size(&tun.read)<blks[blk_read].size)
+                    break;
+
+                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--;
             }
 
             gt_encrypt(&ctx, &sock.write, &tun.read);
@@ -899,12 +987,12 @@ int main (int argc, char **argv)
                     sock.read.write += r;
             }
 
+            while (1) {
                 if (gt_decrypt(&ctx, &tun.write, &sock.read)) {
                     gt_log("%s: message could not be verified!\n", sockname);
                     goto restart;
                 }
 
-            while (1) {
                 size_t size = buffer_read_size(&tun.write);
                 ssize_t ip_size = ip_get_size(tun.write.read, size);
 
@@ -945,8 +1033,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);