Update README.md

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

.gitignore

@@ -1,9 +1,9 @@
 *.o
 *.log
 *.scan
-*.m4
 *.cache
 *.status
+aclocal.m4
 Makefile
 Makefile.in
 configure
@@ -11,3 +11,5 @@ build-aux
 .deps
 .dirstamp
 glorytun
+build*
+VERSION

.gitmodules

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

.travis.yml

@@ -14,7 +14,22 @@ before_script:
     - export PKG_CONFIG_PATH=/tmp/lib/pkgconfig
     - git clone https://github.com/jedisct1/libsodium.git --branch=stable
     - cd libsodium && ./autogen.sh && ./configure --enable-minimal --disable-dependency-tracking --prefix=/tmp && make install && cd -
-    - ./autogen.sh    
+    - ./autogen.sh
 
 script:
     - ./configure --disable-dependency-tracking && make distcheck
+
+deploy:
+    provider: releases
+    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_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-2019, angt
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

Makefile.am

@@ -1,13 +1,40 @@
+ACLOCAL_AMFLAGS = -I m4 --install
+
 bin_PROGRAMS = glorytun
+
 glorytun_CFLAGS = $(libsodium_CFLAGS)
 glorytun_LDADD = $(libsodium_LIBS)
 glorytun_SOURCES = \
-    src/common.h \
+    argz/argz.c \
-    src/common-static.h \
+    argz/argz.h \
+    mud/mud.c \
+    mud/mud.h \
+    src/bench.c \
+    src/bind.c \
     src/common.c \
-    src/ip-static.h \
+    src/common.h \
+    src/ctl.c \
+    src/ctl.h \
+    src/iface.c \
+    src/iface.h \
+    src/ip.h \
+    src/keygen.c \
     src/main.c \
-    src/option.c \
+    src/path.c \
-    src/option.h \
+    src/set.c \
+    src/show.c \
+    src/str.h \
+    src/sync.c \
     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,20 +1,132 @@
-# glorytun
+# Glorytun
 
-**Work In Progress:** Do not touch!
+Glorytun is a small, simple and secure VPN over [mud](https://github.com/angt/mud).
 
-glorytun depends on [libsodium](https://github.com/jedisct1/libsodium) version >= 1.0.4
+## Compatibility
-and needs an AES-NI capable CPU.
 
-To build and install the latest version:
+Glorytun only depends on [libsodium](https://github.com/jedisct1/libsodium) version >= 1.0.4.
+Which can be installed on a wide variety of systems.
+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.
 
-    $ git clone https://github.com/angt/glorytun
+## Features
-    $ cd glorytun
-    $ ./autogen.sh
-    $ ./configure
-    $ make
-    # make install
 
-To create and use a new secret key:
+The key features of Glorytun come directly from mud:
 
-    $ dd if=/dev/urandom of=glorytun.key bs=32 count=1
+ * **Fast and highly secure**
-    # glorytun keyfile glorytun.key [...]
+
+   The use of UDP and [libsodium](https://github.com/jedisct1/libsodium) allows you to secure
+   your communications without impacting performance.
+   Glorytun uses AES only if AES-NI is available otherwise ChaCha20 is used.
+   You can force the use of ChaCha20 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.
+
+ * **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
+
+We recommend the use of [meson](http://mesonbuild.com) for building instead of
+the more classical autotools suite (also available for old systems).
+
+On Ubuntu, the following command should be sufficient to get all the necessary build dependencies:
+
+    $ sudo apt-get install meson libsodium-dev pkg-config
+
+To build and install the latest release from github:
+
+    $ git clone https://github.com/angt/glorytun --recursive
+    $ meson glorytun glorytun/build
+    $ sudo ninja -C glorytun/build install
+
+This will install all binaries in `/usr/local/bin` by default.
+
+You can easily customize your setup with meson (see `meson help`).
+
+## Usage
+
+Just run `glorytun` with no arguments to view the list of available commands:
+
+```
+$ glorytun
+available commands:
+
+  show     show all running tunnels
+  bench    start a crypto bench
+  bind     start a new tunnel
+  set      change tunnel properties
+  sync     re-sync tunnels
+  keygen   generate a new secret key
+  path     manage paths
+  version  show version
+
+```
+
+Use the keyword `help` after a command to show its usage.
+
+## Mini HowTo
+
+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 :)
+
+---
+
+For feature requests and bug reports, please create an [issue](https://github.com/angt/glorytun/issues).

autogen.sh

@@ -1,2 +1,3 @@
 #!/bin/sh
+
 autoreconf -i -f

configure.ac

@@ -1,15 +1,22 @@
 AC_PREREQ([2.65])
-AC_INIT([glorytun], [0.0.3], [https://github.com/angt/glorytun/issues],
+AC_INIT([glorytun],
-        [glorytun], [https://github.com/angt/glorytun])
+        [m4_esyscmd([./version.sh])],
+        [https://github.com/angt/glorytun/issues],
+        [glorytun],
+        [https://github.com/angt/glorytun])
 AC_CONFIG_SRCDIR([src/common.h])
 AC_CONFIG_AUX_DIR([build-aux])
-AM_INIT_AUTOMAKE([1.9 -Wall -Werror foreign tar-ustar subdir-objects])
+AC_CONFIG_MACRO_DIR([m4])
+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([getaddrinfo], [resolv nsl])
 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])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

m4/pkg.m4

@@ -0,0 +1,275 @@
+# pkg.m4 - Macros to locate and utilise pkg-config.   -*- Autoconf -*-
+# serial 12 (pkg-config-0.29.2)
+
+dnl Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
+dnl Copyright © 2012-2015 Dan Nicholson <dbn.lists@gmail.com>
+dnl
+dnl This program is free software; you can redistribute it and/or modify
+dnl it under the terms of the GNU General Public License as published by
+dnl the Free Software Foundation; either version 2 of the License, or
+dnl (at your option) any later version.
+dnl
+dnl This program is distributed in the hope that it will be useful, but
+dnl WITHOUT ANY WARRANTY; without even the implied warranty of
+dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+dnl General Public License for more details.
+dnl
+dnl You should have received a copy of the GNU General Public License
+dnl along with this program; if not, write to the Free Software
+dnl Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+dnl 02111-1307, USA.
+dnl
+dnl As a special exception to the GNU General Public License, if you
+dnl distribute this file as part of a program that contains a
+dnl configuration script generated by Autoconf, you may include it under
+dnl the same distribution terms that you use for the rest of that
+dnl program.
+
+dnl PKG_PREREQ(MIN-VERSION)
+dnl -----------------------
+dnl Since: 0.29
+dnl
+dnl Verify that the version of the pkg-config macros are at least
+dnl MIN-VERSION. Unlike PKG_PROG_PKG_CONFIG, which checks the user's
+dnl installed version of pkg-config, this checks the developer's version
+dnl of pkg.m4 when generating configure.
+dnl
+dnl To ensure that this macro is defined, also add:
+dnl m4_ifndef([PKG_PREREQ],
+dnl     [m4_fatal([must install pkg-config 0.29 or later before running autoconf/autogen])])
+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.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
+
+dnl PKG_PROG_PKG_CONFIG([MIN-VERSION])
+dnl ----------------------------------
+dnl Since: 0.16
+dnl
+dnl Search for the pkg-config tool and set the PKG_CONFIG variable to
+dnl first found in the path. Checks that the version of pkg-config found
+dnl is at least MIN-VERSION. If MIN-VERSION is not specified, 0.9.0 is
+dnl used since that's the first version where most current features of
+dnl pkg-config existed.
+AC_DEFUN([PKG_PROG_PKG_CONFIG],
+[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
+m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$])
+m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$])
+AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])
+AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path])
+AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path])
+
+if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
+	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+fi
+if test -n "$PKG_CONFIG"; then
+	_pkg_min_version=m4_default([$1], [0.9.0])
+	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+		AC_MSG_RESULT([yes])
+	else
+		AC_MSG_RESULT([no])
+		PKG_CONFIG=""
+	fi
+fi[]dnl
+])dnl PKG_PROG_PKG_CONFIG
+
+dnl PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------------------------------
+dnl Since: 0.18
+dnl
+dnl Check to see whether a particular set of modules exists. Similar to
+dnl PKG_CHECK_MODULES(), but does not set variables or print errors.
+dnl
+dnl Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+dnl only at the first occurence in configure.ac, so if the first place
+dnl it's called might be skipped (such as if it is within an "if", you
+dnl have to call PKG_CHECK_EXISTS manually
+AC_DEFUN([PKG_CHECK_EXISTS],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+if test -n "$PKG_CONFIG" && \
+    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
+  m4_default([$2], [:])
+m4_ifvaln([$3], [else
+  $3])dnl
+fi])
+
+dnl _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
+dnl ---------------------------------------------
+dnl Internal wrapper calling pkg-config via PKG_CONFIG and setting
+dnl pkg_failed based on the result.
+m4_define([_PKG_CONFIG],
+[if test -n "$$1"; then
+    pkg_cv_[]$1="$$1"
+ elif test -n "$PKG_CONFIG"; then
+    PKG_CHECK_EXISTS([$3],
+                     [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes ],
+		     [pkg_failed=yes])
+ else
+    pkg_failed=untried
+fi[]dnl
+])dnl _PKG_CONFIG
+
+dnl _PKG_SHORT_ERRORS_SUPPORTED
+dnl ---------------------------
+dnl Internal check to see if pkg-config supports short errors.
+AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi[]dnl
+])dnl _PKG_SHORT_ERRORS_SUPPORTED
+
+
+dnl PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl --------------------------------------------------------------
+dnl Since: 0.4.0
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES might not happen, you should be sure to include an
+dnl explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
+AC_DEFUN([PKG_CHECK_MODULES],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+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 $2])
+
+_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
+_PKG_CONFIG([$1][_LIBS], [libs], [$2])
+
+m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS
+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])
+        _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
+	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+
+	m4_default([$4], [AC_MSG_ERROR(
+[Package requirements ($2) were not met:
+
+$$1_PKG_ERRORS
+
+Consider adjusting the PKG_CONFIG_PATH environment variable if you
+installed software in a non-standard prefix.
+
+_PKG_TEXT])[]dnl
+        ])
+elif test $pkg_failed = untried; then
+        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
+path to pkg-config.
+
+_PKG_TEXT
+
+To get pkg-config, see <http://pkg-config.freedesktop.org/>.])[]dnl
+        ])
+else
+	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+        AC_MSG_RESULT([yes])
+	$3
+fi[]dnl
+])dnl PKG_CHECK_MODULES
+
+
+dnl PKG_CHECK_MODULES_STATIC(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
+dnl   [ACTION-IF-NOT-FOUND])
+dnl ---------------------------------------------------------------------
+dnl Since: 0.29
+dnl
+dnl Checks for existence of MODULES and gathers its build flags with
+dnl static libraries enabled. Sets VARIABLE-PREFIX_CFLAGS from --cflags
+dnl and VARIABLE-PREFIX_LIBS from --libs.
+dnl
+dnl Note that if there is a possibility the first call to
+dnl PKG_CHECK_MODULES_STATIC might not happen, you should be sure to
+dnl include an explicit call to PKG_PROG_PKG_CONFIG in your
+dnl configure.ac.
+AC_DEFUN([PKG_CHECK_MODULES_STATIC],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+_save_PKG_CONFIG=$PKG_CONFIG
+PKG_CONFIG="$PKG_CONFIG --static"
+PKG_CHECK_MODULES($@)
+PKG_CONFIG=$_save_PKG_CONFIG[]dnl
+])dnl PKG_CHECK_MODULES_STATIC
+
+
+dnl PKG_INSTALLDIR([DIRECTORY])
+dnl -------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable pkgconfigdir as the location where a module
+dnl should install pkg-config .pc files. By default the directory is
+dnl $libdir/pkgconfig, but the default can be changed by passing
+dnl DIRECTORY. The user can override through the --with-pkgconfigdir
+dnl parameter.
+AC_DEFUN([PKG_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([pkgconfigdir],
+    [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],,
+    [with_pkgconfigdir=]pkg_default)
+AC_SUBST([pkgconfigdir], [$with_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_INSTALLDIR
+
+
+dnl PKG_NOARCH_INSTALLDIR([DIRECTORY])
+dnl --------------------------------
+dnl Since: 0.27
+dnl
+dnl Substitutes the variable noarch_pkgconfigdir as the location where a
+dnl module should install arch-independent pkg-config .pc files. By
+dnl default the directory is $datadir/pkgconfig, but the default can be
+dnl changed by passing DIRECTORY. The user can override through the
+dnl --with-noarch-pkgconfigdir parameter.
+AC_DEFUN([PKG_NOARCH_INSTALLDIR],
+[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])])
+m4_pushdef([pkg_description],
+    [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@])
+AC_ARG_WITH([noarch-pkgconfigdir],
+    [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],,
+    [with_noarch_pkgconfigdir=]pkg_default)
+AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir])
+m4_popdef([pkg_default])
+m4_popdef([pkg_description])
+])dnl PKG_NOARCH_INSTALLDIR
+
+
+dnl PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE,
+dnl [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
+dnl -------------------------------------------
+dnl Since: 0.28
+dnl
+dnl Retrieves the value of the pkg-config variable for the given module.
+AC_DEFUN([PKG_CHECK_VAR],
+[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
+AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl
+
+_PKG_CONFIG([$1], [variable="][$3]["], [$2])
+AS_VAR_COPY([$1], [pkg_cv_][$1])
+
+AS_VAR_IF([$1], [""], [$5], [$4])dnl
+])dnl PKG_CHECK_VAR

meson.build

@@ -0,0 +1,63 @@
+project('glorytun', 'c',
+    version: run_command('./version.sh').stdout(),
+    license: 'BSD-3-Clause',
+    default_options : [
+      'buildtype=debugoptimized',
+      'c_std=gnu99'
+    ]
+)
+
+cc = meson.get_compiler('c')
+
+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')
+add_global_arguments('-DPACKAGE_NAME="'+meson.project_name()+'"', language : 'c')
+
+executable('glorytun', install: true,
+  sources: [
+    'argz/argz.c',
+    'mud/mud.c',
+    'src/bench.c',
+    'src/bind.c',
+    'src/common.c',
+    'src/ctl.c',
+    'src/iface.c',
+    'src/keygen.c',
+    'src/main.c',
+    'src/path.c',
+    'src/set.c',
+    'src/show.c',
+    'src/sync.c',
+    'src/tun.c',
+  ],
+  dependencies: [
+    dependency('libsodium', version : '>=1.0.4'),
+    cc.find_library('m', required : false)
+  ]
+)
+
+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/bench.c

@@ -0,0 +1,159 @@
+#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"
+
+#define STR_S(X) (((X) > 1) ? "s" : "")
+
+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 tv.tv_sec * 1000000ULL + tv.tv_nsec / 1000ULL;
+#else
+    struct timeval tv;
+    gettimeofday(&tv, NULL);
+    return tv.tv_sec * 1000000ULL + 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 chacha = argz_is_set(bench_argz, "chacha");
+
+    if (!chacha && !crypto_aead_aes256gcm_is_available()) {
+        gt_log("aes is not available on your platform\n");
+        return 1;
+    }
+
+    unsigned char *buf = calloc(1, bufsize + crypto_aead_aes256gcm_ABYTES);
+
+    if (!buf) {
+        perror("calloc");
+        return 1;
+    }
+
+    unsigned char npub[crypto_aead_aes256gcm_NPUBBYTES];
+    unsigned char key[crypto_aead_aes256gcm_KEYBYTES];
+
+    randombytes_buf(npub, sizeof(npub));
+    randombytes_buf(key, sizeof(key));
+
+    if (term) {
+        printf("\n");
+        printf("  %-10s %s\n", "bench", chacha ? "chacha20poly1305" : "aes256gcm");
+        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)) {
+            crypto_aead_aes256gcm_state ctx;
+
+            if (!chacha)
+                crypto_aead_aes256gcm_beforenm(&ctx, key);
+
+            unsigned long long now = gt_now();
+            double mbps_old = mbps;
+            size_t bytes = 0;
+
+            gt_alarm = 0;
+            alarm(duration);
+
+            while (!gt_quit && !gt_alarm) {
+                if (chacha) {
+                    crypto_aead_chacha20poly1305_encrypt(
+                        buf, NULL, buf, 1ULL << i, NULL, 0, NULL, npub, key);
+                } else {
+                    crypto_aead_aes256gcm_encrypt_afternm(
+                        buf, NULL, buf, 1ULL << i, NULL, 0, NULL, npub,
+                        (const crypto_aead_aes256gcm_state *)&ctx);
+                }
+                bytes += 1ULL << i;
+            }
+
+            total_dt += gt_now() - now;
+            total_bytes += bytes;
+
+            mbps = (total_bytes * 8.0) / 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,348 @@
+#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 void
+fd_set_nonblock(int fd)
+{
+    int ret;
+
+    if (fd == -1)
+        return;
+
+    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);
+
+    if (ret == -1)
+        perror("fcntl O_NONBLOCK");
+}
+
+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) {
+        perror("open keyfile");
+        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 += 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 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)
+        perror("tun_set_mtu");
+
+    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) - 1, 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)
+        perror("tun_set_persist");
+
+    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) {
+        perror("ctl_create");
+        return 1;
+    }
+
+    fd_set_nonblock(tun_fd);
+    fd_set_nonblock(mud_fd);
+    fd_set_nonblock(ctl_fd);
+
+    const long pid = (long)getpid();
+
+    gt_log("running on device %s as pid %li\n", tun_name, pid);
+
+    fd_set rfds;
+    FD_ZERO(&rfds);
+
+    const int last_fd = 1 + MAX(tun_fd, MAX(mud_fd, ctl_fd));
+
+    unsigned char buf[4096];
+
+    while (!gt_quit) {
+        unsigned long send_wait = mud_send_wait(mud);
+
+        if (send_wait) {
+            FD_CLR(tun_fd, &rfds);
+        } else {
+            FD_SET(tun_fd, &rfds);
+        }
+
+        FD_SET(mud_fd, &rfds);
+        FD_SET(ctl_fd, &rfds);
+
+        struct timeval tv = {
+            .tv_sec  = 0,
+            .tv_usec = send_wait,
+        };
+
+        const int ret = select(last_fd, &rfds, NULL, NULL, send_wait ? &tv : NULL);
+
+        if (ret == -1) {
+            if (errno == EBADF) {
+                perror("select");
+                break;
+            }
+            continue;
+        }
+
+        mtu = gt_setup_mtu(mud, mtu, tun_name);
+
+        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:
+                    res.status.pid = pid;
+                    res.status.mtu = mtu;
+                    res.status.chacha = chacha;
+                    res.status.bind = bind_addr;
+                    res.status.peer = peer_addr;
+                    break;
+                case CTL_SYNC:
+                    res.ms = mud_sync(mud);
+                    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 (FD_ISSET(mud_fd, &rfds)) {
+            const int r = mud_recv(mud, buf, sizeof(buf));
+
+            if (ip_is_valid(buf, r))
+                tun_write(tun_fd, buf, r);
+        }
+
+        if (FD_ISSET(tun_fd, &rfds) && !mud_send_wait(mud)) {
+            struct ip_common ic;
+            const int r = tun_read(tun_fd, buf, sizeof(buf));
+
+            if (!ip_get_common(&ic, buf, r)) {
+             // TODO: disable hash for now
+             // unsigned char hash[crypto_shorthash_BYTES];
+             // crypto_shorthash(hash, (const unsigned char *)&ic, sizeof(ic), hashkey);
+
+                unsigned h = 0;
+             // memcpy(&h, hash, sizeof(h));
+
+                mud_send(mud, buf, r, (h << 8) | ic.tc);
+            }
+        }
+    }
+
+    if (gt_reload && tun_fd >= 0) {
+        if (tun_set_persist(tun_fd, 1) == -1)
+            perror("tun_set_persist");
+    }
+
+    mud_delete(mud);
+    ctl_delete(ctl_fd);
+
+    return 0;
+}

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,10 @@
 #include "common.h"
 
-#include <stdio.h>
 #include <stdarg.h>
+#include <stdio.h>
 
-int gt_print (const char *fmt, ...)
+void
-{
+gt_log(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, ...)
 {
     va_list ap;
     va_start(ap, fmt);
@@ -24,17 +12,105 @@ 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;
+}
+
+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, size);
+    case AF_INET6:
+        return -!inet_ntop(AF_INET6,
+                           &((struct sockaddr_in6 *)sa)->sin6_addr, str, size);
+    }
+
+    errno = EAFNOSUPPORT;
+    return -1;
 }

src/common.h

@@ -1,9 +1,31 @@
 #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>
 
-#define COUNT(x) (sizeof(x)/sizeof(x[0]))
+#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)
 #define ALIGN_MASK     (ALIGN_SIZE-1)
@@ -14,20 +36,42 @@
 #define PALIGN(x)      ((void *)ALIGN((size_t)(x)))
 #define PALIGN_DOWN(x) ((void *)ALIGN_DOWN((size_t)(x)))
 
-#define _printf_(A,B)  __attribute__((format(printf,A,B)))
+#define _1_(x)         (__builtin_expect((x), 1))
-#define _noreturn_     __attribute__((noreturn))
+#define _0_(x)         (__builtin_expect((x), 0))
-#define _unused_       __attribute__((unused))
 
-typedef struct buffer buffer_t;
+#define CLZ(x)         (__builtin_clz(x))
 
-struct buffer {
+#define _printf_(A,B)  __attribute__ ((format(printf,A,B)))
-    uint8_t *data;
+#define _noreturn_     __attribute__ ((noreturn))
-    uint8_t *read;
+#define _unused_       __attribute__ ((unused))
-    uint8_t *write;
+#define _pure_         __attribute__ ((pure))
-    uint8_t *end;
+#define _const_        __attribute__ ((const))
-};
+#define _align_(...)   __attribute__ ((aligned(__VA_ARGS__)))
+
+#undef MAX
+#define MAX(x,y) ({ __typeof__(x) X=(x); __typeof__(y) Y=(y); X > Y ? X : Y; })
+
+#undef MIN
+#define MIN(x,y) ({ __typeof__(x) X=(x); __typeof__(y) Y=(y); X < Y ? X : Y; })
+
+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);
-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);
+
+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 **);
+int gt_sync   (int, char **);

src/ctl.c

@@ -0,0 +1,194 @@
+#include "common.h"
+#include "ctl.h"
+#include "str.h"
+
+#include <stdio.h>
+#include <unistd.h>
+#include <dirent.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
+#include <sys/un.h>
+
+#define CTL_BIND_MAX 64
+
+int
+ctl_reply(int fd, struct ctl_msg *res, struct ctl_msg *req)
+{
+    if (fd == -1) {
+        errno = EINVAL;
+        return -1;
+    }
+
+    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 = EINTR;
+        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,
+    };
+
+    const char *path[] = {dir, "/", file};
+    const size_t len = sizeof(sun.sun_path) - 1;
+
+    if (str_cat(sun.sun_path, len, path, COUNT(path)) == len) {
+        if (str_cat(NULL, len + 1, path, COUNT(path)) > len) {
+            errno = EINVAL;
+            return -1;
+        }
+    }
+
+    *dst = sun;
+
+    return 0;
+}
+
+static int
+ctl_bind(int fd, const char *dir, const char *file)
+{
+    char tmp[32];
+    struct sockaddr_un sun;
+
+    if (str_empty(file)) {
+        for (int i = 0; i < CTL_BIND_MAX; i++) {
+            if (snprintf(tmp, sizeof(tmp), ".%i", i) >= sizeof(tmp))
+                return -1;
+
+            if (ctl_setsun(&sun, dir, tmp))
+                return -1;
+
+            if (!bind(fd, (struct sockaddr *)&sun, sizeof(sun)))
+                return 0;
+        }
+    } else {
+        if (ctl_setsun(&sun, dir, file))
+            return -1;
+
+        unlink(sun.sun_path);
+
+        if (!bind(fd, (struct sockaddr *)&sun, sizeof(sun)))
+            return 0;
+    }
+
+    return -1;
+}
+
+void
+ctl_delete(int fd)
+{
+    if (fd == -1)
+        return;
+
+    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 (fd == -1)
+        return -1;
+
+    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) {
+        dp = opendir(dir);
+
+        if (!dp)
+            return -1;
+
+        struct dirent *d = NULL;
+
+        while (d = readdir(dp), d) {
+            if (d->d_name[0] == '.')
+                continue;
+
+            if (file) {
+                closedir(dp);
+                return -3;
+            }
+
+            file = &d->d_name[0];
+        }
+
+        if (!file) {
+            closedir(dp);
+            return -2;
+        }
+    }
+
+    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 (fd == -1)
+        return -1;
+
+    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,46 @@
+#pragma once
+
+#include "../mud/mud.h"
+
+#include <sys/socket.h>
+
+enum ctl_type {
+    CTL_NONE = 0,
+    CTL_STATE,
+    CTL_STATUS,
+    CTL_MTU,
+    CTL_TC,
+    CTL_KXTIMEOUT,
+    CTL_TIMETOLERANCE,
+    CTL_PATH_STATUS,
+    CTL_SYNC,
+};
+
+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 {
+            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/iface.c

@@ -0,0 +1,36 @@
+#include "common.h"
+#include "iface.h"
+#include "str.h"
+
+#include <net/if.h>
+#include <sys/ioctl.h>
+
+int
+iface_set_mtu(const char *dev_name, int mtu)
+{
+    struct ifreq ifr = {
+        .ifr_mtu = mtu,
+    };
+
+    const size_t len = sizeof(ifr.ifr_name) - 1;
+
+    if (str_cpy(ifr.ifr_name, len, dev_name) == len) {
+        if (str_len(dev_name, len + 1) > len) {
+            errno = EINTR;
+            return -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 (const char *, int);

src/ip-static.h

@@ -1,30 +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;
-}
-

src/ip.h

@@ -0,0 +1,99 @@
+#pragma once
+
+#include <stdint.h>
+
+struct ip_common {
+    uint8_t tc;
+    uint8_t proto;
+    struct { // data are not reordered
+        union {
+            unsigned char v6[16];
+            struct {
+                unsigned char zero[10];
+                unsigned char ff[2];
+                unsigned char v4[4];
+            };
+        };
+        unsigned char port[2];
+    } src, dst;
+};
+
+static inline int
+ip_read16(const uint8_t *src)
+{
+    uint16_t ret = src[1];
+    ret |= ((uint16_t)src[0]) << 8;
+    return (int)ret;
+}
+
+static inline uint8_t
+ip_get_version(const uint8_t *data, int size)
+{
+    if (size < 20)
+        return 0;
+
+    return data[0] >> 4;
+}
+
+static inline int
+ip_is_valid(const uint8_t *data, int size)
+{
+    switch (ip_get_version(data, size)) {
+        case 4: return size == ip_read16(&data[2]);
+        case 6: return size == ip_read16(&data[4]) + 40;
+    }
+
+    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];
+        if (size == ip_read16(&data[2])) {
+            const int hdrsize = (data[0] & 0xF) << 2;
+            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->proto = data[6];
+        if (size == ip_read16(&data[4]) + 40) {
+            memcpy(ic->src.v6, &data[8], sizeof(ic->src.v6));
+            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;
+}

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,898 +1,93 @@
-#include <inttypes.h>
+#include "common.h"
-#include <limits.h>
+#include "str.h"
+
 #include <stdio.h>
-#include <signal.h>
-#include <poll.h>
-#include <sys/time.h>
-#include <sys/fcntl.h>
-#include <sys/socket.h>
-#include <netinet/tcp.h>
-#include <arpa/inet.h>
-#include <netdb.h>
 
-#include <sodium.h>
+volatile sig_atomic_t gt_alarm;
+volatile sig_atomic_t gt_reload;
+volatile sig_atomic_t gt_quit;
 
-#include "common-static.h"
+static void
-#include "ip-static.h"
+gt_sa_handler(int sig)
-
-#include "option.h"
-#include "tun.h"
-
-#ifndef O_CLOEXEC
-#define O_CLOEXEC 0
-#endif
-
-#define GT_BUFFER_SIZE (4*1024*1024)
-#define GT_TIMEOUT     (1000)
-
-struct netio {
-    int fd;
-    struct {
-        buffer_t buf;
-    } write, read;
-};
-
-struct crypto_ctx {
-    struct {
-        crypto_aead_aes256gcm_state state;
-        uint8_t nonce[crypto_aead_aes256gcm_NPUBBYTES];
-    } write, read;
-    uint8_t skey[crypto_generichash_KEYBYTES];
-};
-
-volatile sig_atomic_t gt_close = 0;
-
-static int64_t dt_ms (struct timeval *ta, struct timeval *tb)
-{
-    const int64_t s = ta->tv_sec-tb->tv_sec;
-    const int64_t n = ta->tv_usec-tb->tv_usec;
-    return s*1000LL+n/1000LL;
-}
-
-static void fd_set_nonblock (int fd)
-{
-    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);
-
-    if (ret==-1)
-        perror("fcntl O_NONBLOCK");
-}
-
-static void sk_set (int fd, const char *name, const void *val, socklen_t len)
-{
-    if (!name || !val || len<=0)
-        return;
-
-    struct {
-        const char *name;
-        const int level;
-        const int option;
-    } ops[] = {
-        { "TCP_NODELAY",    IPPROTO_TCP, TCP_NODELAY    },
-        { "SO_REUSEADDR",   SOL_SOCKET,  SO_REUSEADDR   },
-        { "SO_KEEPALIVE",   SOL_SOCKET,  SO_KEEPALIVE   },
-#ifdef TCP_KEEPCNT
-        { "TCP_KEEPCNT",    IPPROTO_TCP, TCP_KEEPCNT    },
-#endif
-#ifdef TCP_KEEPIDLE
-        { "TCP_KEEPIDLE",   IPPROTO_TCP, TCP_KEEPIDLE   },
-#endif
-#ifdef TCP_KEEPINTVL
-        { "TCP_KEEPINTVL",  IPPROTO_TCP, TCP_KEEPINTVL  },
-#endif
-#ifdef TCP_CONGESTION
-        { "TCP_CONGESTION", IPPROTO_TCP, TCP_CONGESTION },
-#endif
-    };
-
-    for (int k=0; k<COUNT(ops); k++) {
-        if (str_cmp(ops[k].name, name))
-            continue;
-
-        if (setsockopt(fd, ops[k].level, ops[k].option, val, len)==-1)
-            gt_log("couldn't set socket option `%s'\n", name);
-
-        return;
-    }
-
-    gt_na(name);
-}
-
-static void sk_set_int (int fd, const char *name, int val)
-{
-    return sk_set(fd, name, &val, sizeof(val));
-}
-
-static int sk_listen (int fd, struct addrinfo *ai)
-{
-    sk_set_int(fd, "SO_REUSEADDR", 1);
-
-    int ret = bind(fd, ai->ai_addr, ai->ai_addrlen);
-
-    if (ret==-1) {
-        perror("bind");
-        return -1;
-    }
-
-    ret = listen(fd, 1);
-
-    if (ret==-1) {
-        perror("listen");
-        return -1;
-    }
-
-    return 0;
-}
-
-static int sk_connect (int fd, struct addrinfo *ai)
-{
-    int ret = connect(fd, ai->ai_addr, ai->ai_addrlen);
-
-    if (ret==-1 && errno==EINTR)
-        return 0;
-
-    return ret;
-}
-
-static int sk_create (struct addrinfo *res, int(*func)(int, struct addrinfo *))
-{
-    for (struct addrinfo *ai=res; ai; ai=ai->ai_next) {
-        int fd = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-
-        if (fd==-1)
-            continue;
-
-        if (func(fd, ai)!=-1)
-            return fd;
-
-        close(fd);
-    }
-
-    return -1;
-}
-
-static int sk_accept (int fd)
-{
-    struct sockaddr_storage addr;
-    socklen_t addr_size = sizeof(addr);
-
-    int ret = accept(fd, (struct sockaddr *)&addr, &addr_size);
-
-    if (ret==-1 && errno!=EINTR)
-        perror("accept");
-
-    return ret;
-}
-
-static char *sk_get_name (int fd)
-{
-    struct sockaddr_storage addr;
-    socklen_t addr_size = sizeof(addr);
-
-    if (getpeername(fd, (struct sockaddr *)&addr, &addr_size)==-1) {
-        perror("getpeername");
-        return NULL;
-    }
-
-    char host[64] = {0};
-    char port[32] = {0};
-
-    int ret = getnameinfo((struct sockaddr *)&addr, addr_size,
-            host, sizeof(host),
-            port, sizeof(port),
-            NI_NUMERICHOST|NI_NUMERICSERV);
-
-    switch (ret) {
-    case 0:
-        break;
-    case EAI_MEMORY:
-        errno = ENOMEM;
-    case EAI_SYSTEM:
-        perror("getnameinfo");
-        return NULL;
-    }
-
-    const char *const strs[] = {
-        host, ".", port
-    };
-
-    return str_cat(strs, COUNT(strs));
-}
-
-#ifdef TCP_INFO
-static socklen_t sk_get_info (int fd, struct tcp_info *ti)
-{
-    socklen_t len = sizeof(struct tcp_info);
-
-    if (getsockopt(fd, SOL_TCP, TCP_INFO, ti, &len)==-1) {
-        perror("getsockopt TCP_INFO");
-        return 0;
-    }
-
-    return len;
-}
-
-static void print_tcp_info (const char *name, struct tcp_info *ti)
-{
-    gt_log("%s: tcpinfo"
-            " rto:%"     PRIu32 " ato:%"          PRIu32 " snd_mss:%"  PRIu32
-            " rcv_mss:%" PRIu32 " unacked:%"      PRIu32 " sacked:%"   PRIu32
-            " lost:%"    PRIu32 " retrans:%"      PRIu32 " fackets:%"  PRIu32
-            " pmtu:%"    PRIu32 " rcv_ssthresh:%" PRIu32 " rtt:%"      PRIu32
-            " rttvar:%"  PRIu32 " snd_ssthresh:%" PRIu32 " snd_cwnd:%" PRIu32
-            " advmss:%"  PRIu32 " reordering:%"   PRIu32 "\n",
-            name,
-            ti->tcpi_rto,       ti->tcpi_ato,            ti->tcpi_snd_mss,
-            ti->tcpi_rcv_mss,   ti->tcpi_unacked,        ti->tcpi_sacked,
-            ti->tcpi_lost,      ti->tcpi_retrans,        ti->tcpi_fackets,
-            ti->tcpi_pmtu,      ti->tcpi_rcv_ssthresh,   ti->tcpi_rtt,
-            ti->tcpi_rttvar,    ti->tcpi_snd_ssthresh,   ti->tcpi_snd_cwnd,
-            ti->tcpi_advmss,    ti->tcpi_reordering);
-}
-#endif
-
-static struct addrinfo *ai_create (const char *host, const char *port, int listener)
-{
-    if (!port || !port[0]) {
-        gt_log("port is not valid\n");
-        return NULL;
-    }
-
-    struct addrinfo hints = {
-        .ai_family = AF_UNSPEC,
-        .ai_socktype = SOCK_STREAM,
-        .ai_protocol = IPPROTO_TCP,
-    };
-
-    if (listener)
-        hints.ai_flags = AI_PASSIVE;
-
-    struct addrinfo *ai = NULL;
-
-    int ret = getaddrinfo(host, port, &hints, &ai);
-
-    switch (ret) {
-    case 0:
-        return ai;
-    case EAI_MEMORY:
-        errno = ENOMEM;
-    case EAI_SYSTEM:
-        perror("getaddrinfo");
-        break;
-    case EAI_FAIL:
-    case EAI_AGAIN:
-        gt_log("the name server returned a failure\n");
-        break;
-    default:
-        gt_log("%s.%s is not valid\n", host?:"", port);
-    }
-
-    return NULL;
-}
-
-static void gt_sa_stop (int sig)
 {
     switch (sig) {
-    case SIGINT:
+    case SIGALRM:
-    case SIGTERM:
+        gt_alarm = 1;
-        gt_close = 1;
+        return;
+    case SIGHUP:
+        gt_reload = 1; /* FALLTHRU */
+    default:
+        gt_quit = 1;
     }
 }
 
-static void gt_set_signal (void)
+static void
+gt_set_signal(void)
 {
-    struct sigaction sa;
+    struct sigaction sa = {
+        .sa_flags = 0,
+    };
 
-    byte_set(&sa, 0, sizeof(sa));
+    sigemptyset(&sa.sa_mask);
 
-    sa.sa_handler = gt_sa_stop;
+    sa.sa_handler = gt_sa_handler;
-    sigaction(SIGINT,  &sa, NULL);
+    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(SIGHUP,  &sa, NULL);
     sigaction(SIGPIPE, &sa, NULL);
+    sigaction(SIGUSR1, &sa, NULL);
+    sigaction(SIGUSR2, &sa, NULL);
 }
 
-static ssize_t fd_read (int fd, void *data, size_t size)
+static int
+gt_version(int argc, char **argv)
 {
-    if (!size)
+    printf(PACKAGE_VERSION "\n");
-        return -2;
-
-    ssize_t ret = read(fd, data, size);
-
-    if (ret==-1) {
-        if (errno==EAGAIN || errno==EINTR)
-            return -1;
-
-        if (errno)
-            perror("read");
-
-        return 0;
-    }
-
-    return ret;
-}
-
-static ssize_t fd_write (int fd, const void *data, size_t size)
-{
-    if (!size)
-        return -2;
-
-    ssize_t ret = write(fd, data, size);
-
-    if (ret==-1) {
-        if (errno==EAGAIN || errno==EINTR)
-            return -1;
-
-        if (errno)
-            perror("write");
-
-        return 0;
-    }
-
-    return ret;
-}
-
-static ssize_t fd_read_all (int fd, void *data, size_t size)
-{
-    size_t done = 0;
-
-    struct pollfd pollfd = {
-        .fd = fd,
-        .events = POLLIN,
-    };
-
-    while (done<size) {
-        ssize_t ret = fd_read(fd, (uint8_t *)data+done, size-done);
-
-        if (!ret)
-            break;
-
-        if (ret<0) {
-            if (!poll(&pollfd, 1, GT_TIMEOUT))
-                break;
-            continue;
-        }
-
-        done += ret;
-    }
-
-    return done;
-}
-
-static ssize_t fd_write_all (int fd, const void *data, size_t size)
-{
-    size_t done = 0;
-
-    struct pollfd pollfd = {
-        .fd = fd,
-        .events = POLLOUT,
-    };
-
-    while (done<size) {
-        ssize_t ret = fd_write(fd, (const uint8_t *)data+done, size-done);
-
-        if (!ret)
-            break;
-
-        if (ret<0) {
-            if (!poll(&pollfd, 1, GT_TIMEOUT))
-                break;
-            continue;
-        }
-
-        done += ret;
-    }
-
-    return done;
-}
-
-static int encrypt_packet (struct crypto_ctx *ctx, uint8_t *packet, size_t size, buffer_t *buffer)
-{
-    const size_t ws = size + crypto_aead_aes256gcm_ABYTES;
-
-    if (buffer_write_size(buffer) < ws)
-        return 1;
-
-    const int hs = 4;
-
-    byte_cpy(buffer->write, packet, size);
-
-    crypto_aead_aes256gcm_encrypt_afternm(
-            buffer->write + hs, NULL,
-            packet + hs, size - hs,
-            packet, hs,
-            NULL, ctx->write.nonce,
-            (const crypto_aead_aes256gcm_state *)&ctx->write.state);
-
-    sodium_increment(ctx->write.nonce, crypto_aead_aes256gcm_NPUBBYTES);
-    buffer->write += ws;
-
     return 0;
 }
 
-static int decrypt_packet (struct crypto_ctx *ctx, uint8_t *packet, size_t size, buffer_t *buffer)
+int
-{
+main(int argc, char **argv)
-    const size_t rs = size + crypto_aead_aes256gcm_ABYTES;
-
-    if (buffer_read_size(buffer) < rs)
-        return 1;
-
-    const int hs = 4;
-
-    byte_cpy(packet, buffer->read, hs);
-
-    if (crypto_aead_aes256gcm_decrypt_afternm(
-                packet + hs, NULL,
-                NULL,
-                buffer->read + hs, rs - hs,
-                packet, hs,
-                ctx->read.nonce,
-                (const crypto_aead_aes256gcm_state *)&ctx->read.state))
-        return -1;
-
-    sodium_increment(ctx->read.nonce, crypto_aead_aes256gcm_NPUBBYTES);
-    buffer->read += rs;
-
-    return 0;
-}
-
-static void dump_ip_header (uint8_t *data, size_t size)
-{
-    if (size<20)
-        return;
-
-    const char tbl[] = "0123456789ABCDEF";
-    char hex[41];
-
-    for (size_t i=0; i<20; i++) {
-        hex[(i<<1)+0] = tbl[0xF&(data[i]>>4)];
-        hex[(i<<1)+1] = tbl[0xF&(data[i])];
-    }
-
-    hex[40] = 0;
-
-    gt_log("DUMP(%zu): %s\n", size, hex);
-}
-
-static int gt_setup_secretkey (struct crypto_ctx *ctx, char *keyfile)
-{
-    size_t size = sizeof(ctx->skey);
-
-    byte_set(ctx->skey, 1, size);
-
-    if (!keyfile)
-        return 0;
-
-    int fd;
-
-    do {
-        fd = open(keyfile, O_RDONLY|O_CLOEXEC);
-    } while (fd==-1 && errno==EINTR);
-
-    if (fd==-1) {
-        perror("open keyfile");
-        return -1;
-    }
-
-    if (fd_read_all(fd, ctx->skey, size)!=size) {
-        gt_log("unable to read secret key in `%s'\n", keyfile);
-        close(fd);
-        return -1;
-    }
-
-    close(fd);
-
-    return 0;
-}
-
-static int gt_setup_crypto (struct crypto_ctx *ctx, int fd, int listener)
-{
-    const size_t nonce_size = crypto_aead_aes256gcm_NPUBBYTES;
-    const size_t public_size = crypto_scalarmult_SCALARBYTES;
-    const size_t hash_size = crypto_generichash_BYTES;
-    const size_t size = nonce_size + public_size + hash_size;
-
-    uint8_t secret[crypto_scalarmult_SCALARBYTES];
-    uint8_t shared[crypto_scalarmult_BYTES];
-    uint8_t key[crypto_aead_aes256gcm_KEYBYTES];
-
-    uint8_t data_r[size], data_w[size];
-    uint8_t auth_r[hash_size], auth_w[hash_size];
-    uint8_t hash[hash_size];
-
-    crypto_generichash_state state;
-
-    randombytes_buf(data_w, nonce_size);
-    randombytes_buf(secret, sizeof(secret));
-    crypto_scalarmult_base(&data_w[nonce_size], secret);
-
-    crypto_generichash(&data_w[size-hash_size], hash_size,
-            data_w, size-hash_size, ctx->skey, sizeof(ctx->skey));
-
-    if (!listener && fd_write_all(fd, data_w, size)!=size)
-        return -1;
-
-    if (fd_read_all(fd, data_r, size)!=size)
-        return -1;
-
-    crypto_generichash(hash, hash_size,
-            data_r, size-hash_size, ctx->skey, sizeof(ctx->skey));
-
-    if (sodium_memcmp(&data_r[size-hash_size], hash, hash_size))
-        return -2;
-
-    if (listener && fd_write_all(fd, data_w, size)!=size)
-        return -1;
-
-    crypto_generichash(auth_w, hash_size,
-            data_r, size, ctx->skey, sizeof(ctx->skey));
-
-    if (fd_write_all(fd, auth_w, hash_size)!=hash_size)
-        return -1;
-
-    if (fd_read_all(fd, auth_r, hash_size)!=hash_size)
-        return -1;
-
-    crypto_generichash(hash, hash_size,
-            data_w, size, ctx->skey, sizeof(ctx->skey));
-
-    if (sodium_memcmp(auth_r, hash, hash_size))
-        return -2;
-
-    if (crypto_scalarmult(shared, secret, &data_r[nonce_size]))
-        return -2;
-
-    crypto_generichash_init(&state, ctx->skey, sizeof(ctx->skey), sizeof(key));
-    crypto_generichash_update(&state, shared, sizeof(shared));
-    crypto_generichash_update(&state, data_r, size);
-    crypto_generichash_update(&state, data_w, size);
-    crypto_generichash_final(&state, key, sizeof(key));
-    crypto_aead_aes256gcm_beforenm(&ctx->read.state, key);
-
-    crypto_generichash_init(&state, ctx->skey, sizeof(ctx->skey), sizeof(key));
-    crypto_generichash_update(&state, shared, sizeof(shared));
-    crypto_generichash_update(&state, data_w, size);
-    crypto_generichash_update(&state, data_r, size);
-    crypto_generichash_final(&state, key, sizeof(key));
-    crypto_aead_aes256gcm_beforenm(&ctx->write.state, key);
-
-    sodium_memzero(secret, sizeof(secret));
-    sodium_memzero(shared, sizeof(shared));
-    sodium_memzero(key, sizeof(key));
-
-    byte_cpy(ctx->read.nonce, data_r, nonce_size);
-    byte_cpy(ctx->write.nonce, data_w, nonce_size);
-
-    return 0;
-}
-
-int main (int argc, char **argv)
 {
     gt_set_signal();
 
-    int listener = 0;
-    char *host = NULL;
-    char *port = "5000";
-    char *dev = PACKAGE_NAME;
-    char *keyfile = NULL;
-    char *congestion = NULL;
-    long buffer_size = GT_BUFFER_SIZE;
-    int delay = 0;
-    int multiqueue = 0;
-    long ka_count = -1;
-    long ka_idle = -1;
-    long ka_interval = -1;
-    int version = 0;
-    int debug = 0;
-
-#ifdef TCP_INFO
     struct {
-        struct timeval time;
+        char *name;
-        struct tcp_info info;
+        char *help;
-    } tcpinfo = {0};
+        int (*call)(int, char **);
-#endif
+    } cmd[] = {
-
+        {"show", "show all running tunnels", gt_show},
-    struct option ka_opts[] = {
+        {"bench", "start a crypto bench", gt_bench},
-        { "count",    &ka_count,    option_long },
+        {"bind", "start a new tunnel", gt_bind},
-        { "idle",     &ka_idle,     option_long },
+        {"set", "change tunnel properties", gt_set},
-        { "interval", &ka_interval, option_long },
+        {"sync", "re-sync tunnels", gt_sync},
-        { NULL },
+        {"keygen", "generate a new secret key", gt_keygen},
-    };
+        {"path", "manage paths", gt_path},
-
+        {"version", "show version", gt_version},
-    struct option opts[] = {
+        {NULL}};
-        { "listener",    &listener,    option_flag   },
+
-        { "host",        &host,        option_str    },
+    if (argv[1]) {
-        { "port",        &port,        option_str    },
+        for (int k = 0; cmd[k].name; k++) {
-        { "dev",         &dev,         option_str    },
+            if (!str_cmp(cmd[k].name, argv[1]))
-        { "keyfile",     &keyfile,     option_str    },
+                return cmd[k].call(argc - 1, argv + 1);
-        { "congestion",  &congestion,  option_str    },
-        { "delay",       &delay,       option_flag   },
-        { "multiqueue",  &multiqueue,  option_flag   },
-        { "keepalive",   ka_opts,      option_option },
-        { "buffer-size", &buffer_size, option_long   },
-        { "debug",       &debug,       option_flag   },
-        { "version",     &version,     option_flag   },
-        { NULL },
-    };
-
-    if (option(opts, argc, argv))
-        return 1;
-
-    if (version) {
-        gt_print(PACKAGE_STRING"\n");
-        return 0;
-    }
-
-    int keepalive = option_is_set(opts, "keepalive");
-
-    if (buffer_size < 2048) {
-        buffer_size = 2048;
-        gt_log("buffer size must be greater than 2048!\n");
-    }
-
-    if (sodium_init()==-1) {
-        gt_log("libsodium initialization has failed!\n");
-        return 1;
-    }
-
-    if (!crypto_aead_aes256gcm_is_available()) {
-        gt_na("AES-256-GCM");
-        return 1;
-    }
-
-    struct crypto_ctx ctx;
-
-    if (gt_setup_secretkey(&ctx, keyfile))
-        return 1;
-
-    struct addrinfo *ai = ai_create(host, port, listener);
-
-    if (!ai)
-        return 1;
-
-    struct netio tun  = { .fd = -1 };
-    struct netio sock = { .fd = -1 };
-
-    tun.fd = tun_create(dev, multiqueue);
-
-    if (tun.fd==-1)
-        return 1;
-
-    fd_set_nonblock(tun.fd);
-
-    buffer_setup(&sock.write.buf, NULL, buffer_size);
-    buffer_setup(&sock.read.buf, NULL, buffer_size);
-
-    int fd = -1;
-
-    if (listener) {
-        fd = sk_create(ai, sk_listen);
-
-        if (fd==-1)
-            return 1;
-    }
-
-    while (!gt_close) {
-        sock.fd = listener?sk_accept(fd):sk_create(ai, sk_connect);
-
-        if (sock.fd==-1) {
-            usleep(100000);
-            goto restart;
-        }
-
-        char *sockname = sk_get_name(sock.fd);
-
-        if (!sockname)
-            goto restart;
-
-        gt_log("%s: connected\n", sockname);
-
-        fd_set_nonblock(sock.fd);
-
-        sk_set_int(sock.fd, "TCP_NODELAY", !delay);
-        sk_set_int(sock.fd, "SO_KEEPALIVE", keepalive);
-
-        if (keepalive) {
-            if (ka_count>=0 && ka_count<=INT_MAX)
-                sk_set_int(sock.fd, "TCP_KEEPCNT", ka_count);
-
-            if (ka_idle>=0 && ka_idle<=INT_MAX)
-                sk_set_int(sock.fd, "TCP_KEEPIDLE", ka_idle);
-
-            if (ka_interval>=0 && ka_interval<=INT_MAX)
-                sk_set_int(sock.fd, "TCP_KEEPINTVL", ka_interval);
-        }
-
-        sk_set(sock.fd, "TCP_CONGESTION", congestion, str_len(congestion));
-
-        switch (gt_setup_crypto(&ctx, sock.fd, listener)) {
-            case -2: gt_log("%s: key exchange could not be verified!\n", sockname);
-            case -1: goto restart;
-            default: break;
-        }
-
-        struct {
-            uint8_t buf[2048];
-            size_t size;
-        } tunr, tunw;
-
-        tunr.size = 0;
-        tunw.size = 0;
-
-        fd_set rfds, wfds;
-        FD_ZERO(&rfds);
-        FD_ZERO(&wfds);
-
-        int stop_loop = 0;
-
-        buffer_format(&sock.write.buf);
-        buffer_format(&sock.read.buf);
-
-        while (1) {
-            if (gt_close)
-                stop_loop = 1;
-
-            if (stop_loop) {
-                if (((stop_loop&(1<<2)) || !buffer_read_size(&sock.write.buf)) &&
-                    ((stop_loop&(1<<1)) || !buffer_read_size(&sock.read.buf)))
-                    goto restart;
-                FD_CLR(tun.fd, &rfds);
-            } else {
-                FD_SET(tun.fd, &rfds);
-            }
-
-            FD_SET(sock.fd, &rfds);
-
-            if (select(sock.fd+1, &rfds, &wfds, NULL, NULL)==-1) {
-                if (errno==EINTR)
-                    continue;
-                perror("select");
-                return 1;
-            }
-
-#ifdef TCP_INFO
-            struct timeval now;
-            gettimeofday(&now, NULL);
-
-            if (debug && dt_ms(&now, &tcpinfo.time)>1000LL) {
-                tcpinfo.time = now;
-                if (sk_get_info(sock.fd, &tcpinfo.info))
-                    print_tcp_info(sockname, &tcpinfo.info);
-            }
-#endif
-
-            buffer_shift(&sock.write.buf);
-
-            if (FD_ISSET(tun.fd, &rfds)) {
-                while (1) {
-                    if (buffer_write_size(&sock.write.buf)<sizeof(tunr.buf)+16)
-                        break;
-
-                    ssize_t r = tun_read(tun.fd, tunr.buf, sizeof(tunr.buf));
-
-                    if (!r)
-                        return 2;
-
-                    if (r<0)
-                        break;
-
-                    ssize_t ip_size = ip_get_size(tunr.buf, sizeof(tunr.buf));
-
-                    if (ip_size<=0)
-                        continue;
-
-                    if (ip_size!=r) {
-                        dump_ip_header(tunr.buf, r);
-
-                        if (r<ip_size) {
-                            ip_set_size(tunr.buf, r);
-                        } else {
-                            continue;
-                        }
-                    }
-
-                    encrypt_packet(&ctx, tunr.buf, r, &sock.write.buf);
-                }
-            }
-
-            if (FD_ISSET(sock.fd, &wfds))
-                FD_CLR(sock.fd, &wfds);
-
-            if (buffer_read_size(&sock.write.buf)) {
-                ssize_t r = fd_write(sock.fd, sock.write.buf.read,
-                                     buffer_read_size(&sock.write.buf));
-
-                if (r==-1)
-                    FD_SET(sock.fd, &wfds);
-
-                if (!r)
-                    stop_loop |= (1<<2);
-
-                if (r>0)
-                    sock.write.buf.read += r;
-            } else {
-                if (stop_loop)
-                    shutdown(sock.fd, SHUT_WR);
-            }
-
-            buffer_shift(&sock.read.buf);
-
-            if (FD_ISSET(sock.fd, &rfds)) {
-                ssize_t r = fd_read(sock.fd, sock.read.buf.write,
-                                    buffer_write_size(&sock.read.buf));
-
-                if (!r)
-                    stop_loop |= (1<<1);
-
-                if (r>0)
-                    sock.read.buf.write += r;
-            }
-
-            if (FD_ISSET(tun.fd, &wfds))
-                FD_CLR(tun.fd, &wfds);
-
-            while (1) {
-                if (!tunw.size) {
-                    size_t size = buffer_read_size(&sock.read.buf);
-                    ssize_t ip_size = ip_get_size(sock.read.buf.read, size);
-
-                    if (!ip_size)
-                        goto restart;
-
-                    if (ip_size<0 || (size_t)ip_size+16>size)
-                        break;
-
-                    if (decrypt_packet(&ctx, tunw.buf, ip_size, &sock.read.buf)) {
-                        gt_log("%s: message could not be verified!\n", sockname);
-                        goto restart;
-                    }
-
-                    tunw.size = ip_size;
-                }
-                if (tunw.size) {
-                    ssize_t r = tun_write(tun.fd, tunw.buf, tunw.size);
-
-                    if (!r)
-                        return 2;
-
-                    if (r==-1)
-                        FD_SET(tun.fd, &wfds);
-
-                    if (r<0)
-                        break;
-
-                    tunw.size = 0;
-                }
-            }
-        }
-
-    restart:
-        if (sockname) {
-            free(sockname);
-            sockname = NULL;
-        }
-
-        if (sock.fd!=-1) {
-            close(sock.fd);
-            sock.fd = -1;
         }
     }
 
-    freeaddrinfo(ai);
+    printf("available commands:\n\n");
 
-    free(sock.write.buf.data);
+    int len = 0;
-    free(sock.read.buf.data);
 
-    return 0;
+    for (int k = 0; cmd[k].name; k++)
+        len = MAX(len, (int)str_len(cmd[k].name, 32));
+
+    for (int k = 0; cmd[k].name; k++)
+        printf("  %-*s  %s\n", len, cmd[k].name, cmd[k].help);
+
+    printf("\n");
+
+    return 1;
 }

src/option.c

@@ -1,145 +0,0 @@
-#include "common-static.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-
-#include "option.h"
-
-int option_flag (void *data, _unused_ int argc, _unused_ char **argv)
-{
-    const int one = 1;
-    byte_cpy(data, &one, sizeof(one));
-
-    return 0;
-}
-
-int option_str (void *data, int argc, char **argv)
-{
-    if (argc<2 || !argv[1]) {
-        gt_print("option `%s' need a string argument\n", argv[0]);
-        return -1;
-    }
-
-    byte_cpy(data, &argv[1], sizeof(argv[1]));
-
-    return 1;
-}
-
-int option_long (void *data, int argc, char **argv)
-{
-    if (argc<2 || !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;
-    }
-
-    byte_cpy(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)
-{
-    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)
-{
-    int len = slen;
-
-    for (int k=0; opts[k].name; k++) {
-        if (len>60) {
-            gt_print("\n%*s", (int)slen, "");
-            len = slen;
-        }
-
-        len += gt_print(" [%s", opts[k].name);
-
-        if (opts[k].call!=option_flag) {
-            if (opts[k].call==option_option) {
-                len += option_usage((struct option *)opts[k].data, 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;
-
-    option_usage(opts, slen);
-
-    printf("\n");
-
-    return 1;
-}

src/option.h

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

src/path.c

@@ -0,0 +1,168 @@
+#include "common.h"
+#include "ctl.h"
+#include "str.h"
+
+#include <stdio.h>
+#include <sys/socket.h>
+#include <unistd.h>
+
+#include "../argz/argz.h"
+
+static int
+gt_path_status(int fd)
+{
+    struct ctl_msg req = {
+        .type = CTL_PATH_STATUS,
+    }, res = {0};
+
+    if (send(fd, &req, sizeof(struct ctl_msg), 0) == -1)
+        return -1;
+
+    int term = isatty(1);
+
+    do {
+        if (recv(fd, &res, sizeof(struct ctl_msg), 0) == -1)
+            return -1;
+
+        if (res.type != req.type)
+            return -2;
+
+        if (!res.ret)
+            return 0;
+
+        char bindstr[INET6_ADDRSTRLEN];
+        char publstr[INET6_ADDRSTRLEN];
+        char peerstr[INET6_ADDRSTRLEN];
+
+        gt_toaddr(bindstr, sizeof(bindstr),
+                  (struct sockaddr *)&res.path_status.local_addr);
+        gt_toaddr(publstr, sizeof(publstr),
+                  (struct sockaddr *)&res.path_status.r_addr);
+        gt_toaddr(peerstr, sizeof(peerstr),
+                  (struct sockaddr *)&res.path_status.addr);
+
+        const char *statestr = NULL;
+
+        switch (res.path_status.state) {
+            case MUD_UP:     statestr = "UP";     break;
+            case MUD_BACKUP: statestr = "BACKUP"; break;
+            case MUD_DOWN:   statestr = "DOWN";   break;
+            default:         return -2;
+        }
+
+        const char *statusstr = res.path_status.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 *)&res.path_status.local_addr),
+            publstr[0] ? publstr : "-",
+            gt_get_port((struct sockaddr *)&res.path_status.r_addr),
+            peerstr[0] ? peerstr : "-",
+            gt_get_port((struct sockaddr *)&res.path_status.addr),
+            res.path_status.mtu.ok,
+            res.path_status.rtt.val / 1e3,
+            res.path_status.rtt.var / 1e3,
+            res.path_status.rate_tx,
+            res.path_status.rate_rx,
+            res.path_status.send.total,
+            res.path_status.recv.total);
+    } while (res.ret == EAGAIN);
+
+    return 0;
+}
+
+int
+gt_path(int argc, char **argv)
+{
+    const char *dev = NULL;
+
+    struct ctl_msg req = {
+        .type = CTL_STATE,
+    }, 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 -2:
+            gt_log("no device\n");
+            break;
+        case -3:
+            gt_log("please choose a device\n");
+            break;
+        default:
+            gt_log("couldn't connect\n");
+        }
+        return 1;
+    }
+
+    int ret = 0;
+
+    if (!req.path.addr.ss_family) {
+        ret = gt_path_status(fd);
+
+        if (ret == -2)
+            gt_log("bad reply from server\n");
+    } else {
+        req.path.state = MUD_EMPTY;
+
+        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;
+        }
+
+        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 -2:
+            gt_log("no device\n");
+            break;
+        case -3:
+            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,137 @@
+#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_dev_status(int fd, const char *dev)
+{
+    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",
+               dev,
+               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",
+               dev,
+               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;
+}
+
+static int
+gt_show_dev(const char *dev)
+{
+    int fd = ctl_connect(GT_RUNDIR, dev);
+
+    if (fd < 0) {
+        if (fd == -1)
+            perror("show");
+        return -1;
+    }
+
+    int ret = gt_show_dev_status(fd, dev);
+
+    if (ret == -1)
+        perror(dev);
+
+    if (ret == -2)
+        gt_log("%s: bad reply from server\n", dev);
+
+    ctl_delete(fd);
+
+    return ret;
+}
+
+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;
+
+    if (dev)
+        return !!gt_show_dev(dev);
+
+    DIR *dp = opendir(GT_RUNDIR);
+
+    if (!dp) {
+        if (errno == ENOENT)
+            return 0;
+        perror("show");
+        return 1;
+    }
+
+    int ret = 0;
+    struct dirent *d = NULL;
+
+    while (d = readdir(dp), d) {
+        if (d->d_name[0] != '.')
+            ret |= !!gt_show_dev(d->d_name);
+    }
+
+    closedir(dp);
+
+    return ret;
+}

src/str.h

@@ -0,0 +1,62 @@
+#pragma once
+
+#include "common.h"
+
+_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, size_t len)
+{
+    if (!str)
+        return 0;
+
+    return strnlen(str, len);
+}
+
+static inline size_t
+str_cat(char *dst, size_t dst_len, const char **src, size_t count)
+{
+    if (count && !src)
+        return 0;
+
+    size_t len = 0;
+
+    for (size_t i = 0; i < count && dst_len > len; i++) {
+        size_t n = str_len(src[i], dst_len - len);
+
+        if (dst && n)
+            memmove(&dst[len], src[i], n);
+
+        len += n;
+    }
+
+    if (dst)
+        dst[len] = 0;
+
+    return len;
+}
+
+static inline size_t
+str_cpy(char *dst, size_t dst_len, const char *src)
+{
+    return str_cat(dst, dst_len, &src, 1);
+}

src/sync.c

@@ -0,0 +1,76 @@
+#include "common.h"
+#include "ctl.h"
+#include "str.h"
+
+#include "../argz/argz.h"
+
+#include <stdio.h>
+#include <dirent.h>
+
+static int
+gt_sync_dev(const char *dev, unsigned long timeout)
+{
+    const int fd = ctl_connect(GT_RUNDIR, dev);
+
+    if (fd < 0) {
+        if (fd == -1)
+            perror("sync");
+        return 1;
+    }
+
+    struct ctl_msg res, req = {
+        .type = CTL_SYNC,
+    };
+
+    int ret = ctl_reply(fd, &res, &req);
+
+    if (!ret) {
+        if (res.ms > timeout)
+            ret = 1;
+    } else {
+        perror("sync");
+    }
+
+    ctl_delete(fd);
+
+    return ret;
+}
+
+int
+gt_sync(int argc, char **argv)
+{
+    const char *dev = NULL;
+    unsigned long timeout = 20000;
+
+    struct argz syncz[] = {
+        {"dev", "NAME", &dev, argz_str},
+        {"timeout", "SECONDS", &timeout, argz_time},
+        {NULL}};
+
+    if (argz(syncz, argc, argv))
+        return 1;
+
+    if (dev)
+        return !!gt_sync_dev(dev, timeout);
+
+    DIR *dp = opendir(GT_RUNDIR);
+
+    if (!dp) {
+        if (errno == ENOENT)
+            return 0;
+        perror("sync");
+        return 1;
+    }
+
+    int ret = 0;
+    struct dirent *d = NULL;
+
+    while (d = readdir(dp), d) {
+        if (d->d_name[0] != '.')
+            ret |= !!gt_sync_dev(d->d_name, timeout);
+    }
+
+    closedir(dp);
+
+    return ret;
+}

src/tun.c

@@ -1,169 +1,230 @@
-#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 len, unsigned id)
+{
+    int ret = snprintf(name, len + 1, "utun%u", id);
+
+    if (ret <= 0 || ret > len) {
+        errno = EINVAL;
         return -1;
     }
 
-    struct ifreq ifr = {
+    int fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
-        .ifr_flags = IFF_TUN|IFF_NO_PI,
+
+    if (fd == -1)
+        return -1;
+
+    struct ctl_info ci = {0};
+    str_cpy(ci.ctl_name, sizeof(ci.ctl_name) - 1, UTUN_CONTROL_NAME);
+
+    if (ioctl(fd, CTLIOCGINFO, &ci)) {
+        int err = errno;
+        close(fd);
+        errno = err;
+        return -1;
+    }
+
+    struct sockaddr_ctl sc = {
+        .sc_id = ci.ctl_id,
+        .sc_len = sizeof(sc),
+        .sc_family = AF_SYSTEM,
+        .ss_sysaddr = AF_SYS_CONTROL,
+        .sc_unit = id + 1,
     };
 
-    if (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_print("tun name: %s\n", ifr.ifr_name);
-
     return fd;
 }
-#elif defined(__APPLE__)
+
-int tun_create (_unused_ char *name, _unused_ int mq)
+static int
+tun_create_by_name(char *name, size_t len, const char *dev_name)
 {
-    for (unsigned dev_id = 0U; dev_id<32U; dev_id++) {
+    unsigned id = 0;
-        struct ctl_info ci;
-        byte_set(&ci, 0, sizeof(ci));
-        str_cpy(ci.ctl_name, UTUN_CONTROL_NAME, sizeof(ci.ctl_name)-1);
 
-        int fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
+    if (sscanf(dev_name, "utun%u", &id) != 1) {
+        errno = EINVAL;
+        return -1;
+    }
 
-        if (fd==-1)
+    return tun_create_by_id(name, len, id);
+}
+
+#else /* not __APPLE__ */
+
+#ifdef __linux__
+
+static int
+tun_create_by_name(char *name, size_t len, const char *dev_name)
+{
+    struct ifreq ifr = {
+        .ifr_flags = IFF_TUN | IFF_NO_PI,
+    };
+
+    const size_t ifr_len = sizeof(ifr.ifr_name) - 1;
+
+    if ((len < ifr_len) ||
+        (str_len(dev_name, ifr_len + 1) > ifr_len)) {
+        errno = EINVAL;
+        return -1;
+    }
+
+    int fd = open("/dev/net/tun", O_RDWR);
+
+    if (fd == -1)
+        return -1;
+
+    str_cpy(ifr.ifr_name, ifr_len, dev_name);
+
+    if (ioctl(fd, TUNSETIFF, &ifr)) {
+        int err = errno;
+        close(fd);
+        errno = err;
+        return -1;
+    }
+
+    str_cpy(name, len, ifr.ifr_name);
+
+    return fd;
+}
+
+#else /* not __linux__ not __APPLE__ */
+
+static int
+tun_create_by_name(char *name, size_t len, const char *dev_name)
+{
+    char tmp[128];
+
+    int ret = snprintf(tmp, sizeof(tmp), "/dev/%s", dev_name);
+
+    if (ret <= 0 || ret >= sizeof(tmp)) {
+        errno = EINVAL;
+        return -1;
+    }
+
+    if (str_cpy(name, len, dev_name) == len) {
+        if (str_len(dev_name, len + 1) > len) {
+            errno = EINVAL;
             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_print("tun name: /dev/utun%u\n", dev_id);
-
-        return fd;
     }
 
-    return -1;
+    return open(tmp, O_RDWR);
 }
-#else
+
-int tun_create (_unused_ char *name, _unused_ int mq)
+#endif /* not __APPLE__ */
+
+static int
+tun_create_by_id(char *name, size_t len, unsigned id)
 {
-    for (unsigned dev_id = 0U; dev_id<32U; dev_id++) {
+    char tmp[64];
-        char dev_path[11U];
 
-        sngt_print(dev_path, sizeof(dev_path), "/dev/tun%u", dev_id);
+    int ret = snprintf(tmp, sizeof(tmp), "tun%u", id);
 
-        int fd = open(dev_path, O_RDWR);
+    if (ret <= 0 || ret >= sizeof(tmp)) {
-
+        errno = EINVAL;
-        if (fd!=-1) {
+        return -1;
-            gt_print("tun name: /dev/tun%u\n", dev_id);
-            return fd;
-        }
     }
 
-    return -1;
+    return tun_create_by_name(name, len, tmp);
 }
+
 #endif
 
-ssize_t tun_read (int fd, void *data, size_t size)
+int
+tun_create(char *name, size_t len, const char *dev_name)
+{
+    int fd = -1;
+
+    if (str_empty(dev_name)) {
+        for (unsigned id = 0; id < 32 && fd == -1; id++)
+            fd = tun_create_by_id(name, len, id);
+    } else {
+        fd = tun_create_by_name(name, len, dev_name);
+    }
+
+    return fd;
+}
+
+int
+tun_read(int fd, void *data, size_t size)
 {
     if (!size)
-        return -2;
+        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("readv");
-
-        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 -2;
+        return 0;
 
 #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;
@@ -171,35 +232,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("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 *, size_t, const 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,6 @@
+#!/bin/sh
+
+exec glorytun bind "$@" \
+	$BIND $BIND_PORT \
+	${DEV:+dev "$DEV"} \
+	${HOST:+to "$HOST" "$PORT"}

systemd/glorytun-setup

@@ -0,0 +1,75 @@
+#!/bin/sh
+
+set -e
+
+_ask() {
+	printf "%s: " "$1"
+	read -r "$2"
+}
+
+_ask "Config filename (tun0)" NAME
+NAME=${NAME:-tun0}
+DIR="/etc/glorytun/$NAME"
+
+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)
+	echo "Your new key: $KEY"
+fi
+
+# install files
+mkdir -p "$DIR"
+
+cat > "$DIR/env" <<EOF
+DEV=gt${HOST:+c}-$NAME
+HOST=$HOST
+PORT=$PORT
+BIND=$BIND
+BIND_PORT=$BIND_PORT
+OPTIONS=
+EOF
+
+( umask 077; echo "$KEY" > "$DIR/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 y*|Y*)
+	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,14 @@
+[Unit]
+Description=Glorytun on %I
+After=network.target
+
+[Service]
+Type=simple
+Restart=always
+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]
+WantedBy=multi-user.target

version.sh

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