Try to limit pkt drops

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

.github/workflows/build.yml

@@ -0,0 +1,24 @@
+name: Build
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, macOS-latest]
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Build glorytun
+      run: |
+          git submodule update --init --recursive
+          ./sodium.sh
+          make prefix=. install
+
+    - uses: actions/upload-artifact@v1
+      with:
+        name: bin
+        path: ./bin

.gitignore

@@ -10,6 +10,7 @@ configure
 build-aux
 .deps
 .dirstamp
+.static
 glorytun
 build*
 VERSION

.gitmodules

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

LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2015-2016, angt
+Copyright (c) 2015-2019, Adrien Gallouët <adrien@gallouet.fr>
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile

@@ -0,0 +1,35 @@
+NAME    := glorytun
+VERSION := $(shell ./version.sh)
+DIST    := $(NAME)-$(VERSION)
+
+DESTDIR ?=
+CC      ?= gcc
+INSTALL ?= install
+prefix  ?= /usr
+CFLAGS  ?= -std=c11 -O2 -Wall -fstack-protector-strong
+
+FLAGS := $(CFLAGS) $(LDFLAGS) $(CPPFLAGS)
+FLAGS += -DPACKAGE_NAME=\"$(NAME)\" -DPACKAGE_VERSION=\"$(VERSION)\"
+
+FLAGS += -I.static/$(CROSS)/libsodium-stable/src/libsodium/include
+FLAGS += -L.static/$(CROSS)/libsodium-stable/src/libsodium/.libs
+
+SRC := argz/argz.c mud/mud.c mud/aegis256/aegis256.c $(wildcard src/*.c)
+
+.PHONY: $(NAME)
+$(NAME):
+	@echo "Building $(NAME)"
+	@$(CC) $(FLAGS) -o $(NAME) $(SRC) -lsodium -lm
+
+.PHONY: install
+install: $(NAME)
+	@echo "Installing $(NAME)"
+	@$(INSTALL) -m 755 -d $(DESTDIR)$(prefix)/bin
+	@$(INSTALL) -m 755 -s $(NAME) $(DESTDIR)$(prefix)/bin
+
+.PHONY: dist
+dist:
+	@echo "Building $(DIST).tar.gz"
+	@(git --git-dir=.git ls-files --recurse-submodules -- ':!:.*' ':!:**/.*' && echo VERSION) | ( \
+	    tar zcf $(DIST).tar.gz -T- --transform 's:^:$(DIST)/:' || \
+	    tar zcf $(DIST).tar.gz -T- -s ':^:$(DIST)/:' ) 2>/dev/null

Makefile.am

@@ -5,27 +5,37 @@ bin_PROGRAMS = glorytun
 glorytun_CFLAGS = $(libsodium_CFLAGS)
 glorytun_LDADD = $(libsodium_LIBS)
 glorytun_SOURCES = \
-    src/common.h \
+    argz/argz.c \
+    argz/argz.h \
+    mud/mud.c \
+    mud/mud.h \
+    mud/aegis256/aegis256.c \
+    mud/aegis256/aegis256.h \
+    src/bench.c \
+    src/bind.c \
     src/common.c \
-    src/ip.h \
+    src/common.h \
-    src/str.h \
+    src/ctl.c \
-    src/main.c \
+    src/ctl.h \
-    src/option.c \
-    src/option.h \
-    src/tun.c \
-    src/tun.h \
     src/iface.c \
     src/iface.h \
-    src/db.c \
+    src/ip.h \
-    src/db.h
+    src/keygen.c \
-
+    src/main.c \
-glorytun_SOURCES += \
+    src/path.c \
-    mud/mud.h \
+    src/set.c \
-    mud/mud.c
+    src/show.c \
+    src/str.h \
+    src/tun.c \
+    src/tun.h
 
 EXTRA_DIST = \
     LICENSE \
     README.md \
     VERSION \
     autogen.sh \
+    meson.build \
+    mud/LICENSE \
+    mud/README.md \
+    systemd \
     version.sh

README.md

@@ -1,52 +1,132 @@
 # Glorytun
 
-Small, Simple and Stupid VPN over [mud](https://github.com/angt/mud).
+Glorytun is a small, simple and secure VPN over [mud](https://github.com/angt/mud).
 
-### Build and Install
+## Compatibility
 
-Glorytun depends on [libsodium](https://github.com/jedisct1/libsodium) version >= 1.0.4.
+Glorytun only depends on [libsodium](https://github.com/jedisct1/libsodium) version >= 1.0.4.
+Which can be installed on a wide variety of systems.
 
-On Ubuntu, the following command should be sufficient:
+Linux is the platform of choice but the code is standard so it should be easily ported on other posix systems.
+It was successfully tested on OpenBSD, FreeBSD and MacOS.
 
-    $ sudo apt-get install meson libsodium-dev pkg-config
+IPv4 and IPv6 are supported.
 
-Grab the latest release from github:
+## Features
+
+The key features of Glorytun come directly from mud:
+
+ * **Fast and highly secure**
+
+   The use of UDP and [libsodium](https://github.com/jedisct1/libsodium) allows you to secure
+   your communications without impacting performance.
+   Glorytun uses AEGIS-256 only if AES-NI is available otherwise ChaCha20Poly1305 is used.
+   If you are not cpu bounded, you can force the use of ChaCha20Poly1305 for higher security.
+   All messages are encrypted, authenticated and marked with a timestamp.
+   Perfect forward secrecy is also implemented with ECDH over Curve25519.
+
+ * **Multipath and active failover**
+
+   This is the main feature of Glorytun that allows to build an SD-WAN like service.
+   This allows a TCP connection to explore and exploit multiple links without being disconnected.
+   Aggregation should work on all conventional links, only very high latency (+500ms) links are not recommended for now.
+
+ * **Traffic shaping**
+
+   Shaping is very important in network, it allows to keep a low latency without sacrificing the bandwidth.
+   It also helps the multipath scheduler to make better decisions.
+   Currently it must be configured by hand, but soon Glorytun will do it for you.
+
+ * **Path MTU discovery without ICMP**
+
+   Bad MTU configuration is a very common problem in the world of VPN.
+   As it is critical, Glorytun will try to setup it correctly by guessing its value.
+   It doesn't rely on ICMP Next-hop MTU to avoid black holes.
+   In asymmetric situations the minimum MTU is selected.
+
+## Caveats
+
+Glorytun is strongly secure by default and protects against replay attacks,
+the clock between the client and the server must be synchronized.
+By default, an offset of 10min is accepted.
+
+## Build and Install
+
+You will need `git`, `make`, `gcc` and `libsodium`:
+
+    $ sudo apt install git make gcc libsodium-dev    # debian based
+    $ sudo yum install git make gcc libsodium-devel  # redhat based
+
+To build and install the latest release from github:
 
     $ git clone https://github.com/angt/glorytun --recursive
     $ cd glorytun
+    $ sudo make install
 
-To build and install the latest version with [meson](http://mesonbuild.com):
+This will install the binary in `/usr/bin` by default.
-
-    $ meson build
-    $ sudo ninja -C build install
 
 The more classical autotools suite is also available.
 
-### Easy setup with systemd
+## Usage
 
-Just call `glorytun-setup` and follow the instructions.
+Just run `glorytun` with no arguments to view the list of available commands:
 
-Fist, setup the server:
+```
+$ glorytun
+available commands:
 
-    $ sudo glorytun-setup
+  show     show tunnel info
-    Config filename (tun0):
+  bench    start a crypto bench
-    Server ip (enter for server conf):
+  bind     start a new tunnel
-    Server key (enter to generate a new one):
+  set      change tunnel properties
-    Your new key: NEW_KEY
+  keygen   generate a new secret key
-    Start glorytun now ? (enter to skip): y
+  path     manage paths
+  version  show version
 
-Copy the new generated key and use it when configuring the client:
+```
 
-    $ sudo glorytun-setup
+Use the keyword `help` after a command to show its usage.
-    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.
+## Mini HowTo
-To stop the service:
 
-    $ sudo systemctl stop glorytun@tun0
+Glorytun does not touch the configuration of its network interface (except for the MTU),
+It is up to the user to do it according to the tools available
+on his system (systemd-networkd, netifd, ...).
+This also allows a wide variety of configurations.
+
+To start a server:
+
+    # (umask 066; glorytun keygen > my_secret_key)
+    # glorytun bind 0.0.0.0 keyfile my_secret_key &
+
+You should now have an unconfigured network interface (let's say `tun0`).
+For example, the simplest setup with `ifconfig`:
+
+    # ifconfig tun0 10.0.1.1 pointopoint 10.0.1.2 up
+
+To check if the server is running, simply call `glorytun show`.
+It will show you all of the running tunnels.
+
+To start a new client, you need to get the secret key generated for the server.
+Then simply call:
+
+    # glorytun bind 0.0.0.0 to SERVER_IP keyfile my_secret_key &
+    # ifconfig tun0 10.0.1.2 pointopoint 10.0.1.1 up
+
+Now you have to setup your path, let's say you have an ADSL link that can do 1Mbit upload and 20Mbit download then call:
+
+    # glorytun path up LOCAL_IPADDR rate tx 1mbit rx 20mbit
+
+Again, to check if your path is working, you can watch its status with `glorytun path`.
+You should now be able to ping your server with `ping 10.0.1.1`.
+
+If you use systemd-networkd, you can easily setup your tunnels with the helper program `glorytun-setup`.
+
+## Thanks
+
+ * @jedisct1 for all his help and the code for MacOS/BSD.
+ * The team OTB (@bessa, @gregdel, @pouulet, @sduponch and @simon) for all tests and discussions.
+ * OVH to support this soft :)
 
 ---
 

configure.ac

@@ -4,17 +4,17 @@ 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])
-AM_INIT_AUTOMAKE([1.9 -Wall -Werror foreign tar-ustar subdir-objects])
+AM_INIT_AUTOMAKE([1.12 -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([socket], [socket])
+AC_SEARCH_LIBS([fmin], [m])
 AC_CHECK_LIB([rt], [clock_gettime])
 AC_CHECK_FUNCS([clock_gettime])
 PKG_CHECK_MODULES([libsodium], [libsodium >= 1.0.4])

m4/pkg.m4

@@ -1,6 +1,6 @@
-dnl pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
-dnl serial 11 (pkg-config-0.29)
+# serial 12 (pkg-config-0.29.2)
-dnl
+
 dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
 dnl
@@ -41,7 +41,7 @@ dnl
 dnl See the "Since" comment for each macro you use to see what version
 dnl of the macros you require.
 m4_defun([PKG_PREREQ],
-[m4_define([PKG_MACROS_VERSION], [0.29])
+[m4_define([PKG_MACROS_VERSION], [0.29.2])
 m4_if(m4_version_compare(PKG_MACROS_VERSION, [$1]), -1,
     [m4_fatal([pkg.m4 version $1 or higher is required but ]PKG_MACROS_VERSION[ found])])
 ])dnl PKG_PREREQ
@@ -142,7 +142,7 @@ AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
 AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
 
 pkg_failed=no
-AC_MSG_CHECKING([for $1])
+AC_MSG_CHECKING([for $2])
 
 _PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
 _PKG_CONFIG([$1][_LIBS], [libs], [$2])
@@ -152,11 +152,11 @@ and $1[]_LIBS to avoid the need to call pkg-config.
 See the pkg-config man page for more details.])
 
 if test $pkg_failed = yes; then
-   	AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1`
-        else 
+        else
 	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
         fi
 	# Put the nasty error message in config.log where it belongs
@@ -173,7 +173,7 @@ installed software in a non-standard prefix.
 _PKG_TEXT])[]dnl
         ])
 elif test $pkg_failed = untried; then
-     	AC_MSG_RESULT([no])
+        AC_MSG_RESULT([no])
 	m4_default([$4], [AC_MSG_FAILURE(
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full

meson.build

@@ -1,9 +1,14 @@
 project('glorytun', 'c',
     version: run_command('./version.sh').stdout(),
     license: 'BSD-3-Clause',
-    default_options : [ 'buildtype=debugoptimized' ]
+    default_options : [
+      'buildtype=debugoptimized',
+      'c_std=gnu99'
+    ]
 )
 
+cc = meson.get_compiler('c')
+
 prefix = get_option('prefix')
 bindir = join_paths(prefix, get_option('bindir'))
 
@@ -12,21 +17,30 @@ conf_data.set('prefix', prefix)
 conf_data.set('bindir', bindir)
 
 add_global_arguments('-DPACKAGE_VERSION="'+meson.project_version()+'"', language : 'c')
+add_global_arguments('-DPACKAGE_NAME="'+meson.project_name()+'"', language : 'c')
 
-src = [
+executable('glorytun', install: true,
-    'src/common.c',
+  sources: [
-    'src/iface.c',
+    'argz/argz.c',
-    'src/option.c',
-    'src/tun.c',
     'mud/mud.c',
-    'src/main.c'
+    'mud/aegis256/aegis256.c',
-]
+    'src/bench.c',
-
+    'src/bind.c',
-deps = [
+    'src/common.c',
-    dependency('libsodium', version : '>=1.0.4')
+    'src/ctl.c',
-]
+    'src/iface.c',
-
+    'src/keygen.c',
-executable('glorytun', install: true, sources: src, dependencies: deps)
+    'src/main.c',
+    'src/path.c',
+    'src/set.c',
+    'src/show.c',
+    'src/tun.c',
+  ],
+  dependencies: [
+    dependency('libsodium', version : '>=1.0.4'),
+    cc.find_library('m', required : false)
+  ]
+)
 
 systemd = dependency('systemd', required: false)
 

sodium.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+mkdir -p .static
+cd .static || exit 1
+
+file=LATEST.tar.gz
+url=https://download.libsodium.org/libsodium/releases
+dir="$PWD"
+
+[ -f "$file" ] || wget -q     "$url/$file" -O "$file"
+[ -f "$file" ] || curl -SsfLO "$url/$file"
+[ -f "$file" ] || {
+	echo "Couldn't download $url/$file"
+	exit 1
+}
+
+if [ "$1" ]; then
+	mkdir -p "$1"
+	cd "$1" || exit 1
+fi
+
+rm -rf libsodium-stable
+tar zxf "$dir/$file"
+cd libsodium-stable || exit 1
+
+NPROC=$(sysctl -n hw.ncpu || nproc) 2>/dev/null
+
+./configure ${1+--host=$1} --enable-minimal --disable-dependency-tracking --enable-static --disable-shared
+make "-j$((NPROC+1))"

src/bench.c

@@ -0,0 +1,164 @@
+#include "common.h"
+
+#include <math.h>
+#include <sodium.h>
+#include <string.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <time.h>
+#include <unistd.h>
+
+#if defined __APPLE__
+#include <mach/mach_time.h>
+#endif
+
+#include "../argz/argz.h"
+#include "../mud/aegis256/aegis256.h"
+
+#define STR_S(X) (((X) > 1) ? "s" : "")
+
+#define NPUBBYTES 32
+#define KEYBYTES  32
+#define ABYTES    16
+
+static unsigned long long
+gt_now(void)
+{
+#if defined __APPLE__
+    static mach_timebase_info_data_t mtid;
+    if (!mtid.denom)
+        mach_timebase_info(&mtid);
+    return (mach_absolute_time() * mtid.numer / mtid.denom) / 1000ULL;
+#elif defined CLOCK_MONOTONIC
+    struct timespec tv;
+    clock_gettime(CLOCK_MONOTONIC, &tv);
+    return (unsigned long long)tv.tv_sec * 1000000ULL
+         + (unsigned long long)tv.tv_nsec / 1000ULL;
+#else
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return (unsigned long long)tv.tv_sec * 1000000ULL
+         + (unsigned long long)tv.tv_usec;
+#endif
+}
+
+int
+gt_bench(int argc, char **argv)
+{
+    unsigned long precision = 10;
+    size_t bufsize = 64 * 1024;
+    unsigned long duration = 1000;
+
+    struct argz bench_argz[] = {
+        {"aes|chacha", NULL, NULL, argz_option},
+        {"precision", "EXPONENT", &precision, argz_ulong},
+        {"bufsize", "BYTES", &bufsize, argz_bytes},
+        {"duration", "SECONDS", &duration, argz_time},
+        {NULL}};
+
+    if (argz(bench_argz, argc, argv))
+        return 1;
+
+    if (duration == 0 || bufsize == 0)
+        return 0;
+
+    if (sodium_init() == -1) {
+        gt_log("sodium init failed\n");
+        return 1;
+    }
+
+    duration /= 1000;
+
+    int term = isatty(1);
+    int aes = argz_is_set(bench_argz, "aes");
+    int chacha = argz_is_set(bench_argz, "chacha");
+
+    if (!aegis256_is_available()) {
+        if (aes) {
+            gt_log("aes is not available on your platform\n");
+            return 1;
+        }
+        chacha = 1;
+    }
+
+    unsigned char *buf = calloc(1, bufsize + ABYTES);
+
+    if (!buf) {
+        perror("calloc");
+        return 1;
+    }
+
+    unsigned char npub[NPUBBYTES];
+    unsigned char key[KEYBYTES];
+
+    randombytes_buf(npub, sizeof(npub));
+    randombytes_buf(key, sizeof(key));
+
+    if (term) {
+        printf("\n");
+        printf("  %-10s %s\n", "bench", chacha ? "chacha20poly1305" : "aegis256");
+        printf("  %-10s %s\n", "libsodium", sodium_version_string());
+        printf("\n");
+        printf("  %-10s 2^(-%lu)\n", "precision", precision);
+        printf("  %-10s %zu byte%s\n", "bufsize", bufsize, STR_S(bufsize));
+        printf("  %-10s %lu second%s\n", "duration", duration, STR_S(duration));
+        printf("\n");
+        printf("------------------------------------------------------------\n");
+        printf(" %3s %9s %14s %14s %14s\n", "2^n", "min", "avg", "max", "delta");
+        printf("------------------------------------------------------------\n");
+    }
+
+    for (int i = 0; !gt_quit && bufsize >> i; i++) {
+        unsigned long long total_dt = 0ULL;
+        size_t total_bytes = 0;
+        double mbps = 0.0;
+        double mbps_min = INFINITY;
+        double mbps_max = 0.0;
+        double mbps_dlt = INFINITY;
+
+        while (!gt_quit && mbps_dlt > ldexp(mbps, -(int)precision)) {
+            unsigned long long now = gt_now();
+            double mbps_old = mbps;
+            size_t bytes = 0;
+
+            gt_alarm = 0;
+            alarm((unsigned int)duration);
+
+            while (!gt_quit && !gt_alarm) {
+                if (chacha) {
+                    crypto_aead_chacha20poly1305_encrypt(
+                        buf, NULL, buf, 1ULL << i, NULL, 0, NULL, npub, key);
+                } else {
+                    aegis256_encrypt(
+                        buf, NULL, buf, 1ULL << i, NULL, 0, npub, key);
+                }
+                bytes += 1ULL << i;
+            }
+
+            total_dt += gt_now() - now;
+            total_bytes += bytes;
+
+            mbps = ((double)total_bytes * 8.0) / (double)total_dt;
+            mbps_min = fmin(mbps_min, mbps);
+            mbps_max = fmax(mbps_max, mbps);
+            mbps_dlt = fabs(mbps_old - mbps);
+
+            if (term) {
+                printf("\r %3i %9.2f Mbps %9.2f Mbps %9.2f Mbps %9.2e",
+                       i, mbps_min, mbps, mbps_max, mbps_dlt);
+                fflush(stdout);
+            }
+        }
+
+        if (term) {
+            printf("\n");
+        } else {
+            printf("%i %.2f %.2f %.2f\n", i, mbps_min, mbps, mbps_max);
+        }
+    }
+
+    printf("\n");
+    free(buf);
+
+    return 0;
+}

src/bind.c

@@ -0,0 +1,390 @@
+#include "common.h"
+#include "ctl.h"
+#include "iface.h"
+#include "ip.h"
+#include "str.h"
+#include "tun.h"
+
+#include <fcntl.h>
+#include <stdio.h>
+#include <sys/select.h>
+
+#include "../argz/argz.h"
+#include "../mud/mud.h"
+
+#include <sodium.h>
+
+#ifndef O_CLOEXEC
+#define O_CLOEXEC 0
+#endif
+
+static int
+fd_set_nonblock(int fd)
+{
+    if (fd == -1)
+        return 0;
+
+    int ret;
+
+    do {
+        ret = fcntl(fd, F_GETFL, 0);
+    } while (ret == -1 && errno == EINTR);
+
+    int flags = (ret == -1) ? 0 : ret;
+
+    do {
+        ret = fcntl(fd, F_SETFL, flags | O_NONBLOCK);
+    } while (ret == -1 && errno == EINTR);
+
+    return ret;
+}
+
+static int
+gt_setup_secretkey(struct mud *mud, const char *keyfile)
+{
+    int fd;
+
+    do {
+        fd = open(keyfile, O_RDONLY | O_CLOEXEC);
+    } while (fd == -1 && errno == EINTR);
+
+    if (fd == -1) {
+        gt_log("couldn't open %s: %s\n", keyfile, strerror(errno));
+        return -1;
+    }
+
+    unsigned char key[32];
+    char buf[2 * sizeof(key)];
+    size_t size = 0;
+
+    while (size < sizeof(buf)) {
+        ssize_t r = read(fd, &buf[size], sizeof(buf) - size);
+
+        if (r <= (ssize_t)0) {
+            if (r && (errno == EAGAIN || errno == EINTR))
+                continue;
+            break;
+        }
+
+        size += (size_t)r;
+    }
+
+    close(fd);
+
+    if (size != sizeof(buf)) {
+        gt_log("couldn't read secret key\n");
+        return -1;
+    }
+
+    if (gt_fromhex(key, sizeof(key), buf, sizeof(buf))) {
+        gt_log("secret key is not valid\n");
+        return -1;
+    }
+
+    mud_set_key(mud, key, sizeof(key));
+
+    return 0;
+}
+
+static size_t
+gt_setup_mtu(struct mud *mud, size_t old, const char *tun_name)
+{
+    size_t mtu = mud_get_mtu(mud);
+
+    if (mtu == old)
+        return mtu;
+
+    if (iface_set_mtu(tun_name, mtu) == -1)
+        gt_log("couldn't setup MTU at %zu on device %s\n", mtu, tun_name);
+
+    return mtu;
+}
+
+int
+gt_bind(int argc, char **argv)
+{
+    struct sockaddr_storage bind_addr = { .ss_family = AF_INET };
+    struct sockaddr_storage peer_addr = { 0 };
+    unsigned short bind_port = 5000;
+    unsigned short peer_port = bind_port;
+    const char *dev = NULL;
+    const char *keyfile = NULL;
+
+    struct argz toz[] = {
+        {NULL, "IPADDR", &peer_addr, argz_addr},
+        {NULL, "PORT", &peer_port, argz_ushort},
+        {NULL}};
+
+    struct argz bindz[] = {
+        {NULL, "IPADDR", &bind_addr, argz_addr},
+        {NULL, "PORT", &bind_port, argz_ushort},
+        {"to", NULL, &toz, argz_option},
+        {"dev", "NAME", &dev, argz_str},
+        {"keyfile", "FILE", &keyfile, argz_str},
+        {"chacha", NULL, NULL, argz_option},
+        {"persist", NULL, NULL, argz_option},
+        {NULL}};
+
+    if (argz(bindz, argc, argv))
+        return 1;
+
+    if (str_empty(keyfile)) {
+        gt_log("a keyfile is needed!\n");
+        return 1;
+    }
+
+    gt_set_port((struct sockaddr *)&bind_addr, bind_port);
+    gt_set_port((struct sockaddr *)&peer_addr, peer_port);
+
+    int chacha = argz_is_set(bindz, "chacha");
+    int persist = argz_is_set(bindz, "persist");
+
+    if (sodium_init() == -1) {
+        gt_log("couldn't init sodium\n");
+        return 1;
+    }
+
+    unsigned char hashkey[crypto_shorthash_KEYBYTES];
+    randombytes_buf(hashkey, sizeof(hashkey));
+
+    struct mud *mud = mud_create((struct sockaddr *)&bind_addr);
+    const int mud_fd = mud_get_fd(mud);
+
+    if (mud_fd == -1) {
+        gt_log("couldn't create mud\n");
+        return 1;
+    }
+
+    if (gt_setup_secretkey(mud, keyfile))
+        return 1;
+
+    if (!chacha && mud_set_aes(mud)) {
+        gt_log("AES is not available, enjoy ChaCha20!\n");
+        chacha = 1;
+    }
+
+    char tun_name[64];
+    const int tun_fd = tun_create(tun_name, sizeof(tun_name), dev);
+
+    if (tun_fd == -1) {
+        gt_log("couldn't create tun device\n");
+        return 1;
+    }
+
+    size_t mtu = gt_setup_mtu(mud, 0, tun_name);
+
+    if (tun_set_persist(tun_fd, persist) == -1) {
+        gt_log("couldn't %sable persist mode on device %s\n",
+                persist ? "en" : "dis", tun_name);
+    }
+
+    if (peer_addr.ss_family) {
+        if (mud_peer(mud, (struct sockaddr *)&peer_addr)) {
+            perror("mud_peer");
+            return 1;
+        }
+    }
+
+    const int ctl_fd = ctl_create(GT_RUNDIR, tun_name);
+
+    if (ctl_fd == -1) {
+        gt_log("couldn't create "GT_RUNDIR"/%s: %s\n",
+                tun_name, strerror(errno));
+        return 1;
+    }
+
+    if (//fd_set_nonblock(tun_fd) ||
+        //fd_set_nonblock(mud_fd) ||
+        fd_set_nonblock(ctl_fd)) {
+        gt_log("couldn't setup non-blocking fds\n");
+        return 1;
+    }
+
+    const long pid = (long)getpid();
+
+    gt_log("running on device %s as pid %li\n", tun_name, pid);
+
+    fd_set rfds, wfds;
+    FD_ZERO(&rfds);
+    FD_ZERO(&wfds);
+
+    int tun_can_read = 0;
+    int tun_can_write = 0;
+    int mud_can_read = 0;
+    int mud_can_write = 0;
+
+    int last_fd = MAX(tun_fd, mud_fd);
+    last_fd = 1 + MAX(last_fd, ctl_fd);
+
+    unsigned char buf[4096];
+
+    while (!gt_quit) {
+        if (tun_can_write) {
+            FD_CLR(tun_fd, &wfds);
+        } else {
+            FD_SET(tun_fd, &wfds);
+        }
+
+        if (mud_can_write) {
+            FD_CLR(mud_fd, &wfds);
+        } else {
+            FD_SET(mud_fd, &wfds);
+        }
+
+        if (tun_can_read) {
+            FD_CLR(tun_fd, &rfds);
+        } else {
+            FD_SET(tun_fd, &rfds);
+        }
+
+        if (mud_can_read) {
+            FD_CLR(mud_fd, &rfds);
+        } else {
+            FD_SET(mud_fd, &rfds);
+        }
+
+        FD_SET(ctl_fd, &rfds);
+
+        struct timeval tv = {
+            .tv_usec = 100000,
+        };
+
+        if (mud_can_read && tun_can_write) {
+            tv.tv_usec = 0;
+        } else if (tun_can_read && mud_can_write) {
+            long send_wait = mud_send_wait(mud);
+            if (send_wait >= 0)
+                tv.tv_usec = send_wait * 1000;
+        }
+
+        const int ret = select(last_fd, &rfds, &wfds, NULL, &tv);
+
+        if (ret == -1) {
+            if (errno == EBADF) {
+                perror("select");
+                break;
+            }
+            continue;
+        }
+
+        if (FD_ISSET(tun_fd, &rfds))
+            tun_can_read = 1;
+
+        if (FD_ISSET(tun_fd, &wfds))
+            tun_can_write = 1;
+
+        if (FD_ISSET(mud_fd, &rfds))
+            mud_can_read = 1;
+
+        if (FD_ISSET(mud_fd, &wfds))
+            mud_can_write = 1;
+
+        mtu = gt_setup_mtu(mud, mtu, tun_name);
+
+        if (tun_can_read && mud_can_write && !mud_send_wait(mud)) {
+            struct ip_common ic;
+            int r = tun_read(tun_fd, buf, sizeof(buf));
+
+            if (r > 0 && !ip_get_common(&ic, buf, r)) {
+                mud_send(mud, buf, (size_t)r, ic.tc);
+                mud_can_write = 0;
+            }
+
+            tun_can_read = 0;
+        }
+
+        if (mud_can_read && tun_can_write)  {
+            int r = mud_recv(mud, buf, sizeof(buf));
+
+            if (r > 0 && ip_is_valid(buf, r)) {
+                tun_write(tun_fd, buf, (size_t)r);
+                tun_can_write = 0;
+            }
+
+            mud_can_read = 0;
+        }
+
+        if (FD_ISSET(ctl_fd, &rfds)) {
+            struct ctl_msg req, res = {.reply = 1};
+            struct sockaddr_storage ss;
+            socklen_t sl = sizeof(ss);
+
+            ssize_t r = recvfrom(ctl_fd, &req, sizeof(req), 0,
+                                 (struct sockaddr *)&ss, &sl);
+
+            if (r == (ssize_t)sizeof(req)) {
+                res.type = req.type;
+
+                switch (req.type) {
+                case CTL_NONE:
+                    break;
+                case CTL_STATE:
+                    if (mud_set_state(mud, (struct sockaddr *)&req.path.addr,
+                                      req.path.state, req.path.rate_tx, req.path.rate_rx))
+                        res.ret = errno;
+                    break;
+                case CTL_PATH_STATUS:
+                    {
+                        unsigned count = 0;
+                        struct mud_path *paths = mud_get_paths(mud, &count);
+
+                        if (!paths) {
+                            res.ret = errno;
+                            break;
+                        }
+
+                        res.ret = EAGAIN;
+
+                        for (unsigned i = 0; i < count; i++) {
+                            memcpy(&res.path_status, &paths[i], sizeof(struct mud_path));
+                            if (sendto(ctl_fd, &res, sizeof(res), 0,
+                                       (const struct sockaddr *)&ss, sl) == -1)
+                                perror("sendto(ctl)");
+                        }
+
+                        free(paths);
+                        res.ret = 0;
+                    }
+                    break;
+                case CTL_MTU:
+                    mud_set_mtu(mud, req.mtu);
+                    res.mtu = mtu = gt_setup_mtu(mud, mtu, tun_name);
+                    break;
+                case CTL_TC:
+                    if (mud_set_tc(mud, req.tc))
+                        res.ret = errno;
+                    break;
+                case CTL_KXTIMEOUT:
+                    if (mud_set_keyx_timeout(mud, req.ms))
+                        res.ret = errno;
+                    break;
+                case CTL_TIMETOLERANCE:
+                    if (mud_set_time_tolerance(mud, req.ms))
+                        res.ret = errno;
+                    break;
+                case CTL_STATUS:
+                    memcpy(res.status.tun_name, tun_name, sizeof(tun_name)); // XXX
+                    res.status.pid = pid;
+                    res.status.mtu = mtu;
+                    res.status.chacha = chacha;
+                    res.status.bind = bind_addr;
+                    res.status.peer = peer_addr;
+                    break;
+                }
+                if (sendto(ctl_fd, &res, sizeof(res), 0,
+                           (const struct sockaddr *)&ss, sl) == -1)
+                    perror("sendto(ctl)");
+            } else if (r == -1 && errno != EAGAIN) {
+                perror("recvfrom(ctl)");
+            }
+        }
+    }
+
+    if (gt_reload && tun_fd >= 0)
+        tun_set_persist(tun_fd, 1);
+
+    mud_delete(mud);
+    ctl_delete(ctl_fd);
+
+    return 0;
+}

src/common.c

@@ -3,20 +3,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 
-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)
-        return 0;
-
-    return ret;
-}
-
 void
 gt_log(const char *fmt, ...)
 {
@@ -78,8 +64,53 @@ gt_fromhex(uint8_t *dst, size_t dst_size, const char *src, size_t src_size)
         if (_0_(a == -1 || b == -1))
             return -1;
 
-        *dst++ = (a << 4) | b;
+        *dst++ = (uint8_t)((a << 4) | b);
     }
 
     return 0;
 }
+
+void
+gt_set_port(struct sockaddr *sa, uint16_t port)
+{
+    switch (sa->sa_family) {
+    case AF_INET:
+        ((struct sockaddr_in *)sa)->sin_port = htons(port);
+        break;
+    case AF_INET6:
+        ((struct sockaddr_in6 *)sa)->sin6_port = htons(port);
+        break;
+    }
+}
+
+uint16_t
+gt_get_port(struct sockaddr *sa)
+{
+    switch (sa->sa_family) {
+    case AF_INET:
+        return ntohs(((struct sockaddr_in *)sa)->sin_port);
+    case AF_INET6:
+        return ntohs(((struct sockaddr_in6 *)sa)->sin6_port);
+    }
+
+    return 0;
+}
+
+int
+gt_toaddr(char *str, size_t size, struct sockaddr *sa)
+{
+    if (str)
+        str[0] = 0;
+
+    switch (sa->sa_family) {
+    case AF_INET:
+        return -!inet_ntop(AF_INET,
+                &((struct sockaddr_in *)sa)->sin_addr, str, (socklen_t)size);
+    case AF_INET6:
+        return -!inet_ntop(AF_INET6,
+                &((struct sockaddr_in6 *)sa)->sin6_addr, str, (socklen_t)size);
+    }
+
+    errno = EAFNOSUPPORT;
+    return -1;
+}

src/common.h

@@ -1,11 +1,30 @@
 #pragma once
 
+#if defined __linux__ && !defined _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
 #include <stdlib.h>
 #include <stdint.h>
 #include <string.h>
 #include <unistd.h>
+#include <signal.h>
 #include <errno.h>
 
+#include <arpa/inet.h>
+
+#ifndef PACKAGE_NAME
+#define PACKAGE_NAME "glorytun"
+#endif
+
+#ifndef PACKAGE_VERSION
+#define PACKAGE_VERSION "0.0.0"
+#endif
+
+#ifndef GT_RUNDIR
+#define GT_RUNDIR "/run/" PACKAGE_NAME
+#endif
+
 #define COUNT(x)       (sizeof(x)/sizeof(x[0]))
 
 #define ALIGN_SIZE     (1<<4)
@@ -35,8 +54,23 @@
 #undef MIN
 #define MIN(x,y) ({ __typeof__(x) X=(x); __typeof__(y) Y=(y); X < Y ? X : Y; })
 
+extern volatile sig_atomic_t gt_alarm;
+extern volatile sig_atomic_t gt_reload;
+extern volatile sig_atomic_t gt_quit;
+
 int  gt_print (const char *, ...) _printf_(1,2);
 void gt_log   (const char *, ...) _printf_(1,2);
 
 int gt_tohex   (char *, size_t, const uint8_t *, size_t);
 int gt_fromhex (uint8_t *, size_t, const char *, size_t);
+
+void     gt_set_port (struct sockaddr *, uint16_t);
+uint16_t gt_get_port (struct sockaddr *);
+int      gt_toaddr   (char *, size_t, struct sockaddr *);
+
+int gt_show   (int, char **);
+int gt_bind   (int, char **);
+int gt_path   (int, char **);
+int gt_keygen (int, char **);
+int gt_bench  (int, char **);
+int gt_set    (int, char **);

src/ctl.c

@@ -0,0 +1,169 @@
+#include "common.h"
+#include "ctl.h"
+#include "str.h"
+
+#include <stdio.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <sys/socket.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+
+int
+ctl_reply(int fd, struct ctl_msg *res, struct ctl_msg *req)
+{
+    if ((send(fd, req, sizeof(struct ctl_msg), 0) == -1) ||
+        (recv(fd, res, sizeof(struct ctl_msg), 0) == -1))
+        return -1;
+
+    if (res->type != req->type || !res->reply) {
+        errno = EBADMSG;
+        return -1;
+    }
+
+    if (res->ret) {
+        errno = res->ret;
+        return -1;
+    }
+
+    return 0;
+}
+
+static int
+ctl_setsun(struct sockaddr_un *dst, const char *dir, const char *file)
+{
+    struct sockaddr_un sun = {
+        .sun_family = AF_UNIX,
+    };
+
+    int ret = snprintf(sun.sun_path, sizeof(sun.sun_path), "%s/%s", dir, file);
+
+    if (ret <= 0 || (size_t)ret >= sizeof(sun.sun_path)) {
+        errno = EINVAL;
+        return -1;
+    }
+
+    if (dst)
+        *dst = sun;
+
+    return 0;
+}
+
+static int
+ctl_bind(int fd, const char *dir, const char *file)
+{
+    char name[10] = { [0] = '.' };
+    struct sockaddr_un sun;
+
+    if (str_empty(file)) {
+        unsigned pid = (unsigned)getpid();
+
+        for (size_t i = 1; i < sizeof(name) - 1; i++, pid >>= 4)
+            name[i] = "uncopyrightables"[pid & 15];
+
+        file = name;
+    }
+
+    if (ctl_setsun(&sun, dir, file))
+        return -1;
+
+    if (unlink(sun.sun_path) && errno != ENOENT)
+        return -1;
+
+    return bind(fd, (struct sockaddr *)&sun, sizeof(sun));
+}
+
+void
+ctl_delete(int fd)
+{
+    struct sockaddr_storage ss = { 0 };
+    socklen_t sslen = sizeof(ss);
+
+    if ((getsockname(fd, (struct sockaddr *)&ss, &sslen) == 0) &&
+        (ss.ss_family == AF_UNIX))
+        unlink(((struct sockaddr_un *)&ss)->sun_path);
+
+    close(fd);
+}
+
+int
+ctl_create(const char *dir, const char *file)
+{
+    if (str_empty(dir)) {
+        errno = EINVAL;
+        return -1;
+    }
+
+    if (mkdir(dir, 0700) == -1 && errno != EEXIST)
+        return -1;
+
+    int fd = socket(AF_UNIX, SOCK_DGRAM, 0);
+
+    if (ctl_bind(fd, dir, file)) {
+        int err = errno;
+        close(fd);
+        errno = err;
+        return -1;
+    }
+
+    return fd;
+}
+
+int
+ctl_connect(const char *dir, const char *file)
+{
+    DIR *dp = NULL;
+
+    if (str_empty(dir)) {
+        errno = EINVAL;
+        return -1;
+    }
+
+    if (!file) {
+        if (dp = opendir(dir), !dp)
+            return -1;
+
+        struct dirent *d = NULL;
+
+        while (d = readdir(dp), d) {
+            if (d->d_name[0] == '.')
+                continue;
+
+            if (file) {
+                closedir(dp);
+                return CTL_ERROR_MANY;
+            }
+
+            file = &d->d_name[0];
+        }
+
+        if (!file) {
+            closedir(dp);
+            return CTL_ERROR_NONE;
+        }
+    }
+
+    struct sockaddr_un sun;
+    const int ret = ctl_setsun(&sun, dir, file);
+
+    if (dp) {
+        int err = errno;
+        closedir(dp);
+        errno = err;
+    }
+
+    if (ret)
+        return -1;
+
+    int fd = ctl_create(dir, NULL);
+
+    if (connect(fd, (struct sockaddr *)&sun, sizeof(sun))) {
+        int err = errno;
+        ctl_delete(fd);
+        errno = err;
+        return -1;
+    }
+
+    return fd;
+}

src/ctl.h

@@ -0,0 +1,49 @@
+#pragma once
+
+#include "../mud/mud.h"
+
+#include <sys/socket.h>
+
+#define CTL_ERROR_NONE (-2)
+#define CTL_ERROR_MANY (-3)
+
+enum ctl_type {
+    CTL_NONE = 0,
+    CTL_STATE,
+    CTL_STATUS,
+    CTL_MTU,
+    CTL_TC,
+    CTL_KXTIMEOUT,
+    CTL_TIMETOLERANCE,
+    CTL_PATH_STATUS,
+};
+
+struct ctl_msg {
+    enum ctl_type type;
+    int reply, ret;
+    union {
+        struct {
+            struct sockaddr_storage addr;
+            enum mud_state state;
+            unsigned long rate_tx;
+            unsigned long rate_rx;
+        } path;
+        struct mud_path path_status;
+        struct {
+            char tun_name[64];
+            long pid;
+            size_t mtu;
+            int chacha;
+            struct sockaddr_storage bind;
+            struct sockaddr_storage peer;
+        } status;
+        size_t mtu;
+        int tc;
+        unsigned long ms;
+    };
+};
+
+int  ctl_create  (const char *, const char *);
+int  ctl_connect (const char *, const char *);
+int  ctl_reply   (int, struct ctl_msg *, struct ctl_msg *);
+void ctl_delete  (int);

src/db.c

@@ -1,158 +0,0 @@
-#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

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

@@ -1,25 +1,35 @@
 #include "common.h"
+#include "iface.h"
 
-#include "str.h"
+#include <stdio.h>
-
-#include <sys/ioctl.h>
 #include <net/if.h>
+#include <sys/ioctl.h>
 
 int
-iface_set_mtu(char *dev_name, int mtu)
+iface_set_mtu(const char *dev_name, size_t mtu)
 {
+    if (mtu > (size_t)0xFFFF) {
+        errno = EINVAL;
+        return -1;
+    }
+
     struct ifreq ifr = {
-        .ifr_mtu = mtu,
+        .ifr_mtu = (int)mtu,
     };
 
-    str_cpy(ifr.ifr_name, dev_name, IFNAMSIZ - 1);
+    int ret = snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", dev_name);
+
+    if (ret <= 0 || (size_t)ret >= sizeof(ifr.ifr_name)) {
+        errno = EINVAL;
+        return -1;
+    }
 
     int fd = socket(AF_INET, SOCK_DGRAM, 0);
 
     if (fd == -1)
         return -1;
 
-    int ret = ioctl(fd, SIOCSIFMTU, &ifr);
+    ret = ioctl(fd, SIOCSIFMTU, &ifr);
 
     int err = errno;
     close(fd);

src/iface.h

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

src/ip.h

@@ -3,15 +3,29 @@
 #include <stdint.h>
 
 struct ip_common {
-    uint8_t version;
     uint8_t tc;
     uint8_t proto;
-    uint8_t hdr_size;
+    struct { // data are not reordered
-    uint16_t size;
+        union {
+            unsigned char v6[16];
+            struct {
+                unsigned char zero[10];
+                unsigned char ff[2];
+                unsigned char v4[4];
+            };
+        };
+        unsigned char port[2];
+    } src, dst;
 };
 
-_pure_ static inline uint8_t
+static inline int
-ip_get_version(const uint8_t *data, size_t size)
+ip_read16(const uint8_t *src)
+{
+    return ((int)src[1]) | (((int)src[0]) << 8);
+}
+
+static inline uint8_t
+ip_get_version(const uint8_t *data, int size)
 {
     if (size < 20)
         return 0;
@@ -20,26 +34,64 @@ ip_get_version(const uint8_t *data, size_t size)
 }
 
 static inline int
-ip_get_common(struct ip_common *ic, const uint8_t *data, size_t size)
+ip_is_valid(const uint8_t *data, int size)
 {
-    ic->version = ip_get_version(data, size);
+    switch (ip_get_version(data, size)) {
+        case 4: return size == ip_read16(&data[2]);
+        case 6: return size == ip_read16(&data[4]) + 40;
+    }
 
-    switch (ic->version) {
+    return 0;
+}
+
+static inline int
+ip_get_common(struct ip_common *ic, const uint8_t *data, int size)
+{
+    switch (ip_get_version(data, size)) {
     case 4:
         ic->tc = data[1];
         ic->proto = data[9];
-        ic->hdr_size = (data[0] & 0xF) << 2;
+        if (size == ip_read16(&data[2])) {
-        ic->size = ((data[2] << 8) | data[3]);
+            const int hdrsize = (data[0] & 0xF) << 2;
-        if (ic->size >= 20)
+            memset(ic->src.zero, 0, sizeof(ic->src.zero));
+            memset(ic->src.ff, 0xff, sizeof(ic->src.ff));
+            memcpy(ic->src.v4, &data[12], sizeof(ic->src.v4));
+            memset(ic->dst.zero, 0, sizeof(ic->dst.zero));
+            memset(ic->dst.ff, 0xff, sizeof(ic->dst.ff));
+            memcpy(ic->dst.v4, &data[16], sizeof(ic->dst.v4));
+            switch (ic->proto) {
+            case 6:  // tcp
+            case 17: // udp
+                memcpy(ic->src.port, &data[hdrsize], sizeof(ic->src.port));
+                memcpy(ic->dst.port, &data[hdrsize + 2], sizeof(ic->dst.port));
+                break;
+            default:
+                memset(ic->src.port, 0, sizeof(ic->src.port));
+                memset(ic->dst.port, 0, sizeof(ic->dst.port));
+            }
             return 0;
+        }
         break;
     case 6:
-        ic->tc = ((data[0] & 0xF) << 4) | (data[1] >> 4);
+        ic->tc = (uint8_t)((data[0] << 4) | (data[1] >> 4));
         ic->proto = data[6];
-        ic->hdr_size = 40;
+        if (size == ip_read16(&data[4]) + 40) {
-        ic->size = ((data[4] << 8) | data[5]) + 40;
+            memcpy(ic->src.v6, &data[8], sizeof(ic->src.v6));
-        return 0;
+            memcpy(ic->dst.v6, &data[24], sizeof(ic->dst.v6));
+            switch (ic->proto) {
+            case 6:  // tcp
+            case 17: // udp
+                memcpy(ic->src.port, &data[40], sizeof(ic->src.port));
+                memcpy(ic->dst.port, &data[42], sizeof(ic->dst.port));
+                break;
+            default:
+                memset(ic->src.port, 0, sizeof(ic->src.port));
+                memset(ic->dst.port, 0, sizeof(ic->dst.port));
+            }
+            return 0;
+        }
+        break;
     }
 
-    return -1;
+    return 1;
 }

src/keygen.c

@@ -0,0 +1,22 @@
+#include "common.h"
+
+#include <sodium.h>
+#include <stdio.h>
+
+int
+gt_keygen(int argc, char **argv)
+{
+    if (sodium_init() == -1) {
+        gt_log("sodium init failed\n");
+        return 1;
+    }
+
+    unsigned char key[32];
+    randombytes_buf(key, sizeof(key));
+
+    char buf[2 * sizeof(key) + 1];
+    gt_tohex(buf, sizeof(buf), key, sizeof(key));
+    printf("%s\n", buf);
+
+    return 0;
+}

src/main.c

@@ -1,103 +1,27 @@
 #include "common.h"
-
-#include "db.h"
-#include "ip.h"
-#include "option.h"
 #include "str.h"
-#include "tun.h"
-#include "iface.h"
 
-#include <fcntl.h>
+#include <sodium.h>
-#include <inttypes.h>
-#include <limits.h>
-#include <poll.h>
-#include <signal.h>
 #include <stdio.h>
-#include <sys/socket.h>
-#include <sys/time.h>
-#include <netinet/in.h>
 
-#include <arpa/inet.h>
+#include "../argz/argz.h"
-#include <netdb.h>
 
-#include "../mud/mud.h"
+volatile sig_atomic_t gt_alarm;
-
+volatile sig_atomic_t gt_reload;
-#ifndef O_CLOEXEC
+volatile sig_atomic_t gt_quit;
-#define O_CLOEXEC 0
-#endif
-
-#ifndef PACKAGE_VERSION
-#define PACKAGE_VERSION "unknown"
-#endif
-
-#define GT_MTU(X) ((X)-28)
-
-static struct {
-    volatile sig_atomic_t quit;
-    volatile sig_atomic_t reload;
-    char *dev;
-    char *keyfile;
-    char *host;
-    long port;
-    struct {
-        char *list;
-        char *backup;
-        long port;
-    } bind;
-    long mtu;
-    long timeout;
-    long time_tolerance;
-    int ipv4;
-    int ipv6;
-    int mtu_auto;
-    int chacha20;
-    int version;
-    int keygen;
-    int persist;
-    struct {
-        unsigned char *data;
-        long size;
-    } buf;
-} gt = {
-    .port = 5000,
-    .bind = {
-        .port = 5000,
-    },
-    .mtu = 1500,
-    .timeout = 5000,
-    .ipv4 = 1,
-#ifdef __linux__
-    .ipv6 = 1,
-#endif
-    .buf = {
-        .size = 64 * 1024,
-    },
-};
 
 static void
-fd_set_nonblock(int fd)
+gt_sa_handler(int sig)
 {
-    int ret;
+    switch (sig) {
-
+    case SIGALRM:
-    do {
+        gt_alarm = 1;
-        ret = fcntl(fd, F_GETFL, 0);
+        return;
-    } while (ret == -1 && errno == EINTR);
+    case SIGHUP:
-
+        gt_reload = 1; /* FALLTHRU */
-    int flags = (ret == -1) ? 0 : ret;
+    default:
-
+        gt_quit = 1;
-    do {
+    }
-        ret = fcntl(fd, F_SETFL, flags | O_NONBLOCK);
-    } while (ret == -1 && errno == EINTR);
-
-    if (ret == -1)
-        perror("fcntl O_NONBLOCK");
-}
-
-static void
-gt_quit_handler(int sig)
-{
-    gt.reload = (sig == SIGHUP);
-    gt.quit = 1;
 }
 
 static void
@@ -109,11 +33,12 @@ gt_set_signal(void)
 
     sigemptyset(&sa.sa_mask);
 
-    sa.sa_handler = gt_quit_handler;
+    sa.sa_handler = gt_sa_handler;
     sigaction(SIGINT, &sa, NULL);
     sigaction(SIGQUIT, &sa, NULL);
     sigaction(SIGTERM, &sa, NULL);
     sigaction(SIGHUP, &sa, NULL);
+    sigaction(SIGALRM, &sa, NULL);
 
     sa.sa_handler = SIG_IGN;
     sigaction(SIGPIPE, &sa, NULL);
@@ -121,401 +46,62 @@ gt_set_signal(void)
     sigaction(SIGUSR2, &sa, NULL);
 }
 
-static void
-gt_print_secretkey(struct mud *mud)
-{
-    unsigned char key[32];
-    size_t size = sizeof(key);
-
-    if (mud_get_key(mud, key, &size))
-        return;
-
-    char buf[2 * sizeof(key) + 1];
-
-    gt_tohex(buf, sizeof(buf), key, size);
-    gt_print("%s\n", buf);
-}
-
 static int
-gt_setup_secretkey(struct mud *mud, char *keyfile)
+gt_version(int argc, char **argv)
 {
-    int fd;
+    struct argz version_argz[] = {
+        {"libsodium", NULL, NULL, argz_option},
+        {NULL}};
 
-    do {
+    if (argz(version_argz, argc, argv))
-        fd = open(keyfile, O_RDONLY | O_CLOEXEC);
+        return 1;
-    } while (fd == -1 && errno == EINTR);
 
-    if (fd == -1) {
+    if (argz_is_set(version_argz, "libsodium")) {
-        perror("open keyfile");
+        printf("%s\n", sodium_version_string());
-        return -1;
+    } else {
+        printf("%s\n", PACKAGE_VERSION);
     }
 
-    unsigned char key[32];
-    char buf[2 * sizeof(key)];
-    size_t size = 0;
-
-    while (size < sizeof(buf)) {
-        ssize_t r = read(fd, &buf[size], sizeof(buf) - size);
-
-        if (r <= (ssize_t)0) {
-            if (r && (errno == EAGAIN || errno == EINTR))
-                continue;
-            break;
-        }
-
-        size += r;
-    }
-
-    close(fd);
-
-    if (size != sizeof(buf)) {
-        gt_log("unable to read secret key\n");
-        return -1;
-    }
-
-    if (gt_fromhex(key, sizeof(key), buf, sizeof(buf))) {
-        gt_log("secret key is not valid\n");
-        return -1;
-    }
-
-    mud_set_key(mud, key, sizeof(key));
-
     return 0;
 }
 
-static int
-gt_setup_option(int argc, char **argv)
-{
-    // clang-format off
-
-    struct option opts[] = {
-        { "host",           &gt.host,           option_str    },
-        { "port",           &gt.port,           option_long   },
-        { "bind",           &gt.bind.list,      option_str    },
-        { "bind-backup",    &gt.bind.backup,    option_str    },
-        { "bind-port",      &gt.bind.port,      option_long   },
-        { "dev",            &gt.dev,            option_str    },
-        { "persist",        NULL,               option_option },
-        { "mtu",            &gt.mtu,            option_long   },
-        { "mtu-auto",       NULL,               option_option },
-        { "keyfile",        &gt.keyfile,        option_str    },
-        { "keygen",         NULL,               option_option },
-        { "timeout",        &gt.timeout,        option_long   },
-        { "time-tolerance", &gt.time_tolerance, option_long   },
-        { "v4only",         NULL,               option_option },
-        { "v6only",         NULL,               option_option },
-        { "chacha20",       NULL,               option_option },
-        { "buf-size",       &gt.buf.size,       option_long   },
-        { "version",        NULL,               option_option },
-        {  NULL                                               },
-    };
-
-    // clang-format on
-
-    if (option(opts, argc, argv))
-        return 1;
-
-    int v4only = option_is_set(opts, "v4only");
-    int v6only = option_is_set(opts, "v6only");
-
-    if (v4only && v6only) {
-        gt_log("v4only and v6only cannot be both set\n");
-        return 1;
-    }
-
-    if ((int)gt.timeout <= 0) {
-        gt_log("bad timeout\n");
-        return 1;
-    }
-
-    if (gt.buf.size <= 0) {
-        gt_log("bad buf-size\n");
-        return 1;
-    }
-
-    if (v4only) {
-        gt.ipv4 = 1;
-        gt.ipv6 = 0;
-    }
-
-    if (v6only) {
-        gt.ipv4 = 0;
-        gt.ipv6 = 1;
-    }
-
-    gt.mtu_auto = option_is_set(opts, "mtu-auto");
-    gt.chacha20 = option_is_set(opts, "chacha20");
-    gt.version = option_is_set(opts, "version");
-    gt.keygen = option_is_set(opts, "keygen");
-    gt.persist = option_is_set(opts, "persist");
-
-    gt.buf.data = malloc(gt.buf.size);
-
-    return 0;
-}
-
-static void
-gt_setup_mtu(struct mud *mud, char *tun_name)
-{
-    int mtu = mud_get_mtu(mud);
-
-    if (mtu == (int)gt.mtu)
-        return;
-
-    gt.mtu = mtu;
-
-    gt_log("setup MTU to %i on interface %s\n", mtu, tun_name);
-
-    if (iface_set_mtu(tun_name, mtu) == -1)
-        perror("tun_set_mtu");
-}
-
 int
 main(int argc, char **argv)
 {
     gt_set_signal();
 
-    if (gt_setup_option(argc, argv))
+    struct {
-        return 1;
+        char *name;
+        char *help;
+        int (*call)(int, char **);
+    } cmd[] = {
+        {"show", "show tunnel info", gt_show},
+        {"bench", "start a crypto bench", gt_bench},
+        {"bind", "start a new tunnel", gt_bind},
+        {"set", "change tunnel properties", gt_set},
+        {"keygen", "generate a new secret key", gt_keygen},
+        {"path", "manage paths", gt_path},
+        {"version", "show version", gt_version},
+        {NULL}};
 
-    if (gt.version) {
+    if (argv[1]) {
-        gt_print(PACKAGE_VERSION "\n");
+        for (int k = 0; cmd[k].name; k++) {
-        return 0;
+            if (!str_cmp(cmd[k].name, argv[1]))
-    }
+                return cmd[k].call(argc - 1, argv + 1);
-
-    int icmp_fd = -1;
-
-    if (gt.ipv4 && gt.mtu_auto) {
-        icmp_fd = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
-
-        if (icmp_fd == -1)
-            gt_log("couldn't create ICMP socket\n");
-    }
-
-    struct mud *mud = mud_create(gt.bind.port, gt.ipv4, gt.ipv6);
-
-    if (!mud) {
-        gt_log("couldn't create mud\n");
-        return 1;
-    }
-
-    if (gt.keygen || str_empty(gt.keyfile)) {
-        if (mud_new_key(mud)) {
-            gt_log("couldn't generate a new key\n");
-            return 1;
         }
     }
 
-    if (gt.keygen) {
+    printf("available commands:\n\n");
-        gt_print_secretkey(mud);
-        return 0;
-    }
 
-    if (!gt.chacha20 && mud_set_aes(mud))
+    int len = 0;
-        gt_log("AES is not available\n");
 
-    if (gt.timeout > 0)
+    for (int k = 0; cmd[k].name; k++)
-        mud_set_send_timeout_msec(mud, gt.timeout);
+        len = MAX(len, (int)str_len(cmd[k].name, 32));
 
-    if (gt.time_tolerance > 0)
+    for (int k = 0; cmd[k].name; k++)
-        mud_set_time_tolerance_sec(mud, gt.time_tolerance);
+        printf("  %-*s  %s\n", len, cmd[k].name, cmd[k].help);
 
-    mud_set_mtu(mud, GT_MTU(gt.mtu));
+    printf("\n");
 
-    char *tun_name = NULL;
+    return 1;
-
-    int tun_fd = tun_create(gt.dev, &tun_name);
-
-    if (tun_fd == -1) {
-        gt_log("couldn't create tun device\n");
-        return 1;
-    }
-
-    if (tun_set_persist(tun_fd, gt.persist) == -1)
-        perror("tun_set_persist");
-
-    if (str_empty(gt.keyfile)) {
-        gt_print("here is your new secret key:\n");
-        gt_print_secretkey(mud);
-    } else {
-        if (gt_setup_secretkey(mud, gt.keyfile))
-            return 1;
-    }
-
-    if (gt.host && gt.port) {
-        if (gt.bind.backup) {
-            if (mud_peer(mud, gt.bind.backup, gt.host, gt.port, 1)) {
-                perror("mud_peer (backup)");
-                return 1;
-            }
-        }
-
-        if (gt.bind.list) {
-            char tmp[1024];
-            char *name = &tmp[0];
-
-            str_cpy(tmp, gt.bind.list, sizeof(tmp) - 1);
-
-            while (*name) {
-                char *p = name;
-
-                while (*p && *p != ',')
-                    p++;
-
-                if (*p)
-                    *p++ = 0;
-
-                if (mud_peer(mud, name, gt.host, gt.port, 0)) {
-                    perror("mud_peer");
-                    return 1;
-                }
-
-                name = p;
-            }
-        }
-    }
-
-    gt_setup_mtu(mud, tun_name);
-
-    int mud_fd = mud_get_fd(mud);
-
-    fd_set_nonblock(tun_fd);
-    fd_set_nonblock(mud_fd);
-
-    if (icmp_fd != -1)
-        fd_set_nonblock(icmp_fd);
-
-    gt_log("running...\n");
-
-    fd_set rfds;
-    FD_ZERO(&rfds);
-
-    int last_fd = 1 + MAX(tun_fd, MAX(mud_fd, icmp_fd));
-
-    while (!gt.quit) {
-        FD_SET(tun_fd, &rfds);
-        FD_SET(mud_fd, &rfds);
-
-        if (icmp_fd != -1)
-            FD_SET(icmp_fd, &rfds);
-
-        if (select(last_fd, &rfds, NULL, NULL, NULL) == -1) {
-            if (errno != EBADF)
-                continue;
-            perror("select");
-            return 1;
-        }
-
-        if (icmp_fd != -1 && FD_ISSET(icmp_fd, &rfds)) {
-            struct sockaddr_storage ss;
-            socklen_t sl = sizeof(ss);
-            ssize_t r = recvfrom(icmp_fd, gt.buf.data, gt.buf.size, 0,
-                                 (struct sockaddr *)&ss, &sl);
-            if (r >= 8) {
-                struct ip_common ic;
-                if (!ip_get_common(&ic, gt.buf.data, r) && ic.proto == 1) {
-                    unsigned char *data = &gt.buf.data[ic.hdr_size];
-                    if (data[0] == 3) {
-                        int mtu = (data[6] << 8) | data[7];
-                        if (mtu) {
-                            gt_log("received MTU from ICMP: %i\n", mtu);
-                            mud_set_mtu(mud, GT_MTU(mtu));
-                        }
-                    }
-                }
-            }
-        }
-
-        if (FD_ISSET(tun_fd, &rfds)) {
-            size_t size = 0;
-
-            while (gt.buf.size - size >= gt.mtu) {
-                const int r = tun_read(tun_fd, &gt.buf.data[size], gt.buf.size - size);
-
-                if (r <= 0 || r > gt.mtu)
-                    break;
-
-                struct ip_common ic;
-
-                if (ip_get_common(&ic, &gt.buf.data[size], r) || ic.size != r)
-                    break;
-
-                size += r;
-            }
-
-            int p = 0;
-
-            while (p < size) {
-                int tc = 0;
-                int q = p;
-
-                while (q < size) {
-                    struct ip_common ic;
-
-                    if ((ip_get_common(&ic, &gt.buf.data[q], size - q)) ||
-                        (ic.size > size - q))
-                        break;
-
-                    if (q + ic.size > p + gt.mtu)
-                        break;
-
-                    q += ic.size;
-
-                    if (tc < (ic.tc & 0xFC))
-                        tc = ic.tc & 0xFC;
-                }
-
-                if (p >= q)
-                    break;
-
-                int r = mud_send(mud, &gt.buf.data[p], q - p, tc);
-
-                if (r == -1 && errno == EMSGSIZE) {
-                    gt_setup_mtu(mud, tun_name);
-                } else {
-                    if (r == -1 && errno != EAGAIN)
-                        perror("mud_send");
-                }
-
-                p = q;
-            }
-        }
-
-        if (FD_ISSET(mud_fd, &rfds)) {
-            size_t size = 0;
-
-            while (gt.buf.size - size >= gt.mtu) {
-                const int r = mud_recv(mud, &gt.buf.data[size], gt.buf.size - size);
-
-                if (r <= 0) {
-                    if (r == -1 && errno != EAGAIN)
-                        perror("mud_recv");
-                    break;
-                }
-
-                size += r;
-            }
-
-            int p = 0;
-
-            while (p < size) {
-                struct ip_common ic;
-
-                if ((ip_get_common(&ic, &gt.buf.data[p], size - p)) ||
-                    (ic.size > size - p))
-                    break;
-
-                tun_write(tun_fd, &gt.buf.data[p], ic.size);
-
-                p += ic.size;
-            }
-        }
-    }
-
-    if (gt.reload && tun_fd >= 0) {
-        if (tun_set_persist(tun_fd, 1) == -1)
-            perror("tun_set_persist");
-    }
-
-    return 0;
 }

src/option.c

@@ -1,146 +0,0 @@
-#include "common.h"
-
-#include "option.h"
-#include "str.h"
-
-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]);
-        return -1;
-    }
-
-    memcpy(data, &argv[1], sizeof(argv[1]));
-
-    return 1;
-}
-
-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]);
-        return -1;
-    }
-
-    errno = 0;
-    char *end;
-    long val = strtol(argv[1], &end, 0);
-
-    if (errno || argv[1] == end) {
-        gt_print("argument `%s' is not a valid integer\n", argv[1]);
-        return -1;
-    }
-
-    memcpy(data, &val, sizeof(val));
-
-    return 1;
-}
-
-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))
-            return opts[k].set;
-    }
-
-    return 0;
-}
-
-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++)
-        opts[k].set = 0;
-
-    for (int i = 1; i < argc; i++) {
-        int found = 0;
-
-        for (int k = 0; opts[k].name; k++) {
-            if (str_cmp(opts[k].name, argv[i]))
-                continue;
-
-            if (opts[k].set) {
-                gt_print("option `%s' is already set\n", opts[k].name);
-                return -1;
-            }
-
-            int ret = opts[k].call(opts[k].data, argc - i, &argv[i]);
-
-            if (ret < 0)
-                return -1;
-
-            opts[k].set = 1;
-
-            i += ret;
-            found = 1;
-            break;
-        }
-
-        if (!found)
-            return i - 1;
-    }
-
-    return argc;
-}
-
-static int
-option_usage(struct option *opts, int slen)
-{
-    if (!opts)
-        return 0;
-
-    int len = 0;
-
-    for (int k = 0; opts[k].name; k++) {
-        if (len > 40) {
-            gt_print("\n%*s", slen, "");
-            len = 0;
-        }
-
-        len += gt_print(" [%s", opts[k].name);
-
-        if (opts[k].call == option_option) {
-            len += option_usage((struct option *)opts[k].data, slen + len);
-        } else {
-            len += gt_print(" ARG");
-        }
-
-        len += gt_print("]");
-    }
-
-    return len;
-}
-
-int
-option(struct option *opts, int argc, char **argv)
-{
-    int ret = option_option(opts, argc, argv);
-
-    if (ret == argc)
-        return 0;
-
-    if (ret < 0 || ret + 1 >= argc)
-        return 1;
-
-    gt_print("option `%s' is unknown\n", argv[ret + 1]);
-
-    int slen = gt_print("usage: %s", argv[0]);
-
-    if (slen > 40) {
-        slen = 12;
-        gt_print("\n%*s", slen, "");
-    }
-
-    option_usage(opts, slen);
-    gt_print("\n");
-
-    return 1;
-}

src/option.h

@@ -1,15 +0,0 @@
-#pragma once
-
-struct option {
-    char *name;
-    void *data;
-    int (*call) (void *, int, char **);
-    int set;
-};
-
-int option_option (void *, int, char **);
-int option_str    (void *, int, char **);
-int option_long   (void *, int, char **);
-
-int option_is_set (struct option *, const char *);
-int option        (struct option *, int, char **);

src/path.c

@@ -0,0 +1,215 @@
+#include "common.h"
+#include "ctl.h"
+#include "str.h"
+
+#include <stdio.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
+#include "../argz/argz.h"
+
+static void
+gt_path_print_status(struct mud_path *path, int term)
+{
+    char bindstr[INET6_ADDRSTRLEN];
+    char publstr[INET6_ADDRSTRLEN];
+    char peerstr[INET6_ADDRSTRLEN];
+
+    gt_toaddr(bindstr, sizeof(bindstr),
+            (struct sockaddr *)&path->local_addr);
+    gt_toaddr(publstr, sizeof(publstr),
+            (struct sockaddr *)&path->r_addr);
+    gt_toaddr(peerstr, sizeof(peerstr),
+            (struct sockaddr *)&path->addr);
+
+    const char *statestr = NULL;
+
+    switch (path->state) {
+        case MUD_UP:     statestr = "UP";     break;
+        case MUD_BACKUP: statestr = "BACKUP"; break;
+        case MUD_DOWN:   statestr = "DOWN";   break;
+        default:         return;
+    }
+
+    const char *statusstr = path->ok ? "OK" : "DEGRADED";
+
+    printf(term ? "path %s\n"
+            "  status:   %s\n"
+            "  bind:     %s port %"PRIu16"\n"
+            "  public:   %s port %"PRIu16"\n"
+            "  peer:     %s port %"PRIu16"\n"
+            "  mtu:      %zu bytes\n"
+            "  rtt:      %.3f ms\n"
+            "  rttvar:   %.3f ms\n"
+            "  rate tx:  %"PRIu64" bytes/sec\n"
+            "  rate rx:  %"PRIu64" bytes/sec\n"
+            "  total tx: %"PRIu64" packets\n"
+            "  total rx: %"PRIu64" packets\n"
+            : "path %s %s"
+            " %s %"PRIu16
+            " %s %"PRIu16
+            " %s %"PRIu16
+            " %zu"
+            " %.3f %.3f"
+            " %"PRIu64
+            " %"PRIu64
+            " %"PRIu64
+            " %"PRIu64
+            "\n",
+        statestr,
+        statusstr,
+        bindstr[0] ? bindstr : "-",
+        gt_get_port((struct sockaddr *)&path->local_addr),
+        publstr[0] ? publstr : "-",
+        gt_get_port((struct sockaddr *)&path->r_addr),
+        peerstr[0] ? peerstr : "-",
+        gt_get_port((struct sockaddr *)&path->addr),
+        path->mtu.ok,
+        (double)path->rtt.val / 1e3,
+        (double)path->rtt.var / 1e3,
+        path->rate_tx,
+        path->rate_rx,
+        path->send.total,
+        path->recv.total);
+}
+
+static int
+gt_path_cmp_addr(struct sockaddr_storage *a, struct sockaddr_storage *b)
+{
+    if (a->ss_family != b->ss_family)
+        return 1;
+
+    if (a->ss_family == AF_INET) {
+        struct sockaddr_in *A = (struct sockaddr_in *)a;
+        struct sockaddr_in *B = (struct sockaddr_in *)b;
+        return ((memcmp(&A->sin_addr, &B->sin_addr, sizeof(A->sin_addr))));
+    }
+
+    if (a->ss_family == AF_INET6) {
+        struct sockaddr_in6 *A = (struct sockaddr_in6 *)a;
+        struct sockaddr_in6 *B = (struct sockaddr_in6 *)b;
+        return ((memcmp(&A->sin6_addr, &B->sin6_addr, sizeof(A->sin6_addr))));
+    }
+
+    return 1;
+}
+
+static int
+gt_path_status(int fd, int state, struct sockaddr_storage *addr)
+{
+    struct ctl_msg req = {
+        .type = CTL_PATH_STATUS,
+    }, res = {0};
+
+    if (send(fd, &req, sizeof(struct ctl_msg), 0) == -1)
+        return -1;
+
+    struct mud_path path[MUD_PATH_MAX];
+    int count = 0;
+
+    while (1) {
+        if (recv(fd, &res, sizeof(struct ctl_msg), 0) == -1)
+            return -1;
+
+        if (res.type != req.type) {
+            errno = EBADMSG;
+            return -1;
+        }
+
+        if (res.ret == EAGAIN) {
+            memcpy(&path[count], &res.path_status, sizeof(struct mud_path));
+            count++;
+        } else if (res.ret) {
+            errno = res.ret;
+            return -1;
+        } else break;
+    }
+
+    int term = isatty(1);
+
+    for (int i = 0; i < count; i++) {
+        if ((state == MUD_EMPTY || path[i].state == state) &&
+            (!addr->ss_family || !gt_path_cmp_addr(addr, &path[i].local_addr)))
+            gt_path_print_status(&path[i], term);
+    }
+
+    return 0;
+}
+
+int
+gt_path(int argc, char **argv)
+{
+    const char *dev = NULL;
+
+    struct ctl_msg req = {
+        .type = CTL_STATE,
+        .path = {
+            .state = MUD_EMPTY,
+        },
+    }, res = {0};
+
+    struct argz ratez[] = {
+        {"tx", "BYTES/SEC", &req.path.rate_tx, argz_bytes},
+        {"rx", "BYTES/SEC", &req.path.rate_rx, argz_bytes},
+        {NULL}};
+
+    struct argz pathz[] = {
+        {NULL, "IPADDR", &req.path.addr, argz_addr},
+        {"dev", "NAME", &dev, argz_str},
+        {"up|backup|down", NULL, NULL, argz_option},
+        {"rate", NULL, &ratez, argz_option},
+        {NULL}};
+
+    if (argz(pathz, argc, argv))
+        return 1;
+
+    int fd = ctl_connect(GT_RUNDIR, dev);
+
+    if (fd < 0) {
+        switch (fd) {
+        case -1:
+            perror("path");
+            break;
+        case CTL_ERROR_NONE:
+            gt_log("no device\n");
+            break;
+        case CTL_ERROR_MANY:
+            gt_log("please choose a device\n");
+            break;
+        default:
+            gt_log("couldn't connect\n");
+        }
+        return 1;
+    }
+
+    int set_rate = argz_is_set(pathz, "rate");
+
+    if (set_rate && !req.path.addr.ss_family) {
+        gt_log("please specify a path\n");
+        return 1;
+    }
+
+    if (argz_is_set(pathz, "up")) {
+        req.path.state = MUD_UP;
+    } else if (argz_is_set(pathz, "backup")) {
+        req.path.state = MUD_BACKUP;
+    } else if (argz_is_set(pathz, "down")) {
+        req.path.state = MUD_DOWN;
+    }
+
+    int ret;
+
+    if (!req.path.addr.ss_family ||
+        (req.path.state == MUD_EMPTY && !set_rate)) {
+        ret = gt_path_status(fd, req.path.state, &req.path.addr);
+    } else {
+        ret = ctl_reply(fd, &res, &req);
+    }
+
+    if (ret == -1)
+        perror("path");
+
+    ctl_delete(fd);
+
+    return !!ret;
+}

src/set.c

@@ -0,0 +1,166 @@
+#include "common.h"
+#include "ctl.h"
+#include "str.h"
+
+#include <stdio.h>
+#include <sys/socket.h>
+
+#include "../argz/argz.h"
+
+static int
+gt_set_mtu(int fd, size_t mtu)
+{
+    struct ctl_msg res, req = {
+        .type = CTL_MTU,
+        .mtu = mtu,
+    };
+
+    int ret = ctl_reply(fd, &res, &req);
+
+    if (ret) {
+        perror("set mtu");
+        return 1;
+    }
+
+    printf("mtu set to %zu\n", res.mtu);
+
+    return 0;
+}
+
+static int
+gt_set_kxtimeout(int fd, unsigned long ms)
+{
+    struct ctl_msg res, req = {
+        .type = CTL_KXTIMEOUT,
+        .ms = ms,
+    };
+
+    int ret = ctl_reply(fd, &res, &req);
+
+    if (ret) {
+        perror("set kxtimeout");
+        return 1;
+    }
+
+    return 0;
+}
+
+static int
+gt_set_timetolerance(int fd, unsigned long ms)
+{
+    struct ctl_msg res, req = {
+        .type = CTL_TIMETOLERANCE,
+        .ms = ms,
+    };
+
+    int ret = ctl_reply(fd, &res, &req);
+
+    if (ret) {
+        perror("set timetolerance");
+        return 1;
+    }
+
+    return 0;
+}
+
+static int
+gt_set_tc(int fd, int tc)
+{
+    struct ctl_msg res, req = {
+        .type = CTL_TC,
+        .tc = tc,
+    };
+
+    int ret = ctl_reply(fd, &res, &req);
+
+    if (ret) {
+        perror("set tc");
+        return 1;
+    }
+
+    return 0;
+}
+
+static int
+gt_argz_tc(void *data, int argc, char **argv)
+{
+    if (argc < 1 || !argv[0])
+        return -1;
+
+    int val = 0;
+    const char *s = argv[0];
+
+    if ((s[0] == 'C') && (s[1] == 'S') &&
+        (s[2] >= '0') && (s[2] <= '7') && !s[3]) {
+        val = (s[2] - '0') << 3;
+    } else if ((s[0] == 'A') && (s[1] == 'F') &&
+               (s[2] >= '1') && (s[2] <= '4') &&
+               (s[3] >= '1') && (s[3] <= '3') && !s[4]) {
+        val = ((s[2] - '0') << 3) | ((s[3] - '0') << 1);
+    } else if ((s[0] == 'E') && (s[1] == 'F') && !s[2]) {
+        val = 46;
+    } else return -1;
+
+    if (data)
+        *(int *)data = val;
+
+    return 1;
+}
+
+int
+gt_set(int argc, char **argv)
+{
+    const char *dev = NULL;
+    size_t mtu;
+    int tc;
+    unsigned long kxtimeout;
+    unsigned long timetolerance;
+
+    struct argz pathz[] = {
+        {"dev", "NAME", &dev, argz_str},
+        {"mtu", "BYTES", &mtu, argz_bytes},
+        {"tc", "CS|AF|EF", &tc, gt_argz_tc},
+        {"kxtimeout", "SECONDS", &kxtimeout, argz_time},
+        {"timetolerance", "SECONDS", &timetolerance, argz_time},
+        {NULL}};
+
+    if (argz(pathz, argc, argv))
+        return 1;
+
+    int fd = ctl_connect(GT_RUNDIR, dev);
+
+    if (fd < 0) {
+        switch (fd) {
+        case -1:
+            perror("set");
+            break;
+        case CTL_ERROR_NONE:
+            gt_log("no device\n");
+            break;
+        case CTL_ERROR_MANY:
+            gt_log("please choose a device\n");
+            break;
+        default:
+            gt_log("couldn't connect\n");
+        }
+        return 1;
+    }
+
+    int ret = 0;
+
+    if (argz_is_set(pathz, "mtu"))
+        ret |= gt_set_mtu(fd, mtu);
+
+    if (argz_is_set(pathz, "tc"))
+        ret |= gt_set_tc(fd, tc);
+
+    if (argz_is_set(pathz, "kxtimeout"))
+        ret |= gt_set_kxtimeout(fd, kxtimeout);
+
+    if (argz_is_set(pathz, "timetolerance"))
+        ret |= gt_set_timetolerance(fd, timetolerance);
+
+    ctl_delete(fd);
+
+    return ret;
+}

src/show.c

@@ -0,0 +1,117 @@
+#include "common.h"
+#include "ctl.h"
+#include "str.h"
+
+#include "../argz/argz.h"
+
+#include <stdio.h>
+#include <sys/socket.h>
+#include <dirent.h>
+#include <sys/un.h>
+#include <arpa/inet.h>
+#include <unistd.h>
+
+static int
+gt_show_status(int fd)
+{
+    struct ctl_msg res, req = {.type = CTL_STATUS};
+
+    if (ctl_reply(fd, &res, &req))
+        return -1;
+
+    char bindstr[INET6_ADDRSTRLEN];
+    char peerstr[INET6_ADDRSTRLEN];
+
+    gt_toaddr(bindstr, sizeof(bindstr),
+              (struct sockaddr *)&res.status.bind);
+
+    int server = gt_toaddr(peerstr, sizeof(peerstr),
+                           (struct sockaddr *)&res.status.peer);
+
+    int term = isatty(1);
+
+    if (server) {
+        printf(term ? "server %s:\n"
+                      "  pid:    %li\n"
+                      "  bind:   %s port %"PRIu16"\n"
+                      "  mtu:    %zu\n"
+                      "  cipher: %s\n"
+                    : "server %s"
+                      " %li"
+                      " %s %"PRIu16
+                      " %zu"
+                      " %s"
+                      "\n",
+               res.status.tun_name,
+               res.status.pid,
+               bindstr[0] ? bindstr : "-",
+               gt_get_port((struct sockaddr *)&res.status.bind),
+               res.status.mtu,
+               res.status.chacha ? "chacha20poly1305" : "aes256gcm");
+    } else {
+        printf(term ? "client %s:\n"
+                      "  pid:    %li\n"
+                      "  bind:   %s port %"PRIu16"\n"
+                      "  peer:   %s port %"PRIu16"\n"
+                      "  mtu:    %zu\n"
+                      "  cipher: %s\n"
+                    : "client %s"
+                      " %li"
+                      " %s %"PRIu16
+                      " %s %"PRIu16
+                      " %zu"
+                      " %s"
+                      "\n",
+               res.status.tun_name,
+               res.status.pid,
+               bindstr[0] ? bindstr : "-",
+               gt_get_port((struct sockaddr *)&res.status.bind),
+               peerstr[0] ? peerstr : "-",
+               gt_get_port((struct sockaddr *)&res.status.peer),
+               res.status.mtu,
+               res.status.chacha ? "chacha20poly1305" : "aes256gcm");
+    }
+
+    return 0;
+}
+
+int
+gt_show(int argc, char **argv)
+{
+    const char *dev = NULL;
+
+    struct argz showz[] = {
+        {"dev", "NAME", &dev, argz_str},
+        {NULL}};
+
+    if (argz(showz, argc, argv))
+        return 1;
+
+    int fd = ctl_connect(GT_RUNDIR, dev);
+
+    if (fd < 0) {
+        switch (fd) {
+        case -1:
+            perror("show");
+            break;
+        case CTL_ERROR_NONE:
+            gt_log("no device\n");
+            break;
+        case CTL_ERROR_MANY:
+            gt_log("please choose a device\n");
+            break;
+        default:
+            gt_log("couldn't connect\n");
+        }
+        return 1;
+    }
+
+    int ret = gt_show_status(fd);
+
+    if (ret == -1)
+        perror("show");
+
+    ctl_delete(fd);
+
+    return !!ret;
+}

src/str.h

@@ -2,22 +2,6 @@
 
 #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)
 {
@@ -40,36 +24,10 @@ str_cmp(const char *restrict sa, const char *restrict sb)
 }
 
 _pure_ static inline size_t
-str_len(const char *restrict str)
+str_len(const char *restrict str, size_t len)
 {
     if (!str)
         return 0;
 
-    return strlen(str);
+    return strnlen(str, len);
-}
-
-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,16 +1,13 @@
 #include "common.h"
-
 #include "ip.h"
 #include "str.h"
 #include "tun.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__
@@ -33,17 +30,23 @@
 #ifdef __APPLE__
 
 static int
-tun_create_by_id(char *name, size_t size, unsigned id)
+tun_create_by_id(char *name, size_t len, unsigned id)
 {
+    int ret = snprintf(name, len, "utun%u", id);
+
+    if (ret <= 0 || (size_t)ret >= len) {
+        errno = EINVAL;
+        return -1;
+    }
+
     int fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
 
     if (fd == -1)
         return -1;
 
-    struct ctl_info ci;
+    struct ctl_info ci = {
-
+        .ctl_name = UTUN_CONTROL_NAME,
-    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;
@@ -67,13 +70,11 @@ tun_create_by_id(char *name, size_t size, unsigned id)
         return -1;
     }
 
-    snprintf(name, size, "utun%u", id);
-
     return fd;
 }
 
 static int
-tun_create_by_name(char *name, size_t size, char *dev_name)
+tun_create_by_name(char *name, size_t len, const char *dev_name)
 {
     unsigned id = 0;
 
@@ -82,7 +83,7 @@ tun_create_by_name(char *name, size_t size, char *dev_name)
         return -1;
     }
 
-    return tun_create_by_id(name, size, id);
+    return tun_create_by_id(name, len, id);
 }
 
 #else /* not __APPLE__ */
@@ -90,25 +91,37 @@ tun_create_by_name(char *name, size_t size, char *dev_name)
 #ifdef __linux__
 
 static int
-tun_create_by_name(char *name, size_t size, char *dev_name)
+tun_create_by_name(char *name, size_t len, const char *dev_name)
 {
-    int fd = open("/dev/net/tun", O_RDWR);
+    int ret = snprintf(name, len, "%s", dev_name);
 
-    if (fd == -1)
+    if (ret <= 0 || (size_t)ret >= len) {
+        errno = EINVAL;
         return -1;
+    }
 
     struct ifreq ifr = {
         .ifr_flags = IFF_TUN | IFF_NO_PI,
     };
 
-    str_cpy(ifr.ifr_name, dev_name, IFNAMSIZ - 1);
+    ret = snprintf(ifr.ifr_name, sizeof(ifr.ifr_name), "%s", dev_name);
 
-    if (ioctl(fd, TUNSETIFF, &ifr)) {
+    if (ret <= 0 || (size_t)ret >= sizeof(ifr.ifr_name)) {
-        close(fd);
+        errno = EINVAL;
         return -1;
     }
 
-    str_cpy(name, ifr.ifr_name, size - 1);
+    int fd = open("/dev/net/tun", O_RDWR);
+
+    if (fd == -1)
+        return -1;
+
+    if (ioctl(fd, TUNSETIFF, &ifr)) {
+        int err = errno;
+        close(fd);
+        errno = err;
+        return -1;
+    }
 
     return fd;
 }
@@ -116,46 +129,48 @@ 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)
+tun_create_by_name(char *name, size_t len, const char *dev_name)
 {
-    char path[64];
+    int ret = snprintf(name, len, "/dev/%s", dev_name);
 
-    snprintf(path, sizeof(path), "/dev/%s", dev_name);
+    if (ret <= 0 || (size_t)ret >= len) {
-    str_cpy(name, dev_name, size - 1);
+        errno = EINVAL;
+        return -1;
+    }
 
-    return open(path, O_RDWR);
+    return open(tmp, O_RDWR);
 }
 
 #endif /* not __APPLE__ */
 
 static int
-tun_create_by_id(char *name, size_t size, unsigned id)
+tun_create_by_id(char *name, size_t len, unsigned id)
 {
-    char dev_name[64];
+    char tmp[64];
+    int ret = snprintf(tmp, sizeof(tmp), "tun%u", id);
 
-    snprintf(dev_name, sizeof(dev_name), "tun%u", id);
+    if (ret <= 0 || (size_t)ret >= sizeof(tmp)) {
+        errno = EINVAL;
+        return -1;
+    }
 
-    return tun_create_by_name(name, size, dev_name);
+    return tun_create_by_name(name, len, tmp);
 }
 
 #endif
 
 int
-tun_create(char *dev_name, char **ret_name)
+tun_create(char *name, size_t len, const char *dev_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);
+            fd = tun_create_by_id(name, len, id);
     } else {
-        fd = tun_create_by_name(name, sizeof(name), dev_name);
+        fd = tun_create_by_name(name, len, dev_name);
     }
 
-    if (fd != -1 && ret_name)
-        *ret_name = strdup(name);
-
     return fd;
 }
 
@@ -179,17 +194,17 @@ tun_read(int fd, void *data, size_t size)
         },
     };
 
-    ssize_t ret = readv(fd, iov, 2);
+    int ret = (int)readv(fd, iov, 2);
 
-    if (ret <= (ssize_t)0)
+    if (ret <= 0)
         return ret;
 
-    if (ret <= (ssize_t)sizeof(family))
+    if ((size_t)ret <= sizeof(family))
         return 0;
 
-    return ret - sizeof(family);
+    return ret - (int)sizeof(family);
 #else
-    return read(fd, data, size);
+    return (int)read(fd, data, size);
 #endif
 }
 
@@ -202,7 +217,7 @@ tun_write(int fd, const void *data, size_t size)
 #ifdef GT_BSD_TUN
     uint32_t family;
 
-    switch (ip_get_version(data, size)) {
+    switch (ip_get_version(data, (int)size)) {
     case 4:
         family = htonl(AF_INET);
         break;
@@ -225,17 +240,17 @@ tun_write(int fd, const void *data, size_t size)
         },
     };
 
-    ssize_t ret = writev(fd, iov, 2);
+    int ret = (int)writev(fd, iov, 2);
 
-    if (ret <= (ssize_t)0)
+    if (ret <= 0)
         return ret;
 
-    if (ret <= (ssize_t)sizeof(family))
+    if ((size_t)ret <= sizeof(family))
         return 0;
 
-    return ret - sizeof(family);
+    return ret - (int)sizeof(family);
 #else
-    return write(fd, data, size);
+    return (int)write(fd, data, size);
 #endif
 }
 

src/tun.h

@@ -1,6 +1,6 @@
 #pragma once
 
-int tun_create      (char *, char **);
+int tun_create      (char *, size_t, const char *);
 int tun_read        (int, void *, size_t);
 int tun_write       (int, const void *, size_t);
 int tun_set_persist (int, int);

systemd/glorytun-run

@@ -1,29 +1,6 @@
 #!/bin/sh
 
-if [ ! -f "$1" ]; then
+exec glorytun bind "$@" \
-	echo "usage: $(basename "$0") FILE"
+	$BIND $BIND_PORT \
-	exit 1
+	${DEV:+dev "$DEV"} \
-fi
+	${HOST:+to "$HOST" "$PORT"}
-
-. "$(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

@@ -7,36 +7,69 @@ _ask() {
 	read -r "$2"
 }
 
-_NAME=tun0
+_ask "Config filename (tun0)" NAME
-_ask "Config filename ($_NAME)" NAME
+NAME=${NAME:-tun0}
-NAME=${NAME:-$_NAME}
+DIR="/etc/glorytun/$NAME"
 
-if [ -f /etc/glorytun/"$NAME" ]; then
+if [ -d "$DIR" ]; then
 	echo "This config already exit!"
 	exit 1
 fi
 
 _ask "Server ip (enter for server conf)" HOST
+if [ -z "$HOST" ]; then
+	_ask "Bind to port (5000)" BIND_PORT
+	BIND_PORT=${BIND_PORT:-5000}
+else
+	_ask "Server port (5000)" PORT
+	PORT=${PORT:-5000}
+fi
+
+BIND=0.0.0.0
+case "$HOST" in
+	*:*) BIND=::
+esac
 
 _ask "Server key (enter to generate a new one)" KEY
 if [ -z "$KEY" ]; then
-	KEY=$(glorytun keygen) || exit
+	KEY=$(glorytun keygen)
 	echo "Your new key: $KEY"
 fi
 
-mkdir -p /etc/glorytun
+# install files
-FILE="/etc/glorytun/$NAME"
+mkdir -p "$DIR"
 
-echo "${HOST:+HOST=$HOST}" > "$FILE"
+cat > "$DIR/env" <<EOF
+DEV=gt${HOST:+c}-$NAME
+HOST=$HOST
+PORT=$PORT
+BIND=$BIND
+BIND_PORT=$BIND_PORT
+OPTIONS=
+EOF
 
-touch "$FILE.key"
+( umask 077; echo "$KEY" > "$DIR/key" )
-chmod 600 "$FILE.key"
-echo "$KEY" > "$FILE.key"
 
+[ "$HOST" ] && cat > "$DIR/post.sh" <<'EOF'
+#!/bin/sh
+
+PREF=32765
+TABLE=200
+
+# keep the current route to HOST
+SRC=$(ip route get "$HOST" | awk '/src/{getline;print $0}' RS=' ')
+ip rule add from "$SRC" table main pref "$((PREF-1))" || true
+
+# limit to 100Mbit by default
+glorytun path up "$SRC" dev "$DEV" rate rx 12500000 tx 12500000
+
+# forward everything else to the tunnel
+ip rule add from all table "$TABLE" pref "$PREF" || true
+EOF
+[ -f "$DIR/post.sh" ] && chmod u+x "$DIR/post.sh"
+
+# start services
 _ask "Start glorytun now ? (enter to skip)" START
-case "$START" in
+case "$START" in y*|Y*)
-	y*|Y*)
+	systemctl start glorytun@"$NAME" ;;
-		systemctl restart systemd-networkd
-		systemctl start glorytun@"$NAME"
-		;;
 esac

systemd/glorytun@.service.in

@@ -5,7 +5,9 @@ After=network.target
 [Service]
 Type=simple
 Restart=always
-ExecStart=@bindir@/glorytun-run /etc/glorytun/%i
+EnvironmentFile=/etc/glorytun/%i/env
+ExecStart=@bindir@/glorytun-run keyfile /etc/glorytun/%i/key $OPTIONS
+ExecStartPost=-/etc/glorytun/%i/post.sh
 CapabilityBoundingSet=CAP_NET_ADMIN
 
 [Install]

version.sh

@@ -1,13 +1,15 @@
 #!/bin/sh
 
-[ -z "${VERSION}" ] && VERSION=`git describe --tags --match='v[0-9].*' 2>/dev/null` \
+export GIT_DIR=.git
-                    && VERSION=${VERSION#v}
+export GIT_WORK_TREE=.
 
-[ -z "${VERSION}" ] && VERSION=`cat VERSION 2>/dev/null`
+[ -z "$VERSION" ] && VERSION="$(git describe --tags --match='v[0-9].*' 2>/dev/null)" \
+                  && VERSION="${VERSION#v}"
 
-[ -z "${VERSION}" ] && VERSION=0.0.0
+[ -z "$VERSION" ] && VERSION="$(git rev-parse HEAD 2>/dev/null)"
 
-[ "$1" = "major"  ] && printf ${VERSION%%.*} \
+[ -z "$VERSION" ] && VERSION="$(cat VERSION 2>/dev/null)"
-                    && exit 0
 
-printf ${VERSION} | tee VERSION
+[ -z "$VERSION" ] && VERSION="0.0.0"
+
+printf "%s" "$VERSION" | tee VERSION