Try value 42 for mptcp (fallback to 26)

Chacha20 will be automatically used if aesni is not available.

.build.sh

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+export CC="gcc -static"
+
+git clone https://github.com/jedisct1/libsodium --depth=1 --branch stable
+cd libsodium || exit 1
+./autogen.sh && ./configure --enable-minimal --disable-shared --prefix=/usr && make install
+cd ..
+
+./autogen.sh && ./configure && make
+[ -x glorytun ] || exit 1
+
+mkdir -p deploy
+strip -s glorytun
+mv glorytun deploy/glorytun-$(cat VERSION)-$(uname -m).bin

.gitignore

@@ -11,5 +11,3 @@ build-aux
 .deps
 .dirstamp
 glorytun
-build*
-VERSION

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "mud"]
-	path = mud
-	url = https://github.com/angt/mud.git

Makefile.am

@@ -7,6 +7,7 @@ glorytun_LDADD = $(libsodium_LIBS)
 glorytun_SOURCES = \
     src/common.h \
     src/common.c \
+    src/buffer.h \
     src/ip.h \
     src/str.h \
     src/main.c \
@@ -14,24 +15,14 @@ glorytun_SOURCES = \
     src/option.h \
     src/tun.c \
     src/tun.h \
-    src/iface.c \
-    src/iface.h \
     src/db.c \
     src/db.h \
-    mud/mud.h \
-    mud/mud.c
+    src/state.c \
+    src/state.h
 
 EXTRA_DIST = \
     LICENSE \
     README.md \
     VERSION \
-    systemd/glorytun-client.network \
-    systemd/glorytun-run \
-    systemd/glorytun-setup \
-    systemd/glorytun.network \
-    systemd/glorytun@.service.in \
-    mud/LICENSE \
-    mud/README.md \
-    meson.build \
     autogen.sh \
     version.sh

README.md

@@ -1,53 +1,22 @@
-# Glorytun
+# π₁(Glorytun)=ℤ²
 
-Small, Simple and Stupid VPN over [mud](https://github.com/angt/mud).
+Small, Simple and Stupid TCP VPN.
 
-### Build and Install
+#### 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.
 
-On Ubuntu, the following command should be sufficient:
+To build and install the latest version:
 
-    $ sudo apt-get install meson libsodium-dev pkg-config
-
-Grab the latest release from github:
-
-    $ git clone https://github.com/angt/glorytun --recursive
+    $ git clone https://github.com/angt/glorytun
     $ cd glorytun
-
-To build and install the latest version with [meson](http://mesonbuild.com):
-
-    $ meson build
-    $ sudo ninja -C build install
-
-The more classical autotools suite is also available.
-
-### Easy setup with systemd
-
-Just call `glorytun-setup` and follow the instructions.
-
-First, setup the server:
-
-    $ sudo glorytun-setup
-    Config filename (tun0):
-    Server ip (enter for server conf):
-    Server key (enter to generate a new one):
-    Your new key: NEW_KEY
-    Start glorytun now ? (enter to skip): y
-
-Copy the new generated key and use it when configuring the client:
-
-    $ sudo glorytun-setup
-    Config filename (tun0):
-    Server ip (enter for server conf): SERVER_IP
-    Server key (enter to generate a new one): NEW_KEY
-    Start glorytun now ? (enter to skip): y
-
-You can check easily if it works by looking at your public ip.
-To stop the service:
-
-    $ sudo systemctl stop glorytun@tun0
-
----
+    $ ./autogen.sh
+    $ ./configure
+    $ make
+    # make install
 
 For feature requests and bug reports, please create an [issue](https://github.com/angt/glorytun/issues).

configure.ac

@@ -8,12 +8,13 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], [m4_esyscmd([./version.sh major])])
 AC_CONFIG_SRCDIR([src/common.h])
 AC_CONFIG_AUX_DIR([build-aux])
 AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.12 -Wall -Werror foreign tar-ustar subdir-objects])
+AM_INIT_AUTOMAKE([1.9 -Wall -Werror foreign tar-ustar subdir-objects])
 AM_DEP_TRACK
 AM_SILENT_RULES([yes])
 AM_PROG_CC_C_O
 AC_PROG_CC_C99
 AC_USE_SYSTEM_EXTENSIONS
+AC_SEARCH_LIBS([getaddrinfo], [resolv nsl])
 AC_SEARCH_LIBS([socket], [socket])
 AC_CHECK_LIB([rt], [clock_gettime])
 AC_CHECK_FUNCS([clock_gettime])

meson.build

@@ -1,49 +0,0 @@
-project('glorytun', 'c',
-    version: run_command('./version.sh').stdout(),
-    license: 'BSD-3-Clause',
-    default_options : [ 'buildtype=debugoptimized' ]
-)
-
-prefix = get_option('prefix')
-bindir = join_paths(prefix, get_option('bindir'))
-
-conf_data = configuration_data()
-conf_data.set('prefix', prefix)
-conf_data.set('bindir', bindir)
-
-add_global_arguments('-DPACKAGE_VERSION="'+meson.project_version()+'"', language : 'c')
-
-src = [
-    'src/common.c',
-    'src/iface.c',
-    'src/option.c',
-    'src/tun.c',
-    'mud/mud.c',
-    'src/main.c'
-]
-
-deps = [
-    dependency('libsodium', version : '>=1.0.4')
-]
-
-executable('glorytun', install: true, sources: src, dependencies: deps)
-
-systemd = dependency('systemd', required: false)
-
-if systemd.found()
-  systemdutildir = systemd.get_pkgconfig_variable('systemdutildir')
-  configure_file(
-      input: 'systemd/glorytun@.service.in',
-      output: 'glorytun@.service',
-      configuration: conf_data,
-      install_dir: join_paths(systemdutildir, 'system')
-  )
-  install_data('systemd/glorytun.network',
-      install_dir: join_paths(systemdutildir, 'network'))
-  install_data('systemd/glorytun-client.network',
-      install_dir: join_paths(systemdutildir, 'network'))
-  install_data('systemd/glorytun-run',
-      install_dir: bindir)
-  install_data('systemd/glorytun-setup',
-      install_dir: bindir)
-endif

src/buffer.h

@@ -0,0 +1,66 @@
+#pragma once
+
+#include "common.h"
+
+typedef struct buffer buffer_t;
+
+struct buffer {
+    uint8_t *data;
+    uint8_t *read;
+    uint8_t *write;
+    uint8_t *end;
+};
+
+static inline void buffer_setup (buffer_t *buffer, void *data, size_t size)
+{
+    if (!data)
+        data = malloc(ALIGN(size));
+
+    buffer->data  = data;
+    buffer->read  = data;
+    buffer->write = data;
+    buffer->end   = data;
+    buffer->end  += size;
+}
+
+static inline void buffer_format (buffer_t *buffer)
+{
+    buffer->write = buffer->data;
+    buffer->read  = buffer->data;
+}
+
+_pure_
+static inline size_t buffer_size (buffer_t *buffer)
+{
+    return buffer->end-buffer->data;
+}
+
+_pure_
+static inline size_t buffer_write_size (buffer_t *buffer)
+{
+    return buffer->end-buffer->write;
+}
+
+_pure_
+static inline size_t buffer_read_size (buffer_t *buffer)
+{
+    return buffer->write-buffer->read;
+}
+
+static inline void buffer_shift (buffer_t *buffer)
+{
+    if (buffer->read==buffer->data)
+        return;
+
+    if (buffer->read==buffer->write) {
+        buffer_format(buffer);
+        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/common.c

@@ -1,10 +1,9 @@
 #include "common.h"
 
-#include <stdarg.h>
 #include <stdio.h>
+#include <stdarg.h>
 
-int
-gt_print(const char *fmt, ...)
+int gt_print (const char *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);
@@ -17,8 +16,7 @@ gt_print(const char *fmt, ...)
     return ret;
 }
 
-void
-gt_log(const char *fmt, ...)
+void gt_log (const char *fmt, ...)
 {
     va_list ap;
     va_start(ap, fmt);
@@ -26,13 +24,27 @@ gt_log(const char *fmt, ...)
     va_end(ap);
 }
 
-int
-gt_tohex(char *dst, size_t dst_size, const uint8_t *src, size_t src_size)
+void gt_fatal (const char *fmt, ...)
 {
-    if (_0_(!dst_size))
+    va_list ap;
+    va_start(ap, fmt);
+    vfprintf(stderr, fmt, ap);
+    va_end(ap);
+
+    exit(EXIT_FAILURE);
+}
+
+void gt_na (const char *name)
+{
+    gt_log("%s is not available on your platform\n", name);
+}
+
+int gt_tohex (char *dst, size_t dst_size, const uint8_t *src, size_t src_size)
+{
+    if _0_(!dst_size)
         return -1;
 
-    if (_0_(((dst_size - 1) / 2) < src_size))
+    if _0_(((dst_size-1)/2)<src_size)
         return -1;
 
     static const char tbl[] = "0123456789ABCDEF";
@@ -47,8 +59,8 @@ gt_tohex(char *dst, size_t dst_size, const uint8_t *src, size_t src_size)
     return 0;
 }
 
-_const_ static inline int
-fromhex(const char c)
+_const_
+static inline int fromhex (const char c)
 {
     if (c>='0' && c<='9')
         return c-'0';
@@ -62,20 +74,19 @@ fromhex(const char c)
     return -1;
 }
 
-int
-gt_fromhex(uint8_t *dst, size_t dst_size, const char *src, size_t src_size)
+int gt_fromhex (uint8_t *dst, size_t dst_size, const char *src, size_t src_size)
 {
-    if (_0_(src_size & 1))
+    if _0_(src_size&1)
         return -1;
 
-    if (_0_(dst_size < (src_size / 2)))
+    if _0_(dst_size<(src_size/2))
         return -1;
 
     for (size_t i=0; i<src_size; i+=2) {
         const int a = fromhex(src[i]);
         const int b = fromhex(src[i+1]);
 
-        if (_0_(a == -1 || b == -1))
+        if _0_(a==-1 || b==-1)
             return -1;
 
         *dst++ = (a<<4)|b;

src/common.h

@@ -29,14 +29,10 @@
 #define _const_        __attribute__ ((const))
 #define _align_(...)   __attribute__ ((aligned(__VA_ARGS__)))
 
-#undef MAX
-#define MAX(x,y) ({ __typeof__(x) X=(x); __typeof__(y) Y=(y); X > Y ? X : Y; })
-
-#undef MIN
-#define MIN(x,y) ({ __typeof__(x) X=(x); __typeof__(y) Y=(y); X < Y ? X : Y; })
-
 int  gt_print (const char *, ...) _printf_(1,2);
 void gt_log   (const char *, ...) _printf_(1,2);
+void gt_fatal (const char *, ...) _printf_(1,2) _noreturn_;
+void gt_na    (const char *);
 
 int gt_tohex   (char *, size_t, const uint8_t *, size_t);
 int gt_fromhex (uint8_t *, size_t, const char *, size_t);

src/db.c

@@ -12,14 +12,14 @@ struct node {
     uint32_t point;
 };
 
-_pure_ static inline size_t
-db_size(const uint8_t *a)
+_pure_
+static inline size_t db_size (const uint8_t *a)
 {
     return (a[0]?:str_len((char *)a+1))+1;
 }
 
-_pure_ static inline size_t
-db_cmp(const uint8_t *a, const uint8_t *b)
+_pure_
+static inline size_t db_cmp (const uint8_t *a, const uint8_t *b)
 {
     const size_t size = a[0];
 
@@ -39,8 +39,8 @@ db_cmp(const uint8_t *a, const uint8_t *b)
     return 0;
 }
 
-_pure_ static inline int
-db_dir(const uint32_t point, uint8_t *data, const size_t size)
+_pure_
+static inline int db_dir (const uint32_t point, uint8_t *data, const size_t size)
 {
     const size_t pos = point>>8;
 
@@ -50,10 +50,9 @@ db_dir(const uint32_t point, uint8_t *data, const size_t size)
     return ((point|data[pos])&255)==255;
 }
 
-uint8_t *
-db_search(uint8_t **p, uint8_t *data)
+uint8_t *db_search (uint8_t **p, uint8_t *data)
 {
-    if (_0_(!*p))
+    if _0_(!*p)
         return NULL;
 
     uint8_t *r = *p;
@@ -70,13 +69,12 @@ db_search(uint8_t **p, uint8_t *data)
     return NULL;
 }
 
-uint8_t *
-db_insert(uint8_t **p, uint8_t *data)
+uint8_t *db_insert (uint8_t **p, uint8_t *data)
 {
-    if (_0_(CBIT(data)))
+    if _0_(CBIT(data))
         return NULL;
 
-    if (_0_(!*p)) {
+    if _0_(!*p) {
         *p = data;
         return data;
     }
@@ -91,7 +89,7 @@ db_insert(uint8_t **p, uint8_t *data)
 
     const size_t diff = db_cmp(r, data);
 
-    if (_0_(!diff))
+    if _0_(!diff)
         return r;
 
     const size_t pos = diff-1;
@@ -109,7 +107,7 @@ db_insert(uint8_t **p, uint8_t *data)
 
     struct node *node = malloc(sizeof(struct node));
 
-    if (_0_(!node))
+    if _0_(!node)
         return NULL;
 
     const int dir = (mask|r[pos])==255;
@@ -123,10 +121,9 @@ db_insert(uint8_t **p, uint8_t *data)
     return data;
 }
 
-uint8_t *
-db_remove(uint8_t **p, uint8_t *data)
+uint8_t *db_remove (uint8_t **p, uint8_t *data)
 {
-    if (_0_(!*p))
+    if _0_(!*p)
         return NULL;
 
     const size_t size = db_size(data);
@@ -142,7 +139,7 @@ db_remove(uint8_t **p, uint8_t *data)
         p = node->child+dir;
     }
 
-    if (_0_(db_cmp(data, *p)))
+    if _0_(db_cmp(data, *p))
         return NULL;
 
     uint8_t *r = *p;

src/iface.c

@@ -1,30 +0,0 @@
-#include "common.h"
-
-#include "str.h"
-#include "iface.h"
-
-#include <sys/ioctl.h>
-#include <net/if.h>
-
-int
-iface_set_mtu(char *dev_name, int mtu)
-{
-    struct ifreq ifr = {
-        .ifr_mtu = mtu,
-    };
-
-    str_cpy(ifr.ifr_name, dev_name, IFNAMSIZ - 1);
-
-    int fd = socket(AF_INET, SOCK_DGRAM, 0);
-
-    if (fd == -1)
-        return -1;
-
-    int ret = ioctl(fd, SIOCSIFMTU, &ifr);
-
-    int err = errno;
-    close(fd);
-    errno = err;
-
-    return ret;
-}

src/iface.h

@@ -1,3 +0,0 @@
-#pragma once
-
-int iface_set_mtu (char *, int);

src/ip.h

@@ -4,14 +4,13 @@
 
 struct ip_common {
     uint8_t version;
-    uint8_t tc;
     uint8_t proto;
     uint8_t hdr_size;
     uint16_t size;
 };
 
-_pure_ static inline uint8_t
-ip_get_version(const uint8_t *data, size_t size)
+_pure_
+static inline uint8_t ip_get_version (const uint8_t *data, size_t size)
 {
     if (size<20)
         return 0;
@@ -19,22 +18,17 @@ ip_get_version(const uint8_t *data, size_t size)
     return data[0]>>4;
 }
 
-static inline int
-ip_get_common(struct ip_common *ic, const uint8_t *data, size_t size)
+static inline int ip_get_common (struct ip_common *ic, const uint8_t *data, size_t size)
 {
     ic->version = ip_get_version(data, size);
 
     switch (ic->version) {
     case 4:
-        ic->tc = data[1];
         ic->proto = data[9];
         ic->hdr_size = (data[0]&0xF)<<2;
         ic->size = ((data[2]<<8)|data[3]);
-        if (ic->size >= 20)
         return 0;
-        break;
     case 6:
-        ic->tc = ((data[0] & 0xF) << 4) | (data[1] >> 4);
         ic->proto = data[6];
         ic->hdr_size = 40;
         ic->size = ((data[4]<<8)|data[5])+40;

src/option.c

@@ -3,8 +3,7 @@
 #include "option.h"
 #include "str.h"
 
-int
-option_str(void *data, int argc, char **argv)
+int option_str (void *data, int argc, char **argv)
 {
     if (argc<2 || str_empty(argv[1])) {
         gt_print("option `%s' need a string argument\n", argv[0]);
@@ -16,8 +15,7 @@ option_str(void *data, int argc, char **argv)
     return 1;
 }
 
-int
-option_long(void *data, int argc, char **argv)
+int option_long (void *data, int argc, char **argv)
 {
     if (argc<2 || str_empty(argv[1])) {
         gt_print("option `%s' need an integer argument\n", argv[0]);
@@ -38,8 +36,7 @@ option_long(void *data, int argc, char **argv)
     return 1;
 }
 
-int
-option_is_set(struct option *opts, const char *name)
+int option_is_set (struct option *opts, const char *name)
 {
     for (int k=0; opts[k].name; k++) {
         if (!str_cmp(opts[k].name, name))
@@ -49,8 +46,7 @@ option_is_set(struct option *opts, const char *name)
     return 0;
 }
 
-int
-option_option(void *data, int argc, char **argv)
+int option_option (void *data, int argc, char **argv)
 {
     if (!data)
         return 0;
@@ -91,8 +87,7 @@ option_option(void *data, int argc, char **argv)
     return argc;
 }
 
-static int
-option_usage(struct option *opts, int slen)
+static int option_usage (struct option *opts, int slen)
 {
     if (!opts)
         return 0;
@@ -119,8 +114,7 @@ option_usage(struct option *opts, int slen)
     return len;
 }
 
-int
-option(struct option *opts, int argc, char **argv)
+int option (struct option *opts, int argc, char **argv)
 {
     int ret = option_option(opts, argc, argv);
 

src/state.c

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

src/state.h

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

src/str.h

@@ -2,8 +2,7 @@
 
 #include "common.h"
 
-static inline size_t
-str_cpy(char *restrict dst, const char *restrict src, size_t len)
+static inline size_t str_cpy (char *restrict dst, const char *restrict src, size_t len)
 {
     if (!dst || !src)
         return 0;
@@ -18,14 +17,14 @@ str_cpy(char *restrict dst, const char *restrict src, size_t len)
     return i;
 }
 
-_pure_ static inline int
-str_empty(const char *restrict str)
+_pure_
+static inline int str_empty (const char *restrict str)
 {
     return !str || !str[0];
 }
 
-_pure_ static inline size_t
-str_cmp(const char *restrict sa, const char *restrict sb)
+_pure_
+static inline size_t str_cmp (const char *restrict sa, const char *restrict sb)
 {
     if (!sa || !sb)
         return 1;
@@ -39,8 +38,8 @@ str_cmp(const char *restrict sa, const char *restrict sb)
     return i+1;
 }
 
-_pure_ static inline size_t
-str_len(const char *restrict str)
+_pure_
+static inline size_t str_len (const char *restrict str)
 {
     if (!str)
         return 0;
@@ -48,8 +47,7 @@ str_len(const char *restrict str)
     return strlen(str);
 }
 
-static inline char *
-str_cat(const char **strs, size_t count)
+static inline char *str_cat (const char **strs, size_t count)
 {
     size_t size = 1;
 

src/tun.c

@@ -1,29 +1,25 @@
 #include "common.h"
 
-#include "ip.h"
-#include "str.h"
 #include "tun.h"
+#include "str.h"
+#include "ip.h"
 
-#include <fcntl.h>
 #include <stdio.h>
+#include <fcntl.h>
 
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 
-#include <net/if.h>
-
 #ifdef __linux__
-#define IFF_TUN 0x0001
-#define IFF_NO_PI 0x1000
-#define TUNSETIFF _IOW('T', 202, int)
-#define TUNSETPERSIST _IOW('T', 203, int)
+#include <linux/if.h>
+#include <linux/if_tun.h>
 #endif
 
 #ifdef __APPLE__
-#include <net/if_utun.h>
-#include <sys/kern_control.h>
 #include <sys/sys_domain.h>
+#include <sys/kern_control.h>
+#include <net/if_utun.h>
 #endif
 
 #if defined(__APPLE__) || defined(__OpenBSD__)
@@ -32,8 +28,7 @@
 
 #ifdef __APPLE__
 
-static int
-tun_create_by_id(char *name, size_t size, unsigned id)
+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);
 
@@ -46,9 +41,7 @@ tun_create_by_id(char *name, size_t size, unsigned id)
     str_cpy(ci.ctl_name, UTUN_CONTROL_NAME, sizeof(ci.ctl_name)-1);
 
     if (ioctl(fd, CTLIOCGINFO, &ci)) {
-        int err = errno;
         close(fd);
-        errno = err;
         return -1;
     }
 
@@ -61,9 +54,7 @@ tun_create_by_id(char *name, size_t size, unsigned id)
     };
 
     if (connect(fd, (struct sockaddr *)&sc, sizeof(sc))) {
-        int err = errno;
         close(fd);
-        errno = err;
         return -1;
     }
 
@@ -72,25 +63,21 @@ tun_create_by_id(char *name, size_t size, unsigned id)
     return fd;
 }
 
-static int
-tun_create_by_name(char *name, size_t size, char *dev_name)
+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) {
-        errno = EINVAL;
+    if (sscanf(dev_name, "utun%u", &id)!=1)
         return -1;
-    }
 
-    return tun_create_by_id(name, size, id);
+    return tun_create_by_id(name, size, id, mq);
 }
 
 #else /* not __APPLE__ */
 
 #ifdef __linux__
 
-static int
-tun_create_by_name(char *name, size_t size, char *dev_name)
+static int tun_create_by_name (char *name, size_t size, char *dev_name, int mq)
 {
     int fd = open("/dev/net/tun", O_RDWR);
 
@@ -101,6 +88,12 @@ tun_create_by_name(char *name, size_t size, char *dev_name)
         .ifr_flags = IFF_TUN|IFF_NO_PI,
     };
 
+    if (mq) {
+#ifdef IFF_MULTI_QUEUE
+        ifr.ifr_flags |= IFF_MULTI_QUEUE;
+#endif
+    }
+
     str_cpy(ifr.ifr_name, dev_name, IFNAMSIZ-1);
 
     if (ioctl(fd, TUNSETIFF, &ifr)) {
@@ -115,8 +108,7 @@ tun_create_by_name(char *name, size_t size, char *dev_name)
 
 #else /* not __linux__ not __APPLE__ */
 
-static int
-tun_create_by_name(char *name, size_t size, char *dev_name)
+static int tun_create_by_name (char *name, size_t size, char *dev_name, _unused_ int mq)
 {
     char path[64];
 
@@ -128,29 +120,32 @@ tun_create_by_name(char *name, size_t size, char *dev_name)
 
 #endif /* not __APPLE__ */
 
-static int
-tun_create_by_id(char *name, size_t size, unsigned id)
+static int tun_create_by_id (char *name, size_t size, unsigned id, int mq)
 {
     char dev_name[64];
 
     snprintf(dev_name, sizeof(dev_name), "tun%u", id);
 
-    return tun_create_by_name(name, size, dev_name);
+    return tun_create_by_name(name, size, dev_name, mq);
 }
 
 #endif
 
-int
-tun_create(char *dev_name, char **ret_name)
+int tun_create (char *dev_name, char **ret_name, int mq)
 {
     char name[64] = {0};
     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);
+            fd = tun_create_by_id(name, sizeof(name), id, mq);
     } else {
-        fd = tun_create_by_name(name, sizeof(name), dev_name);
+        fd = tun_create_by_name(name, sizeof(name), dev_name, mq);
     }
 
     if (fd!=-1 && ret_name)
@@ -159,45 +154,48 @@ tun_create(char *dev_name, char **ret_name)
     return fd;
 }
 
-int
-tun_read(int fd, void *data, size_t size)
+ssize_t tun_read (int fd, void *data, size_t size)
 {
     if (!size)
-        return 0;
+        return -1;
 
 #ifdef GT_BSD_TUN
     uint32_t family;
 
     struct iovec iov[2] = {
-        {
-            .iov_base = &family,
-            .iov_len = sizeof(family),
-        },
-        {
-            .iov_base = data,
-            .iov_len = size,
-        },
+        { .iov_base = &family, .iov_len = sizeof(family) },
+        { .iov_base = data, .iov_len = size }
     };
 
     ssize_t ret = readv(fd, iov, 2);
+#else
+    ssize_t ret = read(fd, data, size);
+#endif
 
-    if (ret <= (ssize_t)0)
-        return ret;
+    if (ret==-1) {
+        if (errno==EAGAIN || errno==EINTR)
+            return -1;
 
-    if (ret <= (ssize_t)sizeof(family))
+        if (errno)
+            perror("tun read");
+
+        return 0;
+    }
+
+#ifdef GT_BSD_TUN
+    if (ret<(ssize_t) sizeof(family))
         return 0;
 
     return ret-sizeof(family);
 #else
-    return read(fd, data, size);
+    return ret;
 #endif
 }
 
-int
-tun_write(int fd, const void *data, size_t size)
+ssize_t tun_write (int fd, const void *data, size_t size)
 {
     if (!size)
-        return 0;
+        return -1;
 
 #ifdef GT_BSD_TUN
     uint32_t family;
@@ -210,42 +208,35 @@ tun_write(int fd, const void *data, size_t size)
         family = htonl(AF_INET6);
         break;
     default:
-        errno = EINVAL;
         return -1;
     }
 
     struct iovec iov[2] = {
-        {
-            .iov_base = &family,
-            .iov_len = sizeof(family),
-        },
-        {
-            .iov_base = (void *)data,
-            .iov_len = size,
-        },
+        { .iov_base = &family, .iov_len = sizeof(family) },
+        { .iov_base = (void *) data, .iov_len = size },
     };
 
     ssize_t ret = writev(fd, iov, 2);
+#else
+    ssize_t ret = write(fd, data, size);
+#endif
 
-    if (ret <= (ssize_t)0)
-        return ret;
+    if (ret==-1) {
+        if (errno==EAGAIN || errno==EINTR)
+            return -1;
 
-    if (ret <= (ssize_t)sizeof(family))
+        if (errno)
+            perror("tun write");
+
+        return 0;
+    }
+
+#ifdef GT_BSD_TUN
+    if (ret<(ssize_t) sizeof(family))
         return 0;
 
     return ret-sizeof(family);
 #else
-    return write(fd, data, size);
-#endif
-}
-
-int
-tun_set_persist(int fd, int on)
-{
-#ifdef TUNSETPERSIST
-    return ioctl(fd, TUNSETPERSIST, on);
-#else
-    errno = ENOSYS;
-    return -1;
+    return ret;
 #endif
 }

src/tun.h

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

systemd/glorytun-client.network

@@ -1,10 +0,0 @@
-[Match]
-Name=gtc-*
-
-[Network]
-Description=Glorytun client device
-DHCP=ipv4
-
-[DHCP]
-CriticalConnection=yes
-RouteTable=200

systemd/glorytun-run

@@ -1,37 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ ! -f "$1" ]; then
-	echo "usage: $(basename "$0") FILE"
-	exit 1
-fi
-
-. "$(readlink -f "$1")"
-
-DEV="gt${HOST:+c}-$(basename "$1")"
-
-# Setting BIND is like going to 'expert mode'
-# This helper is pretty stupid and still needs some work
-if [ -n "$HOST" ]; then
-	if [ -z "$PREF" ]; then
-		PREF=$(ip rule | awk '/from all lookup main/{print $1; exit}' | tr -d :)
-		PREF=$((PREF-1))
-	fi
-	if [ -z "$BIND" ]; then
-		BIND=$(ip route get "$HOST" | awk '/src/{getline;print $0}' RS=' ')
-		ip rule add from "$BIND" table main pref "$((PREF-1))" || true
-	fi
-	ip rule add from all table 200 pref "$PREF" || true
-fi
-
-exec glorytun \
-	v4only \
-	keyfile "$1".key \
-	dev "$DEV" \
-	${HOST:+host "$HOST"} \
-	${PORT:+port "$PORT"} \
-	${BIND:+bind "$BIND"} \
-	${BIND_PORT:+bind-port "$BIND_PORT"} \
-	${MTU:+mtu "$MTU"} \
-	${MTU_AUTO:+mtu-auto}

systemd/glorytun-setup

@@ -1,41 +0,0 @@
-#!/bin/sh
-
-set -e
-
-_ask() {
-	printf "%s: " "$1"
-	read -r "$2"
-}
-
-_ask "Config filename (tun0)" NAME
-NAME=${NAME:-tun0}
-
-if [ -f /etc/glorytun/"$NAME" ]; then
-	echo "This config already exit!"
-	exit 1
-fi
-
-_ask "Server ip (enter for server conf)" HOST
-
-_ask "Server key (enter to generate a new one)" KEY
-if [ -z "$KEY" ]; then
-	KEY=$(glorytun keygen)
-	echo "Your new key: $KEY"
-fi
-
-# install files
-mkdir -p /etc/glorytun
-
-cat > /etc/glorytun/"$NAME" <<EOF
-${HOST:+HOST="$HOST"}
-MTU_AUTO=yes
-EOF
-
-( umask 077; echo "$KEY" > /etc/glorytun/"$NAME".key )
-
-# start services
-_ask "Start glorytun now ? (enter to skip)" START
-case "$START" in y*|Y*)
-	systemctl restart systemd-networkd
-	systemctl start glorytun@"$NAME" ;;
-esac

systemd/glorytun.network

@@ -1,14 +0,0 @@
-[Match]
-Name=gt-*
-
-[Network]
-Description=Glorytun server device
-Address=0.0.0.0/24
-DHCPServer=yes
-IPMasquerade=yes
-
-[DHCPServer]
-PoolOffset=2
-PoolSize=1
-EmitDNS=yes
-DNS=9.9.9.9

systemd/glorytun@.service.in

@@ -1,12 +0,0 @@
-[Unit]
-Description=Glorytun on %I
-After=network.target
-
-[Service]
-Type=simple
-Restart=always
-ExecStart=@bindir@/glorytun-run /etc/glorytun/%i
-CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_RAW
-
-[Install]
-WantedBy=multi-user.target