Refuse to start the client without keyfile

.travis.yml

@@ -30,3 +30,6 @@ deploy:
         tags: true
         repo: angt/glorytun
         condition: "${TRAVIS_OS_NAME}-${CC} == linux-gcc"
+
+after_deploy:
+    - md5sum glorytun-*.tar.gz

README.md

@@ -1,8 +1,12 @@
 # Glorytun
 
-Small, Simple and Stupid **TCP** VPN.
+Small, Simple and Stupid TCP VPN.
 
-**Work In Progress:** Do not touch! This code will probably format your harddisk!
+#### Work In Progress
+
+This code will probably format your harddisk!
+
+#### Build and Install
 
 Glorytun depends on [libsodium](https://github.com/jedisct1/libsodium) version >= 1.0.4
 and needs an AES-NI capable CPU.
@@ -16,7 +20,4 @@ To build and install the latest version:
     $ make
     # make install
 
-To create and use a new secret key:
-
-    $ hexdump -n 32 /dev/urandom -e '"%X"' > glorytun.key
-    # glorytun keyfile glorytun.key [...]
+For feature requests and bug reports, please create an [issue](https://github.com/angt/glorytun/issues).

src/common-static.h

@@ -18,7 +18,7 @@ static inline void byte_set (void *dst, const char value, size_t size)
 
 static inline void byte_cpy (void *dst, const void *src, size_t size)
 {
-    if (!dst || !src)
+    if (!dst)
         return;
 
     char *restrict d = dst;
@@ -43,6 +43,12 @@ static inline size_t str_cpy (char *restrict dst, const char *restrict src, size
     return i;
 }
 
+_pure_
+static inline int str_empty (const char *restrict str)
+{
+    return !str || !str[0];
+}
+
 _pure_
 static inline int str_cmp (const char *restrict sa, const char *restrict sb)
 {

src/main.c

@@ -7,13 +7,19 @@
 #include <sys/fcntl.h>
 
 #ifndef __FAVOR_BSD
-#define __FAVOR_BSD 1
+#define __FAVOR_BSD
+#define GT_FAKE_BSD
 #endif
 
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <netinet/udp.h>
 
+#ifdef GT_FAKE_BSD
+#undef GT_FAKE_BSD
+#undef __FAVOR_BSD
+#endif
+
 #include <arpa/inet.h>
 #include <netdb.h>
 
@@ -92,6 +98,7 @@ enum sk_opt {
     sk_keepintvl,
     sk_congestion,
     sk_defer_accept,
+    sk_acceptfilter,
     sk_quickack,
 };
 
@@ -137,6 +144,11 @@ static void sk_set (int fd, enum sk_opt opt, const void *val, socklen_t len)
         [sk_quickack] = { "TCP_QUICKACK",
 #ifdef TCP_QUICKACK
             1, IPPROTO_TCP, TCP_QUICKACK,
+#endif
+        },
+        [sk_acceptfilter] = { "SO_ACCEPTFILTER",
+#ifdef SO_ACCEPTFILTER
+            1, SOL_SOCKET, SO_ACCEPTFILTER,
 #endif
         },
     };
@@ -159,21 +171,23 @@ static int sk_listen (int fd, struct addrinfo *ai)
 {
     sk_set_int(fd, sk_reuseaddr, 1);
 
-    int ret = bind(fd, ai->ai_addr, ai->ai_addrlen);
-
-    if (ret==-1) {
+    if (bind(fd, ai->ai_addr, ai->ai_addrlen)==-1) {
         perror("bind");
         return -1;
     }
 
-    ret = listen(fd, 8);
-
-    if (ret==-1) {
+    if (listen(fd, 8)==-1) {
         perror("listen");
         return -1;
     }
 
+#ifdef __linux__
     sk_set_int(fd, sk_defer_accept, GT_TIMEOUT/1000);
+#else
+    char data[256] = {0};
+    str_cpy(data, "dataready", sizeof(data)-1);
+    sk_set(fd, sk_acceptfilter, &data, sizeof(data));
+#endif
 
     return 0;
 }
@@ -496,18 +510,18 @@ static void gt_print_hdr (const int ip_version, uint8_t *data, size_t ip_size, c
     const ssize_t ip_proto = ip_get_proto(ip_version, data, ip_size);
     const ssize_t ip_hdr_size = ip_get_hdr_size(ip_version, data, ip_size);
 
-    char ip_src[33];
-    char ip_dst[33];
+    char ip_src[INET6_ADDRSTRLEN];
+    char ip_dst[INET6_ADDRSTRLEN];
 
     switch (ip_version) {
-        case 4:
-            gt_tohex(ip_src, sizeof(ip_src), &data[12], 4);
-            gt_tohex(ip_dst, sizeof(ip_dst), &data[16], 4);
-            break;
-        case 6:
-            gt_tohex(ip_src, sizeof(ip_src), &data[9], 16);
-            gt_tohex(ip_dst, sizeof(ip_dst), &data[25], 16);
-            break;
+    case 4:
+        inet_ntop(AF_INET, &data[12], ip_src, sizeof(ip_src));
+        inet_ntop(AF_INET, &data[16], ip_dst, sizeof(ip_dst));
+        break;
+    case 6:
+        inet_ntop(AF_INET6, &data[9],  ip_src, sizeof(ip_src));
+        inet_ntop(AF_INET6, &data[25], ip_dst, sizeof(ip_dst));
+        break;
     }
 
     gt_log("%s: version=%i size=%zi proto=%zi src=%s dst=%s\n", sockname, ip_version, ip_size, ip_proto, ip_src, ip_dst);
@@ -681,7 +695,7 @@ int main (int argc, char **argv)
 
     char *host = NULL;
     char *port = "5000";
-    char *dev = PACKAGE_NAME;
+    char *dev = NULL;
     char *keyfile = NULL;
     char *congestion = NULL;
 
@@ -749,8 +763,15 @@ int main (int argc, char **argv)
         gt_log("buffer size must be greater than 2048!\n");
     }
 
-    if (!listener && !option_is_set(opts, "retry"))
-        retry_count = 0;
+    if (!listener) {
+        if (!option_is_set(opts, "keyfile")) {
+            gt_log("keyfile option must be set\n");
+            return 1;
+        }
+
+        if (!option_is_set(opts, "retry"))
+            retry_count = 0;
+    }
 
     if (sodium_init()==-1) {
         gt_log("libsodium initialization has failed!\n");
@@ -772,8 +793,10 @@ int main (int argc, char **argv)
 
     tun.fd = tun_create(dev, option_is_set(opts, "multiqueue"));
 
-    if (tun.fd==-1)
+    if (tun.fd==-1) {
+        gt_log("couldn't create tun device\n");
         return 1;
+    }
 
     struct blk *blks = calloc(256, sizeof(struct blk));
     size_t blk_count = 0;

src/tun.c

@@ -11,116 +11,148 @@
 #include <sys/uio.h>
 
 #ifdef __linux__
-# include <linux/if.h>
-# include <linux/if_tun.h>
+#include <linux/if.h>
+#include <linux/if_tun.h>
 #endif
 
 #ifdef __APPLE__
-# include <sys/sys_domain.h>
-# include <sys/kern_control.h>
-# include <net/if_utun.h>
+#include <sys/sys_domain.h>
+#include <sys/kern_control.h>
+#include <net/if_utun.h>
 #endif
 
 #if defined(__APPLE__) || defined(__OpenBSD__)
-# define GT_BSD_TUN 1
+#define GT_BSD_TUN
 #endif
 
+#ifdef __APPLE__
+
+static int tun_create_by_id (char *name, size_t size, unsigned id, _unused_ int mq)
+{
+    int fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
+
+    if (fd==-1)
+        return -1;
+
+    struct ctl_info ci;
+
+    byte_set(&ci, 0, sizeof(ci));
+    str_cpy(ci.ctl_name, UTUN_CONTROL_NAME, sizeof(ci.ctl_name)-1);
+
+    if (ioctl(fd, CTLIOCGINFO, &ci)) {
+        close(fd);
+        return -1;
+    }
+
+    struct sockaddr_ctl sc = {
+        .sc_id = ci.ctl_id,
+        .sc_len = sizeof(sc),
+        .sc_family = AF_SYSTEM,
+        .ss_sysaddr = AF_SYS_CONTROL,
+        .sc_unit = id+1,
+    };
+
+    if (connect(fd, (struct sockaddr *)&sc, sizeof(sc))) {
+        close(fd);
+        return -1;
+    }
+
+    snprintf(name, size, "utun%u", id);
+
+    return fd;
+}
+
+static int tun_create_by_name (char *name, size_t size, char *dev_name, int mq)
+{
+    unsigned id = 0;
+
+    if (sscanf(dev_name, "utun%u", &id)!=1)
+        return -1;
+
+    return tun_create_by_id(name, size, id, mq);
+}
+
+#else /* not __APPLE__ */
+
 #ifdef __linux__
-int tun_create (char *name, int multiqueue)
+
+static int tun_create_by_name (char *name, size_t size, char *dev_name, int mq)
 {
     int fd = open("/dev/net/tun", O_RDWR);
 
-    if (fd<0) {
-        perror("open /dev/net/tun");
+    if (fd==-1)
         return -1;
-    }
 
     struct ifreq ifr = {
         .ifr_flags = IFF_TUN|IFF_NO_PI,
     };
 
-    if (multiqueue) {
+    if (mq) {
 #ifdef IFF_MULTI_QUEUE
         ifr.ifr_flags |= IFF_MULTI_QUEUE;
-#else
-        gt_na("IFF_MULTI_QUEUE");
 #endif
     }
 
-    str_cpy(ifr.ifr_name, name, IFNAMSIZ-1);
+    str_cpy(ifr.ifr_name, dev_name, IFNAMSIZ-1);
 
-    int ret = ioctl(fd, TUNSETIFF, &ifr);
-
-    if (ret<0) {
-        perror("ioctl TUNSETIFF");
+    if (ioctl(fd, TUNSETIFF, &ifr)) {
+        close(fd);
         return -1;
     }
 
-    gt_log("tun name: %s\n", ifr.ifr_name);
+    str_cpy(name, ifr.ifr_name, size-1);
 
     return fd;
 }
-#elif defined(__APPLE__)
-int tun_create (_unused_ char *name, _unused_ int mq)
+
+#else /* not __linux__ not __APPLE__ */
+
+static int tun_create_by_name (char *name, size_t size, char *dev_name, _unused_ int mq)
 {
-    for (unsigned dev_id = 0; dev_id < 32; dev_id++) {
-        struct ctl_info ci;
+    char path[64];
 
-        byte_set(&ci, 0, sizeof(ci));
-        str_cpy(ci.ctl_name, UTUN_CONTROL_NAME, sizeof(ci.ctl_name)-1);
+    snprintf(path, sizeof(path), "/dev/%s", dev_name);
+    str_cpy(name, dev_name, size-1);
 
-        int fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
-
-        if (fd==-1)
-            return -1;
-
-        if (ioctl(fd, CTLIOCGINFO, &ci)==-1) {
-            close(fd);
-            continue;
-        }
-
-        struct sockaddr_ctl sc = {
-            .sc_id = ci.ctl_id,
-            .sc_len = sizeof(sc),
-            .sc_family = AF_SYSTEM,
-            .ss_sysaddr = AF_SYS_CONTROL,
-            .sc_unit = dev_id+1,
-        };
-
-        if (connect(fd, (struct sockaddr *)&sc, sizeof(sc))==-1) {
-            close(fd);
-            continue;
-        }
-
-        gt_log("tun name: /dev/utun%u\n", dev_id);
-
-        return fd;
-    }
-
-    return -1;
+    return open(path, O_RDWR);
 }
-#else
-int tun_create (_unused_ char *name, _unused_ int mq)
+
+#endif /* not __APPLE__ */
+
+static int tun_create_by_id (char *name, size_t size, unsigned id, int mq)
 {
-    for (unsigned dev_id = 0; dev_id < 32; dev_id++) {
-        char dev_path[11];
+    char dev_name[64];
 
-        snprintf(dev_path, sizeof(dev_path), "/dev/tun%u", dev_id);
+    snprintf(dev_name, sizeof(dev_name), "tun%u", id);
 
-        int fd = open(dev_path, O_RDWR);
-
-        if (fd==-1)
-            continue;
-
-        gt_log("tun name: %s\n", dev_path);
-
-        return fd;
-    }
-
-    return -1;
+    return tun_create_by_name(name, size, dev_name, mq);
 }
+
 #endif
 
+int tun_create (char *dev_name, int mq)
+{
+    char name[64];
+    int fd = -1;
+
+#ifndef IFF_MULTI_QUEUE
+    if (mq)
+        gt_na("IFF_MULTI_QUEUE");
+#endif
+
+    if (str_empty(dev_name)) {
+        for (unsigned id=0; id<32 && fd==-1; id++)
+            fd = tun_create_by_id(name, sizeof(name), id, mq);
+    } else {
+        fd = tun_create_by_name(name, sizeof(name), dev_name, mq);
+    }
+
+    if (fd!=-1)
+        gt_print("tun name: %s\n", name);
+
+    return fd;
+}
+
 ssize_t tun_read (int fd, void *data, size_t size)
 {
     if (!size)