Update README.md

Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>

.gitignore

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

.gitmodules

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

.travis.yml

@@ -24,7 +24,12 @@ deploy:
     api_key:
         secure: Ira1jd3j+17QVFbJ7KlkytTNp0oMZLTqCWPQLxNHLEt32PVY/IPs/16BcvTbFpKrY+Ma7E3KCihfufTVG8T+jRlZ5hFO7HNpoQMgi7L7yZZAGScYO5pnMQvsr8O9hf7jzSi1DjFXgFHznbPJJ3lOSwegcqzSrbZflokiCR50GTLLWewHoPpfs+1gJ5XbtVyRhZlmXhMPC0NEH2sh33X2WdUiKUJUMOnlYC0atPBL+4n12qxnugF9YA9wPK5NHJSLiPHue7I2rHlSrOLX5NkN3vqnEvusiuIFQX1y0NuKtkpOscFD9n1CLHThGLuzMvPlwpdQfzRMVxwjYFGu6Ma5alf64ksFnMKl8Oo0yCXEA7WvHXz+qUai/a1gzYZLTGuasHtjrHN/mgKxM4QRSiHo8t5hj3CczUW+OFglytawZQyGjyUUiKdwx2kvlO96RVDIYEhUD4DeHzHR8rhvDLmlMlGAWqUPXq7d4D+bExqKmqWCCSkhrbubq5B1kChRmgw7/gly4SryqGy+R0xsC4oq9jUUxd7Sl801BIKcYDb5r5gFSw+hEhOzBb+uE2xJYFNO2KZ+eG69lkFeG3oNJMTy8afs8fRRUXq0poQJ39wFWerps3Md7h8Sxs61YLIAKHvLJJMfoMI+AORTcjnnpqujMhgWGWt8wLhJZdxaSycoQkU=
     skip_cleanup: true
-    file: "glorytun-*.tar.gz"
+    file_glob: true
+    file: glorytun-*.tar.gz
     on:
         tags: true
         repo: angt/glorytun
+        condition: "${TRAVIS_OS_NAME}-${CC} == linux-gcc"
+
+after_deploy:
+    - md5sum glorytun-*.tar.gz

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015, angt
+Copyright (c) 2015-2016, angt
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile.am

@@ -6,17 +6,26 @@ glorytun_CFLAGS = $(libsodium_CFLAGS)
 glorytun_LDADD = $(libsodium_LIBS)
 glorytun_SOURCES = \
     src/common.h \
-    src/common-static.h \
     src/common.c \
-    src/ip-static.h \
+    src/ip.h \
+    src/str.h \
     src/main.c \
     src/option.c \
     src/option.h \
     src/tun.c \
-    src/tun.h
+    src/tun.h \
+    src/iface.c \
+    src/iface.h \
+    src/db.c \
+    src/db.h
+
+glorytun_SOURCES += \
+    mud/mud.h \
+    mud/mud.c
 
 EXTRA_DIST = \
-	LICENSE \
+    LICENSE \
-	README.md \
+    README.md \
-	autogen.sh \
+    VERSION \
-	version.sh
+    autogen.sh \
+    version.sh

README.md

@@ -1,22 +1,53 @@
 # Glorytun
 
-Small, Simple and Stupid **TCP** VPN.
+Small, Simple and Stupid VPN over [mud](https://github.com/angt/mud).
 
-**Work In Progress:** Do not touch! This code will probably format your harddisk!
+### Build and Install
 
-Glorytun depends on [libsodium](https://github.com/jedisct1/libsodium) version >= 1.0.4
+Glorytun depends on [libsodium](https://github.com/jedisct1/libsodium) version >= 1.0.4.
-and needs an AES-NI capable CPU.
 
-To build and install the latest version:
+On Ubuntu, the following command should be sufficient:
 
-    $ git clone https://github.com/angt/glorytun
+    $ sudo apt-get install meson libsodium-dev pkg-config
+
+Grab the latest release from github:
+
+    $ git clone https://github.com/angt/glorytun --recursive
     $ cd glorytun
-    $ ./autogen.sh
-    $ ./configure
-    $ make
-    # make install
 
-To create and use a new secret key:
+To build and install the latest version with [meson](http://mesonbuild.com):
 
-    $ dd if=/dev/urandom of=glorytun.key bs=32 count=1
+    $ meson build
-    # glorytun keyfile glorytun.key [...]
+    $ 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.
+
+Fist, 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
+
+---
+
+For feature requests and bug reports, please create an [issue](https://github.com/angt/glorytun/issues).

configure.ac

@@ -4,6 +4,7 @@ AC_INIT([glorytun],
         [https://github.com/angt/glorytun/issues],
         [glorytun],
         [https://github.com/angt/glorytun])
+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])
@@ -13,8 +14,9 @@ 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])
 PKG_CHECK_MODULES([libsodium], [libsodium >= 1.0.4])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

meson.build

@@ -0,0 +1,49 @@
+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/common-static.h

@@ -1,142 +0,0 @@
-#pragma once
-
-#include "common.h"
-
-#include <unistd.h>
-#include <errno.h>
-
-static inline void byte_set (void *dst, const char value, size_t size)
-{
-    if (!dst)
-        return;
-
-    char *restrict d = dst;
-
-    while (size--)
-        *d++ = value;
-}
-
-static inline void byte_cpy (void *dst, const void *src, size_t size)
-{
-    if (!dst || !src)
-        return;
-
-    char *restrict d = dst;
-    const char *restrict s = src;
-
-    while (size--)
-        *d++ = *s++;
-}
-
-static inline size_t str_cpy (char *restrict dst, const char *restrict src, size_t len)
-{
-    if (!dst || !src)
-        return 0;
-
-    size_t i;
-
-    for (i=0; i<len && src[i]; i++)
-        dst[i] = src[i];
-
-    dst[i] = 0;
-
-    return i;
-}
-
-static inline int str_cmp (const char *restrict sa, const char *restrict sb)
-{
-    if (!sa || !sb)
-        return 1;
-
-     while (*sa==*sb++)
-         if (!*sa++)
-             return 0;
-
-    return 1;
-}
-
-static inline size_t str_len (const char *restrict str)
-{
-    if (!str)
-        return 0;
-
-    size_t i = 0;
-
-    while (str[i])
-        i++;
-
-    return i;
-}
-
-static inline char *str_cat (const char *const strs[], size_t count)
-{
-    size_t size = 1;
-
-    for (size_t i=0; i<count; i++)
-        size += str_len(strs[i]);
-
-    char *str = malloc(size);
-
-    if (!str)
-        return NULL;
-
-    char *p = str;
-
-    for (size_t i=0; i<count; i++) {
-        size_t len = str_len(strs[i]);
-        byte_cpy(p, strs[i], len);
-        p += len;
-    }
-
-    p[0] = 0;
-
-    return str;
-}
-
-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;
-}
-
-static inline size_t buffer_size (buffer_t *buffer)
-{
-    return buffer->end-buffer->data;
-}
-
-static inline size_t buffer_write_size (buffer_t *buffer)
-{
-    return buffer->end-buffer->write;
-}
-
-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->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) {
-            byte_cpy(buffer->data, src, size);
-            buffer->read  -= src-buffer->data;
-            buffer->write -= src-buffer->data;
-        }
-    }
-}

src/common.c

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

src/common.h

@@ -2,8 +2,11 @@
 
 #include <stdlib.h>
 #include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
 
-#define COUNT(x) (sizeof(x)/sizeof(x[0]))
+#define COUNT(x)       (sizeof(x)/sizeof(x[0]))
 
 #define ALIGN_SIZE     (1<<4)
 #define ALIGN_MASK     (ALIGN_SIZE-1)
@@ -17,21 +20,23 @@
 #define _1_(x)         (__builtin_expect((x), 1))
 #define _0_(x)         (__builtin_expect((x), 0))
 
-#define _printf_(A,B)  __attribute__((format(printf,A,B)))
+#define CLZ(x)         (__builtin_clz(x))
-#define _noreturn_     __attribute__((noreturn))
-#define _unused_       __attribute__((unused))
-#define _align_(...)   __attribute__((aligned(__VA_ARGS__)))
 
-typedef struct buffer buffer_t;
+#define _printf_(A,B)  __attribute__ ((format(printf,A,B)))
+#define _noreturn_     __attribute__ ((noreturn))
+#define _unused_       __attribute__ ((unused))
+#define _pure_         __attribute__ ((pure))
+#define _const_        __attribute__ ((const))
+#define _align_(...)   __attribute__ ((aligned(__VA_ARGS__)))
 
-struct buffer {
+#undef MAX
-    uint8_t *data;
+#define MAX(x,y) ({ __typeof__(x) X=(x); __typeof__(y) Y=(y); X > Y ? X : Y; })
-    uint8_t *read;
+
-    uint8_t *write;
+#undef MIN
-    uint8_t *end;
+#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

@@ -0,0 +1,158 @@
+#include "common.h"
+
+#include "db.h"
+#include "str.h"
+
+#define CBIT(X) (1 & (intptr_t)(X))
+#define CBIT_PTR(X) (uint8_t *)(1 | (intptr_t)(X))
+#define CBIT_NODE(X) (struct node *)(1 ^ (intptr_t)(X))
+
+struct node {
+    uint8_t *child[2];
+    uint32_t point;
+};
+
+_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)
+{
+    const size_t size = a[0];
+
+    if (size != b[0])
+        return 1;
+
+    if (!size) {
+        size_t i = str_cmp((char *)a + 1, (char *)b + 1);
+        return i ? i + 1 : 0;
+    }
+
+    for (size_t i = 1; i <= size; i++) {
+        if (a[i] != b[i])
+            return i + 1;
+    }
+
+    return 0;
+}
+
+_pure_ static inline int
+db_dir(const uint32_t point, uint8_t *data, const size_t size)
+{
+    const size_t pos = point >> 8;
+
+    if (pos >= size)
+        return 0;
+
+    return ((point | data[pos]) & 255) == 255;
+}
+
+uint8_t *
+db_search(uint8_t **p, uint8_t *data)
+{
+    if (_0_(!*p))
+        return NULL;
+
+    uint8_t *r = *p;
+    const size_t size = db_size(data);
+
+    while (CBIT(r)) {
+        struct node *node = CBIT_NODE(r);
+        r = node->child[db_dir(node->point, data, size)];
+    }
+
+    if (!db_cmp(r, data))
+        return r;
+
+    return NULL;
+}
+
+uint8_t *
+db_insert(uint8_t **p, uint8_t *data)
+{
+    if (_0_(CBIT(data)))
+        return NULL;
+
+    if (_0_(!*p)) {
+        *p = data;
+        return data;
+    }
+
+    uint8_t *r = *p;
+    size_t size = db_size(data);
+
+    while (CBIT(r)) {
+        struct node *node = CBIT_NODE(r);
+        r = node->child[db_dir(node->point, data, size)];
+    }
+
+    const size_t diff = db_cmp(r, data);
+
+    if (_0_(!diff))
+        return r;
+
+    const size_t pos = diff - 1;
+    const uint8_t mask = ~((1u << 31) >> CLZ(r[pos] ^ data[pos]));
+    const size_t point = (pos << 8) | mask;
+
+    while (CBIT(*p)) {
+        struct node *node = CBIT_NODE(*p);
+
+        if (node->point > point)
+            break;
+
+        p = node->child + db_dir(node->point, data, size);
+    }
+
+    struct node *node = malloc(sizeof(struct node));
+
+    if (_0_(!node))
+        return NULL;
+
+    const int dir = (mask | r[pos]) == 255;
+
+    node->child[dir] = *p;
+    node->child[1 - dir] = data;
+    node->point = point;
+
+    *p = CBIT_PTR(node);
+
+    return data;
+}
+
+uint8_t *
+db_remove(uint8_t **p, uint8_t *data)
+{
+    if (_0_(!*p))
+        return NULL;
+
+    const size_t size = db_size(data);
+
+    uint8_t **p_old = NULL;
+    struct node *node = NULL;
+    int dir = 0;
+
+    while (CBIT(*p)) {
+        p_old = p;
+        node = CBIT_NODE(*p);
+        dir = db_dir(node->point, data, size);
+        p = node->child + dir;
+    }
+
+    if (_0_(db_cmp(data, *p)))
+        return NULL;
+
+    uint8_t *r = *p;
+
+    if (p_old) {
+        *p_old = node->child[1 - dir];
+        free(node);
+    } else {
+        *p = NULL;
+    }
+
+    return r;
+}

src/db.h

@@ -0,0 +1,7 @@
+#pragma once
+
+#include <stdint.h>
+
+uint8_t *db_search (uint8_t **, uint8_t *);
+uint8_t *db_insert (uint8_t **, uint8_t *);
+uint8_t *db_remove (uint8_t **, uint8_t *);

src/iface.c

@@ -0,0 +1,29 @@
+#include "common.h"
+
+#include "str.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

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

src/ip-static.h

@@ -1,39 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-static inline int ip_get_version (const uint8_t *data, size_t size)
-{
-    if (size<20)   // XXX
-        return -1; // XXX
-
-    return data[0]>>4;
-}
-
-static inline void ip_set_size (uint8_t *data, size_t size)
-{
-    data[2] = 0xFF&(size>>8);
-    data[3] = 0xFF&(size);
-}
-
-static inline ssize_t ip_get_size (const uint8_t *data, size_t size)
-{
-    switch (ip_get_version(data, size)) {
-    case 4:
-        return (data[2]<<8)|data[3];
-    case -1:
-        return -1;
-    }
-
-    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/ip.h

@@ -0,0 +1,45 @@
+#pragma once
+
+#include <stdint.h>
+
+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)
+{
+    if (size < 20)
+        return 0;
+
+    return data[0] >> 4;
+}
+
+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;
+        return 0;
+    }
+
+    return -1;
+}

src/option.c

@@ -1,25 +1,25 @@
-#include "common-static.h"
+#include "common.h"
-
-#include <stdio.h>
-#include <stdlib.h>
 
 #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 || !argv[1]) {
+    if (argc < 2 || str_empty(argv[1])) {
         gt_print("option `%s' need a string argument\n", argv[0]);
         return -1;
     }
 
-    byte_cpy(data, &argv[1], sizeof(argv[1]));
+    memcpy(data, &argv[1], sizeof(argv[1]));
 
     return 1;
 }
 
-int option_long (void *data, int argc, char **argv)
+int
+option_long(void *data, int argc, char **argv)
 {
-    if (argc<2 || !argv[1]) {
+    if (argc < 2 || str_empty(argv[1])) {
         gt_print("option `%s' need an integer argument\n", argv[0]);
         return -1;
     }
@@ -28,19 +28,20 @@ int option_long (void *data, int argc, char **argv)
     char *end;
     long val = strtol(argv[1], &end, 0);
 
-    if (errno || argv[1]==end) {
+    if (errno || argv[1] == end) {
         gt_print("argument `%s' is not a valid integer\n", argv[1]);
         return -1;
     }
 
-    byte_cpy(data, &val, sizeof(val));
+    memcpy(data, &val, sizeof(val));
 
     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++) {
+    for (int k = 0; opts[k].name; k++) {
         if (!str_cmp(opts[k].name, name))
             return opts[k].set;
     }
@@ -48,20 +49,21 @@ int 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;
 
     struct option *opts = (struct option *)data;
 
-    for (int k=0; opts[k].name; k++)
+    for (int k = 0; opts[k].name; k++)
         opts[k].set = 0;
 
-    for (int i=1; i<argc; i++) {
+    for (int i = 1; i < argc; i++) {
         int found = 0;
 
-        for (int k=0; opts[k].name; k++) {
+        for (int k = 0; opts[k].name; k++) {
             if (str_cmp(opts[k].name, argv[i]))
                 continue;
 
@@ -70,9 +72,9 @@ int option_option (void *data, int argc, char **argv)
                 return -1;
             }
 
-            int ret = opts[k].call(opts[k].data, argc-i, &argv[i]);
+            int ret = opts[k].call(opts[k].data, argc - i, &argv[i]);
 
-            if (ret<0)
+            if (ret < 0)
                 return -1;
 
             opts[k].set = 1;
@@ -83,29 +85,30 @@ int option_option (void *data, int argc, char **argv)
         }
 
         if (!found)
-            return i-1;
+            return i - 1;
     }
 
     return argc;
 }
 
-static int option_usage (struct option *opts, int slen)
+static int
+option_usage(struct option *opts, int slen)
 {
     if (!opts)
         return 0;
 
     int len = 0;
 
-    for (int k=0; opts[k].name; k++) {
+    for (int k = 0; opts[k].name; k++) {
-        if (len>40) {
+        if (len > 40) {
             gt_print("\n%*s", slen, "");
             len = 0;
         }
 
         len += gt_print(" [%s", opts[k].name);
 
-        if (opts[k].call==option_option) {
+        if (opts[k].call == option_option) {
-            len += option_usage((struct option *)opts[k].data, slen+len);
+            len += option_usage((struct option *)opts[k].data, slen + len);
         } else {
             len += gt_print(" ARG");
         }
@@ -116,21 +119,22 @@ static int 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);
 
-    if (ret==argc)
+    if (ret == argc)
         return 0;
 
-    if (ret<0 || ret+1>=argc)
+    if (ret < 0 || ret + 1 >= argc)
         return 1;
 
-    gt_print("option `%s' is unknown\n", argv[ret+1]);
+    gt_print("option `%s' is unknown\n", argv[ret + 1]);
 
     int slen = gt_print("usage: %s", argv[0]);
 
-    if (slen>40) {
+    if (slen > 40) {
         slen = 12;
         gt_print("\n%*s", slen, "");
     }

src/str.h

@@ -0,0 +1,75 @@
+#pragma once
+
+#include "common.h"
+
+static inline size_t
+str_cpy(char *restrict dst, const char *restrict src, size_t len)
+{
+    if (!dst || !src)
+        return 0;
+
+    size_t i;
+
+    for (i = 0; i < len && src[i]; i++)
+        dst[i] = src[i];
+
+    dst[i] = 0;
+
+    return i;
+}
+
+_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)
+{
+    if (!sa || !sb)
+        return 1;
+
+    size_t i = 0;
+
+    while (sa[i] == sb[i])
+        if (!sa[i++])
+            return 0;
+
+    return i + 1;
+}
+
+_pure_ static inline size_t
+str_len(const char *restrict str)
+{
+    if (!str)
+        return 0;
+
+    return strlen(str);
+}
+
+static inline char *
+str_cat(const char **strs, size_t count)
+{
+    size_t size = 1;
+
+    for (size_t i = 0; i < count; i++)
+        size += str_len(strs[i]);
+
+    char *str = malloc(size);
+
+    if (!str)
+        return NULL;
+
+    char *p = str;
+
+    for (size_t i = 0; i < count; i++) {
+        size_t len = str_len(strs[i]);
+        memcpy(p, strs[i], len);
+        p += len;
+    }
+
+    p[0] = 0;
+
+    return str;
+}

src/tun.c

@@ -1,168 +1,203 @@
-#include "common-static.h"
+#include "common.h"
-#include "ip-static.h"
 
+#include "ip.h"
+#include "str.h"
 #include "tun.h"
 
-#include <stdio.h>
 #include <fcntl.h>
+#include <stdio.h>
 
 #include <sys/ioctl.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 
+#include <net/if.h>
+
 #ifdef __linux__
-# include <linux/if.h>
+#define IFF_TUN 0x0001
-# include <linux/if_tun.h>
+#define IFF_NO_PI 0x1000
+#define TUNSETIFF _IOW('T', 202, int)
+#define TUNSETPERSIST _IOW('T', 203, int)
 #endif
 
 #ifdef __APPLE__
-# include <sys/sys_domain.h>
+#include <net/if_utun.h>
-# include <sys/kern_control.h>
+#include <sys/kern_control.h>
-# include <net/if_utun.h>
+#include <sys/sys_domain.h>
 #endif
 
 #if defined(__APPLE__) || defined(__OpenBSD__)
-# define GT_BSD_TUN 1
+#define GT_BSD_TUN
 #endif
 
-#ifdef __linux__
+#ifdef __APPLE__
-int tun_create (char *name, int multiqueue)
-{
-    int fd = open("/dev/net/tun", O_RDWR);
 
-    if (fd<0) {
+static int
-        perror("open /dev/net/tun");
+tun_create_by_id(char *name, size_t size, unsigned id)
+{
+    int fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
+
+    if (fd == -1)
+        return -1;
+
+    struct ctl_info ci;
+
+    memset(&ci, 0, sizeof(ci));
+    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;
     }
 
-    struct ifreq ifr = {
+    struct sockaddr_ctl sc = {
-        .ifr_flags = IFF_TUN|IFF_NO_PI,
+        .sc_id = ci.ctl_id,
+        .sc_len = sizeof(sc),
+        .sc_family = AF_SYSTEM,
+        .ss_sysaddr = AF_SYS_CONTROL,
+        .sc_unit = id + 1,
     };
 
-    if (multiqueue) {
+    if (connect(fd, (struct sockaddr *)&sc, sizeof(sc))) {
-#ifdef IFF_MULTI_QUEUE
+        int err = errno;
-        ifr.ifr_flags |= IFF_MULTI_QUEUE;
+        close(fd);
-#else
+        errno = err;
-        gt_na("IFF_MULTI_QUEUE");
-#endif
-    }
-
-    str_cpy(ifr.ifr_name, name, IFNAMSIZ-1);
-
-    int ret = ioctl(fd, TUNSETIFF, &ifr);
-
-    if (ret<0) {
-        perror("ioctl TUNSETIFF");
         return -1;
     }
 
-    gt_log("tun name: %s\n", ifr.ifr_name);
+    snprintf(name, size, "utun%u", id);
 
     return fd;
 }
-#elif defined(__APPLE__)
+
-int tun_create (_unused_ char *name, _unused_ int mq)
+static int
+tun_create_by_name(char *name, size_t size, char *dev_name)
 {
-    for (unsigned dev_id = 0; dev_id < 32; dev_id++) {
+    unsigned id = 0;
-        struct ctl_info ci;
 
-        byte_set(&ci, 0, sizeof(ci));
+    if (sscanf(dev_name, "utun%u", &id) != 1) {
-        str_cpy(ci.ctl_name, UTUN_CONTROL_NAME, sizeof(ci.ctl_name)-1);
+        errno = EINVAL;
-
+        return -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 tun_create_by_id(name, size, id);
 }
-#else
+
-int tun_create (_unused_ char *name, _unused_ int mq)
+#else /* not __APPLE__ */
+
+#ifdef __linux__
+
+static int
+tun_create_by_name(char *name, size_t size, char *dev_name)
 {
-    for (unsigned dev_id = 0; dev_id < 32; dev_id++) {
+    int fd = open("/dev/net/tun", O_RDWR);
-        char dev_path[11];
 
-        snprintf(dev_path, sizeof(dev_path), "/dev/tun%u", dev_id);
+    if (fd == -1)
+        return -1;
 
-        int fd = open(dev_path, O_RDWR);
+    struct ifreq ifr = {
+        .ifr_flags = IFF_TUN | IFF_NO_PI,
+    };
 
-        if (fd==-1)
+    str_cpy(ifr.ifr_name, dev_name, IFNAMSIZ - 1);
-            continue;
 
-        gt_log("tun name: %s\n", dev_path);
+    if (ioctl(fd, TUNSETIFF, &ifr)) {
-
+        close(fd);
-        return fd;
+        return -1;
     }
 
-    return -1;
+    str_cpy(name, ifr.ifr_name, size - 1);
+
+    return fd;
 }
+
+#else /* not __linux__ not __APPLE__ */
+
+static int
+tun_create_by_name(char *name, size_t size, char *dev_name)
+{
+    char path[64];
+
+    snprintf(path, sizeof(path), "/dev/%s", dev_name);
+    str_cpy(name, dev_name, size - 1);
+
+    return open(path, O_RDWR);
+}
+
+#endif /* not __APPLE__ */
+
+static int
+tun_create_by_id(char *name, size_t size, unsigned id)
+{
+    char dev_name[64];
+
+    snprintf(dev_name, sizeof(dev_name), "tun%u", id);
+
+    return tun_create_by_name(name, size, dev_name);
+}
+
 #endif
 
-ssize_t tun_read (int fd, void *data, size_t size)
+int
+tun_create(char *dev_name, char **ret_name)
+{
+    char name[64] = {0};
+    int fd = -1;
+
+    if (str_empty(dev_name)) {
+        for (unsigned id = 0; id < 32 && fd == -1; id++)
+            fd = tun_create_by_id(name, sizeof(name), id);
+    } else {
+        fd = tun_create_by_name(name, sizeof(name), dev_name);
+    }
+
+    if (fd != -1 && ret_name)
+        *ret_name = strdup(name);
+
+    return fd;
+}
+
+int
+tun_read(int fd, void *data, size_t size)
 {
     if (!size)
-        return -1;
+        return 0;
 
 #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==-1) {
+    if (ret <= (ssize_t)0)
-        if (errno==EAGAIN || errno==EINTR)
+        return ret;
-            return -1;
 
-        if (errno)
+    if (ret <= (ssize_t)sizeof(family))
-            perror("tun read");
-
-        return 0;
-    }
-
-#ifdef GT_BSD_TUN
-    if (ret<(ssize_t) sizeof(family))
         return 0;
 
-    return ret-sizeof(family);
+    return ret - sizeof(family);
 #else
-    return ret;
+    return read(fd, data, size);
 #endif
 }
 
-ssize_t tun_write (int fd, const void *data, size_t size)
+int
+tun_write(int fd, const void *data, size_t size)
 {
     if (!size)
-        return -1;
+        return 0;
 
 #ifdef GT_BSD_TUN
     uint32_t family;
@@ -175,35 +210,42 @@ ssize_t 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==-1) {
+    if (ret <= (ssize_t)0)
-        if (errno==EAGAIN || errno==EINTR)
+        return ret;
-            return -1;
 
-        if (errno)
+    if (ret <= (ssize_t)sizeof(family))
-            perror("tun write");
-
-        return 0;
-    }
-
-#ifdef GT_BSD_TUN
-    if (ret<(ssize_t) sizeof(family))
         return 0;
 
-    return ret-sizeof(family);
+    return ret - sizeof(family);
 #else
-    return ret;
+    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;
 #endif
 }

src/tun.h

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

systemd/glorytun-client.network

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

systemd/glorytun-run

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+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" ] && [ -z "$BIND" ]; then
+	BIND=$(ip route get "$HOST" | awk '/src/{getline;print $0}' RS=' ')
+	ip rule add from "$BIND" table main pref 32000
+	ip rule add from all table 200 pref 32001
+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

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+set -e
+
+_ask() {
+	printf "%s: " "$1"
+	read -r "$2"
+}
+
+_NAME=tun0
+_ask "Config filename ($_NAME)" NAME
+NAME=${NAME:-$_NAME}
+
+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) || exit
+	echo "Your new key: $KEY"
+fi
+
+mkdir -p /etc/glorytun
+FILE="/etc/glorytun/$NAME"
+
+echo "${HOST:+HOST=$HOST}" > "$FILE"
+
+touch "$FILE.key"
+chmod 600 "$FILE.key"
+echo "$KEY" > "$FILE.key"
+
+_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

@@ -0,0 +1,14 @@
+[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

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

version.sh

@@ -1,9 +1,13 @@
 #!/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=`basename \`pwd\`` \
+[ -z "${VERSION}" ] && VERSION=`cat VERSION 2>/dev/null`
-                    && VERSION=${VERSION#*-}
 
-printf ${VERSION}
+[ -z "${VERSION}" ] && VERSION=0.0.0
+
+[ "$1" = "major"  ] && printf ${VERSION%%.*} \
+                    && exit 0
+
+printf ${VERSION} | tee VERSION