Add mptcp option

.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

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

Makefile.am

@@ -20,11 +20,6 @@ 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 VPN over [mud](https://github.com/angt/mud).
+Small, Simple and Stupid TCP VPN.
 
 #### Work In Progress
 
@@ -13,7 +13,7 @@ and needs an AES-NI capable CPU.
 
 To build and install the latest version:
 
-    $ git clone https://github.com/angt/glorytun --recursive --branch mud
+    $ git clone https://github.com/angt/glorytun
     $ cd glorytun
     $ ./autogen.sh
     $ ./configure

configure.ac

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

src/ip.h

@@ -4,7 +4,6 @@
 
 struct ip_common {
     uint8_t version;
-    uint8_t tc;
     uint8_t proto;
     uint8_t hdr_size;
     uint16_t size;
@@ -25,13 +24,11 @@ static inline int ip_get_common (struct ip_common *ic, const uint8_t *data, size
 
     switch (ic->version) {
     case 4:
-        ic->tc = data[1];
         ic->proto = data[9];
         ic->hdr_size = (data[0]&0xF)<<2;
         ic->size = ((data[2]<<8)|data[3]);
         return 0;
     case 6:
-        ic->tc = ((data[0]&0xF)<<4)|(data[1]>>4);
         ic->proto = data[6];
         ic->hdr_size = 40;
         ic->size = ((data[4]<<8)|data[5])+40;

src/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) {
-        perror("str_cat");
+    if (!str)
         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 *);
-void state_send   (int, const char *, const char *);
+int  state_init (const char *);
+void state      (const char *, const char *);