Restore STARTED and STOPPED states

This reverts commit 03cd87df1c.

.build.sh

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

.gitmodules

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

Makefile.am

@@ -20,6 +20,11 @@ glorytun_SOURCES = \
     src/state.c \
     src/state.h
 
+glorytun_CFLAGS  += -I$(srcdir)/mud
+glorytun_SOURCES += \
+    mud/mud.h \
+    mud/mud.c
+
 EXTRA_DIST = \
     LICENSE \
     README.md \

README.md

@@ -1,6 +1,6 @@
-# π₁(Glorytun)=ℤ²
+# Glorytun
 
-Small, Simple and Stupid TCP VPN.
+Small, Simple and Stupid VPN over [mud](https://github.com/angt/mud).
 
 #### Work In Progress
 
@@ -8,11 +8,12 @@ This code will probably format your harddisk!
 
 #### Build and Install
 
-Glorytun depends on [libsodium](https://github.com/jedisct1/libsodium) version >= 1.0.4.
+Glorytun depends on [libsodium](https://github.com/jedisct1/libsodium) version >= 1.0.4
+and needs an AES-NI capable CPU.
 
 To build and install the latest version:
 
-    $ git clone https://github.com/angt/glorytun
+    $ git clone https://github.com/angt/glorytun --recursive --branch mud
     $ cd glorytun
     $ ./autogen.sh
     $ ./configure

configure.ac

@@ -16,8 +16,6 @@ AC_PROG_CC_C99
 AC_USE_SYSTEM_EXTENSIONS
 AC_SEARCH_LIBS([getaddrinfo], [resolv nsl])
 AC_SEARCH_LIBS([socket], [socket])
-AC_CHECK_LIB([rt], [clock_gettime])
-AC_CHECK_FUNCS([clock_gettime])
 PKG_CHECK_MODULES([libsodium], [libsodium >= 1.0.4])
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT

m4/pkg.m4

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

src/state.c

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

src/state.h

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