Use timeout in connect() too

Cope with branches that don't have tags

Makefile.am

@@ -16,7 +16,9 @@ glorytun_SOURCES = \
     src/tun.c \
     src/tun.h \
     src/db.c \
-    src/db.h
+    src/db.h \
+    src/state.c \
+    src/state.h
 
 EXTRA_DIST = \
     LICENSE \

src/buffer.h

@@ -49,15 +49,18 @@ static inline size_t buffer_read_size (buffer_t *buffer)
 
 static inline void buffer_shift (buffer_t *buffer)
 {
+    if (buffer->read==buffer->data)
+        return;
+
     if (buffer->read==buffer->write) {
         buffer_format(buffer);
-    } else {
-        const uint8_t *src = PALIGN_DOWN(buffer->read);
-        const size_t size = ALIGN(buffer->write-src);
-        if (buffer->data+size<src) {
-            memcpy(buffer->data, src, size);
-            buffer->read  -= src-buffer->data;
-            buffer->write -= src-buffer->data;
-        }
+        return;
     }
+
+    const size_t size = buffer_read_size(buffer);
+
+    memmove(buffer->data, buffer->read, size);
+
+    buffer->read  = buffer->data;
+    buffer->write = buffer->data+size;
 }

src/main.c

@@ -6,6 +6,7 @@
 #include "option.h"
 #include "tun.h"
 #include "db.h"
+#include "state.h"
 
 #include <inttypes.h>
 #include <limits.h>
@@ -13,8 +14,8 @@
 #include <signal.h>
 #include <poll.h>
 #include <fcntl.h>
+#include <sys/socket.h>
 #include <sys/time.h>
-#include <sys/stat.h>
 
 #ifndef __FAVOR_BSD
 #define __FAVOR_BSD
@@ -39,11 +40,14 @@
 #define O_CLOEXEC 0
 #endif
 
-#define GT_BUFFER_SIZE  (64*1024)
-#define GT_TIMEOUT      (5000)
-#define GT_MTU_MAX      (1500)
-#define GT_TUNR_SIZE    (0x7FFF-16)
-#define GT_TUNW_SIZE    (0x7FFF)
+#define GT_MTU_MAX   (1500)
+#define GT_PKT_MAX   (32*1024)
+#define GT_TUNR_SIZE (GT_PKT_MAX-16-2)
+#define GT_TUNW_SIZE (GT_PKT_MAX)
+
+static struct {
+    int timeout;
+} gt;
 
 struct fdbuf {
     int fd;
@@ -187,7 +191,7 @@ static int sk_listen (int fd, struct addrinfo *ai)
     }
 
 #ifdef __linux__
-    sk_set_int(fd, sk_defer_accept, GT_TIMEOUT/1000);
+    sk_set_int(fd, sk_defer_accept, gt.timeout/1000);
 #else
     char data[256] = "dataready";
     sk_set(fd, sk_acceptfilter, &data, sizeof(data));
@@ -198,10 +202,34 @@ static int sk_listen (int fd, struct addrinfo *ai)
 
 static int sk_connect (int fd, struct addrinfo *ai)
 {
+    fd_set_nonblock(fd);
+
     int ret = connect(fd, ai->ai_addr, ai->ai_addrlen);
 
-    if (ret==-1 && errno==EINTR)
-        return 0;
+    if (ret==-1) {
+        if (errno==EINTR)
+            return 0;
+
+        if (errno==EINPROGRESS) {
+            struct pollfd pollfd = {
+                .fd = fd,
+                .events = POLLOUT,
+            };
+
+            if (!poll(&pollfd, 1, gt.timeout))
+                return -1;
+
+            int opt = 0;
+            socklen_t optlen = sizeof(opt);
+
+            getsockopt(fd, SOL_SOCKET, SO_ERROR, &opt, &optlen);
+
+            if (!opt)
+                return 0;
+
+            errno = opt;
+        }
+    }
 
     return ret;
 }
@@ -233,6 +261,8 @@ static int sk_accept (int fd)
     if (ret==-1 && errno!=EINTR)
         perror("accept");
 
+    fd_set_nonblock(ret);
+
     return ret;
 }
 
@@ -264,7 +294,7 @@ static char *sk_get_name (int fd)
         return NULL;
     }
 
-    const char *const strs[] = {
+    const char *strs[] = {
         host, ".", port
     };
 
@@ -386,15 +416,6 @@ static ssize_t fd_write (int fd, const void *data, size_t size)
     return ret;
 }
 
-static void state_write (int fd, const char *str)
-{
-    if (fd==-1) {
-        gt_print("state: %s", str);
-    } else {
-        fd_write(fd, str, str_len(str));
-    }
-}
-
 static size_t fd_read_all (int fd, void *data, size_t size)
 {
     size_t done = 0;
@@ -411,7 +432,7 @@ static size_t fd_read_all (int fd, void *data, size_t size)
                 .events = POLLIN,
             };
 
-            if (!poll(&pollfd, 1, GT_TIMEOUT))
+            if (!poll(&pollfd, 1, gt.timeout))
                 break;
 
             continue;
@@ -439,7 +460,7 @@ static size_t fd_write_all (int fd, const void *data, size_t size)
                 .events = POLLOUT,
             };
 
-            if (!poll(&pollfd, 1, GT_TIMEOUT))
+            if (!poll(&pollfd, 1, gt.timeout))
                 break;
 
             continue;
@@ -619,7 +640,7 @@ int sa_have (struct seq_array *sa, uint32_t seq, uint32_t size)
 
             if (d+size>sa->elem[i].size) {
                 gt_print("sa_have:part\n");
-                return 1; // XXX 0
+                return 0; // XXX 0
             }
         }
 
@@ -881,40 +902,43 @@ static int gt_track (uint8_t **db, struct ip_common *ic, uint8_t *data, int rev)
         return 0;
     }
 
-    uint32_t size = ic->size-ic->hdr_size-tcp.th_off*4;
+    if (tcp.th_flags&TH_ACK) {
+        if (!r_entry) {
+            r_entry = calloc(1, sizeof(entry));
 
-    if (size && !r_entry) {
-        r_entry = calloc(1, sizeof(entry));
+            if (!r_entry)
+                return 0;
 
-        if (!r_entry)
-            return 0;
+            memcpy(r_entry->key, entry.key, sizeof(entry.key));
 
-        memcpy(r_entry->key, entry.key, sizeof(entry.key));
+            if (!db_insert(db, r_entry->key)) {
+                free(r_entry);
+                return 0;
+            }
 
-        if (!db_insert(db, r_entry->key)) {
-            free(r_entry);
-            return 0;
+            gt_print_entry(r_entry);
+
+            r_entry->data[1-rev].sa.base = tcp.th_ack;
+            r_entry->data[rev].sa.base = tcp.th_seq;
+        } else {
+            sa_rebase(&r_entry->data[1-rev].sa, tcp.th_ack);
         }
     }
 
     if (!r_entry)
         return 0;
 
-    if (r_entry->data[1-rev].sa.count && (tcp.th_flags&TH_ACK))
-        sa_rebase(&r_entry->data[1-rev].sa, tcp.th_ack);
+    uint32_t size = ic->size-ic->hdr_size-tcp.th_off*4;
 
     if (!size)
         return 0;
 
-    if (r_entry->data[rev].sa.count) {
-        if (sa_have(&r_entry->data[rev].sa, tcp.th_seq, size))
-            r_entry->data[rev].retrans++;
+    if (sa_have(&r_entry->data[rev].sa, tcp.th_seq, size)) {
+        r_entry->data[rev].retrans++;
     } else {
-        r_entry->data[rev].sa.base = tcp.th_seq;
+        sa_insert(&r_entry->data[rev].sa, tcp.th_seq, size);
     }
 
-    sa_insert(&r_entry->data[rev].sa, tcp.th_seq, size);
-
     return 0;
 }
 
@@ -927,8 +951,7 @@ static int gt_setup_secretkey (struct crypto_ctx *ctx, char *keyfile)
 
         randombytes_buf(ctx->skey, size);
         gt_tohex(buf, sizeof(buf), ctx->skey, size);
-
-        gt_print("new secret key: %s\n", buf);
+        state("SECRETKEY", buf);
 
         return 0;
     }
@@ -1064,7 +1087,7 @@ int main (int argc, char **argv)
     char *congestion = NULL;
     char *statefile = NULL;
 
-    long buffer_size = GT_BUFFER_SIZE;
+    long buffer_size = GT_PKT_MAX;
 
     long ka_count = -1;
     long ka_idle = -1;
@@ -1075,7 +1098,7 @@ int main (int argc, char **argv)
     long retry_const = 0;
     long retry_limit = 1000000;
 
-    long user_timeout = 0;
+    gt.timeout = 5000;
 
     struct option ka_opts[] = {
         { "count",    &ka_count,    option_long },
@@ -1105,9 +1128,8 @@ int main (int argc, char **argv)
         { "buffer-size", &buffer_size,  option_long   },
         { "noquickack",  NULL,          option_option },
         { "retry",       &retry_opts,   option_option },
-        { "daemon",      NULL,          option_option },
         { "statefile",   &statefile,    option_str    },
-        { "timeout",     &user_timeout, option_long   },
+        { "timeout",     &gt.timeout,   option_long   },
         { "debug",       NULL,          option_option },
         { "version",     NULL,          option_option },
         { NULL },
@@ -1127,9 +1149,9 @@ int main (int argc, char **argv)
     const int noquickack = option_is_set(opts, "noquickack");
     const int debug = option_is_set(opts, "debug");
 
-    if (buffer_size < 2048) {
-        buffer_size = 2048;
-        gt_log("buffer size must be greater than 2048\n");
+    if (buffer_size < GT_PKT_MAX) {
+        buffer_size = GT_PKT_MAX;
+        gt_log("buffer size must be greater than or equal to %li\n", buffer_size);
     }
 
     if (!listener) {
@@ -1142,8 +1164,8 @@ int main (int argc, char **argv)
             retry_count = 0;
     }
 
-    if (statefile && statefile[0]!='/') {
-        gt_log("statefile must be an absolute path\n");
+    if (gt.timeout<=0 || gt.timeout>INT_MAX) {
+        gt_log("bad timeout\n");
         return 1;
     }
 
@@ -1162,10 +1184,15 @@ int main (int argc, char **argv)
     if (!ai)
         return 1;
 
+    if (state_init(statefile))
+        return 1;
+
     struct fdbuf tun  = { .fd = -1 };
     struct fdbuf sock = { .fd = -1 };
 
-    tun.fd = tun_create(dev, option_is_set(opts, "multiqueue"));
+    char *tun_name = NULL;
+
+    tun.fd = tun_create(dev, &tun_name, option_is_set(opts, "multiqueue"));
 
     if (tun.fd==-1) {
         gt_log("couldn't create tun device\n");
@@ -1194,50 +1221,10 @@ int main (int argc, char **argv)
     if (gt_setup_secretkey(&ctx, keyfile))
         return 1;
 
-    if (option_is_set(opts, "daemon")) {
-        switch (fork()) {
-        case -1:
-            perror("fork");
-            return 1;
-        case 0:
-            if (setsid()==-1)
-                perror("setsid");
-            break;
-        default:
-            _exit(0);
-        }
-
-        chdir("/");
-    }
-
-    int state_fd = -1;
-
-    if (statefile) {
-        state_fd = open(statefile, O_WRONLY);
-
-        if (state_fd==-1) {
-            if (errno!=EINTR)
-                perror("open statefile");
-            return 1;
-        }
-
-        struct stat st = {0};
-
-        if (fstat(state_fd, &st)==-1) {
-            perror("stat statefile");
-            return 1;
-        }
-
-        if (!S_ISFIFO(st.st_mode)) {
-            gt_log("`%s' is not a fifo\n", statefile);
-            return 1;
-        }
-    }
-
     long retry = 0;
     uint8_t *db = NULL;
 
-    state_write(state_fd, "INITIALIZED\n");
+    state("INITIALIZED", tun_name);
 
     while (!gt_close) {
         if (retry_count>=0 && retry>=retry_count+1) {
@@ -1273,8 +1260,6 @@ int main (int argc, char **argv)
 
         gt_log("%s: connected\n", sockname);
 
-        fd_set_nonblock(sock.fd);
-
         sk_set_int(sock.fd, sk_nodelay, !delay);
         sk_set_int(sock.fd, sk_keepalive, keepalive);
 
@@ -1289,9 +1274,7 @@ int main (int argc, char **argv)
                 sk_set_int(sock.fd, sk_keepintvl, ka_interval);
         }
 
-        if (user_timeout>0 && user_timeout<=INT_MAX)
-            sk_set_int(sock.fd, sk_user_timeout, user_timeout);
-
+        sk_set_int(sock.fd, sk_user_timeout, gt.timeout);
         sk_set(sock.fd, sk_congestion, congestion, str_len(congestion));
 
         switch (gt_setup_crypto(&ctx, sock.fd, listener)) {
@@ -1307,7 +1290,7 @@ int main (int argc, char **argv)
 
         retry = 0;
 
-        state_write(state_fd, "STARTED\n");
+        state("STARTED", sockname);
 
         fd_set rfds;
         FD_ZERO(&rfds);
@@ -1394,6 +1377,8 @@ int main (int argc, char **argv)
                 }
             }
 
+            buffer_shift(&sock.write);
+
             if _1_(!stop_loop)
                 gt_encrypt(&ctx, &sock.write, &tun.read);
 
@@ -1416,8 +1401,6 @@ int main (int argc, char **argv)
                 }
             }
 
-            buffer_shift(&sock.write);
-
             if (FD_ISSET(sock.fd, &rfds)) {
                 if (noquickack)
                     sk_set_int(sock.fd, sk_quickack, 0);
@@ -1432,14 +1415,14 @@ int main (int argc, char **argv)
                 }
             }
 
+            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;
+            }
+
             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;
-                }
-
                 size_t size = buffer_read_size(&tun.write);
 
                 if (!size)
@@ -1472,17 +1455,17 @@ int main (int argc, char **argv)
         }
 
     restart:
-        if (sockname) {
-            free(sockname);
-            sockname = NULL;
-        }
-
         if (sock.fd!=-1) {
             close(sock.fd);
             sock.fd = -1;
         }
 
-        state_write(state_fd, "STOPPED\n");
+        state("STOPPED", sockname);
+
+        if (sockname) {
+            free(sockname);
+            sockname = NULL;
+        }
     }
 
     freeaddrinfo(ai);

src/state.c

@@ -0,0 +1,61 @@
+#include "common.h"
+
+#include "state.h"
+#include "str.h"
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+static int state_fd = -1;
+
+int state_init (const char *filename)
+{
+    if (str_empty(filename))
+        return 0;
+
+    state_fd = open(filename, O_WRONLY);
+
+    if (state_fd==-1) {
+        if (errno!=EINTR)
+            perror("open");
+        return -1;
+    }
+
+    struct stat st = {0};
+
+    if (fstat(state_fd, &st)==-1) {
+        perror("fstat");
+        close(state_fd);
+        state_fd = -1;
+        return -1;
+    }
+
+    if (!S_ISFIFO(st.st_mode)) {
+        gt_log("`%s' is not a fifo\n", filename);
+        close(state_fd);
+        state_fd = -1;
+        return -1;
+    }
+
+    return 0;
+}
+
+void state (const char *state, const char *info)
+{
+    if (str_empty(state))
+        return;
+
+    const char *strs[] = { state, " ", info, "\n" };
+    char *str = str_cat(strs, COUNT(strs));
+
+    if (!str)
+        return;
+
+    if (state_fd==-1) {
+        gt_print("%s", str);
+    } else {
+        if (write(state_fd, str, str_len(str))==-1 && errno!=EINTR)
+            perror("write");
+    }
+}

src/state.h

@@ -0,0 +1,4 @@
+#pragma once
+
+int  state_init (const char *);
+void state      (const char *, const char *);

src/str.h

@@ -47,7 +47,7 @@ static inline size_t str_len (const char *restrict str)
     return strlen(str);
 }
 
-static inline char *str_cat (const char *const strs[], size_t count)
+static inline char *str_cat (const char **strs, size_t count)
 {
     size_t size = 1;
 

src/tun.c

@@ -131,9 +131,9 @@ static int tun_create_by_id (char *name, size_t size, unsigned id, int mq)
 
 #endif
 
-int tun_create (char *dev_name, int mq)
+int tun_create (char *dev_name, char **ret_name, int mq)
 {
-    char name[64];
+    char name[64] = {0};
     int fd = -1;
 
 #ifndef IFF_MULTI_QUEUE
@@ -148,8 +148,8 @@ int tun_create (char *dev_name, int mq)
         fd = tun_create_by_name(name, sizeof(name), dev_name, mq);
     }
 
-    if (fd!=-1)
-        gt_print("tun name: %s\n", name);
+    if (fd!=-1 && ret_name)
+        *ret_name = strdup(name);
 
     return fd;
 }

src/tun.h

@@ -2,6 +2,6 @@
 
 #include <unistd.h>
 
-int     tun_create (char *, int);
+int     tun_create (char *, char **, int);
 ssize_t tun_read   (int, void *, size_t);
 ssize_t tun_write  (int, const void *, size_t);

version.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -z "${VERSION}" ] && VERSION=`git describe --tags --always 2>/dev/null` \
+[ -z "${VERSION}" ] && VERSION=`git describe --tags --match='v[0-9].*' 2>/dev/null` \
                     && VERSION=${VERSION#v}
 
 [ -z "${VERSION}" ] && VERSION=`cat VERSION 2>/dev/null`