Update README.md and mud

README.md

@@ -1,15 +1,10 @@
-# π₁(Glorytun)=ℤ²
+# π₁(Glorytun)=0
 
 Small, Simple and Stupid VPN over [mud](https://github.com/angt/mud).
 
-#### Work In Progress
-
-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:
 

src/common.c

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

src/db.c

@@ -12,14 +12,14 @@ struct node {
     uint32_t point;
 };
 
-_pure_
+_pure_ static inline size_t
-static inline size_t db_size (const uint8_t *a)
+db_size(const uint8_t *a)
 {
     return (a[0] ?: str_len((char *)a + 1)) + 1;
 }
 
-_pure_
+_pure_ static inline size_t
-static inline size_t db_cmp (const uint8_t *a, const uint8_t *b)
+db_cmp(const uint8_t *a, const uint8_t *b)
 {
     const size_t size = a[0];
 
@@ -39,8 +39,8 @@ static inline size_t db_cmp (const uint8_t *a, const uint8_t *b)
     return 0;
 }
 
-_pure_
+_pure_ static inline int
-static inline int db_dir (const uint32_t point, uint8_t *data, const size_t size)
+db_dir(const uint32_t point, uint8_t *data, const size_t size)
 {
     const size_t pos = point >> 8;
 
@@ -50,9 +50,10 @@ static inline int db_dir (const uint32_t point, uint8_t *data, const size_t size
     return ((point | data[pos]) & 255) == 255;
 }
 
-uint8_t *db_search (uint8_t **p, uint8_t *data)
+uint8_t *
+db_search(uint8_t **p, uint8_t *data)
 {
-    if _0_(!*p)
+    if (_0_(!*p))
         return NULL;
 
     uint8_t *r = *p;
@@ -69,12 +70,13 @@ uint8_t *db_search (uint8_t **p, uint8_t *data)
     return NULL;
 }
 
-uint8_t *db_insert (uint8_t **p, uint8_t *data)
+uint8_t *
+db_insert(uint8_t **p, uint8_t *data)
 {
-    if _0_(CBIT(data))
+    if (_0_(CBIT(data)))
         return NULL;
 
-    if _0_(!*p) {
+    if (_0_(!*p)) {
         *p = data;
         return data;
     }
@@ -89,7 +91,7 @@ uint8_t *db_insert (uint8_t **p, uint8_t *data)
 
     const size_t diff = db_cmp(r, data);
 
-    if _0_(!diff)
+    if (_0_(!diff))
         return r;
 
     const size_t pos = diff - 1;
@@ -107,7 +109,7 @@ uint8_t *db_insert (uint8_t **p, uint8_t *data)
 
     struct node *node = malloc(sizeof(struct node));
 
-    if _0_(!node)
+    if (_0_(!node))
         return NULL;
 
     const int dir = (mask | r[pos]) == 255;
@@ -121,9 +123,10 @@ uint8_t *db_insert (uint8_t **p, uint8_t *data)
     return data;
 }
 
-uint8_t *db_remove (uint8_t **p, uint8_t *data)
+uint8_t *
+db_remove(uint8_t **p, uint8_t *data)
 {
-    if _0_(!*p)
+    if (_0_(!*p))
         return NULL;
 
     const size_t size = db_size(data);
@@ -139,7 +142,7 @@ uint8_t *db_remove (uint8_t **p, uint8_t *data)
         p = node->child + dir;
     }
 
-    if _0_(db_cmp(data, *p))
+    if (_0_(db_cmp(data, *p)))
         return NULL;
 
     uint8_t *r = *p;

src/main.c

@@ -1,19 +1,19 @@
 #include "common.h"
 
 #include "buffer.h"
-#include "ip.h"
-#include "str.h"
-#include "option.h"
-#include "tun.h"
 #include "db.h"
+#include "ip.h"
+#include "option.h"
 #include "state.h"
+#include "str.h"
+#include "tun.h"
 
+#include <fcntl.h>
 #include <inttypes.h>
 #include <limits.h>
-#include <stdio.h>
-#include <signal.h>
 #include <poll.h>
-#include <fcntl.h>
+#include <signal.h>
+#include <stdio.h>
 #include <sys/socket.h>
 #include <sys/time.h>
 
@@ -33,7 +33,8 @@ static struct {
     int state_fd;
 } gt;
 
-static void fd_set_nonblock (int fd)
+static void
+fd_set_nonblock(int fd)
 {
     int ret;
 
@@ -51,7 +52,8 @@ static void fd_set_nonblock (int fd)
         perror("fcntl O_NONBLOCK");
 }
 
-static void gt_sa_handler (int sig)
+static void
+gt_sa_handler(int sig)
 {
     switch (sig) {
     case SIGINT:
@@ -65,7 +67,8 @@ static void gt_sa_handler (int sig)
     }
 }
 
-static void gt_set_signal (void)
+static void
+gt_set_signal(void)
 {
     struct sigaction sa = {
         .sa_flags = 0,
@@ -84,7 +87,8 @@ static void gt_set_signal (void)
     sigaction(SIGPIPE, &sa, NULL);
 }
 
-static ssize_t fd_read (int fd, void *data, size_t size)
+static ssize_t
+fd_read(int fd, void *data, size_t size)
 {
     if ((fd == -1) || !size)
         return -1;
@@ -104,7 +108,8 @@ static ssize_t fd_read (int fd, void *data, size_t size)
     return ret;
 }
 
-static ssize_t fd_write (int fd, const void *data, size_t size)
+static ssize_t
+fd_write(int fd, const void *data, size_t size)
 {
     if ((fd == -1) || !size)
         return -1;
@@ -127,7 +132,8 @@ static ssize_t fd_write (int fd, const void *data, size_t size)
     return ret;
 }
 
-static size_t fd_read_all (int fd, void *data, size_t size)
+static size_t
+fd_read_all(int fd, void *data, size_t size)
 {
     size_t done = 0;
 
@@ -155,7 +161,8 @@ static size_t fd_read_all (int fd, void *data, size_t size)
     return done;
 }
 
-static size_t fd_write_all (int fd, const void *data, size_t size)
+static size_t
+fd_write_all(int fd, const void *data, size_t size)
 {
     size_t done = 0;
 
@@ -183,7 +190,8 @@ static size_t fd_write_all (int fd, const void *data, size_t size)
     return done;
 }
 
-static int gt_setup_secretkey (struct mud *mud, char *keyfile)
+static int
+gt_setup_secretkey(struct mud *mud, char *keyfile)
 {
     unsigned char key[32];
 
@@ -231,7 +239,8 @@ static int gt_setup_secretkey (struct mud *mud, char *keyfile)
     return 0;
 }
 
-int main (int argc, char **argv)
+int
+main(int argc, char **argv)
 {
     gt_set_signal();
 
@@ -260,6 +269,7 @@ int main (int argc, char **argv)
 #endif
 
     struct option opts[] = {
+        // clang-format off
         { "host",           &host,           option_str    },
         { "port",           &port,           option_long   },
         { "bind",           &bind_list,      option_str    },
@@ -267,6 +277,7 @@ int main (int argc, char **argv)
         { "bind-port",      &bind_port,      option_long   },
         { "dev",            &dev,            option_str    },
         { "mtu",            &mtu,            option_long   },
+        { "mtu-auto",       NULL,            option_option },
         { "keyfile",        &keyfile,        option_str    },
         { "statefile",      &statefile,      option_str    },
         { "timeout",        &gt.timeout,     option_long   },
@@ -276,6 +287,7 @@ int main (int argc, char **argv)
         { "chacha20",       NULL,            option_option },
         { "version",        NULL,            option_option },
         {  NULL                                            },
+        // clang-format on
     };
 
     if (option(opts, argc, argv))
@@ -314,7 +326,7 @@ int main (int argc, char **argv)
 
     int icmp_fd = -1;
 
-    if (v4) {
+    if (v4 && option_is_set(opts, "mtu-auto")) {
         icmp_fd = socket(AF_INET, SOCK_RAW, IPPROTO_ICMP);
 
         if (icmp_fd == -1)
@@ -410,7 +422,7 @@ int main (int argc, char **argv)
         if (icmp_fd != -1)
             FD_SET(icmp_fd, &rfds);
 
-        if _0_(select(mud_fd+1, &rfds, NULL, NULL, NULL)==-1) {
+        if (select(mud_fd + 1, &rfds, NULL, NULL, NULL) == -1) {
             if (errno == EINTR)
                 continue;
             perror("select");
@@ -420,7 +432,8 @@ int main (int argc, char **argv)
         if (icmp_fd != -1 && FD_ISSET(icmp_fd, &rfds)) {
             struct sockaddr_storage ss;
             socklen_t sl = sizeof(ss);
-            ssize_t r = recvfrom(icmp_fd, buf, sizeof(buf), 0, (struct sockaddr *)&ss, &sl);
+            ssize_t r = recvfrom(icmp_fd, buf, sizeof(buf), 0,
+                                 (struct sockaddr *)&ss, &sl);
             if (r >= 8) {
                 struct ip_common ic;
                 if (!ip_get_common(&ic, buf, r) && ic.proto == 1) {
@@ -440,8 +453,8 @@ int main (int argc, char **argv)
             size_t size = 0;
 
             while (sizeof(buf) - size > mtu) {
-                const ssize_t r = tun_read(tun_fd, &buf[size], sizeof(buf)-size);
+                const ssize_t r = tun_read(tun_fd, &buf[size],
-
+                                           sizeof(buf) - size);
                 if (r <= 0)
                     break;
 
@@ -462,7 +475,8 @@ int main (int argc, char **argv)
                 while (q < size) {
                     struct ip_common ic;
 
-                    if (ip_get_common(&ic, &buf[q], size-q) || ic.size>size-q) {
+                    if ((ip_get_common(&ic, &buf[q], size - q)) ||
+                        (ic.size > size - q)) {
                         size = q;
                         break;
                     }
@@ -513,7 +527,8 @@ int main (int argc, char **argv)
                 while (p < size) {
                     struct ip_common ic;
 
-                    if (ip_get_common(&ic, &buf[p], size-p) || ic.size>size-p)
+                    if ((ip_get_common(&ic, &buf[p], size - p)) ||
+                        (ic.size > size - p))
                         break;
 
                     tun_write(tun_fd, &buf[p], ic.size);

src/option.c

@@ -3,7 +3,8 @@
 #include "option.h"
 #include "str.h"
 
-int option_str (void *data, int argc, char **argv)
+int
+option_str(void *data, int argc, char **argv)
 {
     if (argc < 2 || str_empty(argv[1])) {
         gt_print("option `%s' need a string argument\n", argv[0]);
@@ -15,7 +16,8 @@ int option_str (void *data, int argc, char **argv)
     return 1;
 }
 
-int option_long (void *data, int argc, char **argv)
+int
+option_long(void *data, int argc, char **argv)
 {
     if (argc < 2 || str_empty(argv[1])) {
         gt_print("option `%s' need an integer argument\n", argv[0]);
@@ -36,7 +38,8 @@ int option_long (void *data, int argc, char **argv)
     return 1;
 }
 
-int option_is_set (struct option *opts, const char *name)
+int
+option_is_set(struct option *opts, const char *name)
 {
     for (int k = 0; opts[k].name; k++) {
         if (!str_cmp(opts[k].name, name))
@@ -46,7 +49,8 @@ int option_is_set (struct option *opts, const char *name)
     return 0;
 }
 
-int option_option (void *data, int argc, char **argv)
+int
+option_option(void *data, int argc, char **argv)
 {
     if (!data)
         return 0;
@@ -87,7 +91,8 @@ int option_option (void *data, int argc, char **argv)
     return argc;
 }
 
-static int option_usage (struct option *opts, int slen)
+static int
+option_usage(struct option *opts, int slen)
 {
     if (!opts)
         return 0;
@@ -114,7 +119,8 @@ static int option_usage (struct option *opts, int slen)
     return len;
 }
 
-int option (struct option *opts, int argc, char **argv)
+int
+option(struct option *opts, int argc, char **argv)
 {
     int ret = option_option(opts, argc, argv);
 

src/state.c

@@ -3,11 +3,12 @@
 #include "state.h"
 #include "str.h"
 
-#include <stdio.h>
 #include <fcntl.h>
+#include <stdio.h>
 #include <sys/stat.h>
 
-int state_create (const char *filename)
+int
+state_create(const char *filename)
 {
     if (str_empty(filename))
         return -1;
@@ -37,7 +38,8 @@ int state_create (const char *filename)
     return fd;
 }
 
-void state_send (int fd, const char *state, const char *info)
+void
+state_send(int fd, const char *state, const char *info)
 {
     if (str_empty(state))
         return;

src/tun.c

@@ -1,11 +1,11 @@
 #include "common.h"
 
-#include "tun.h"
-#include "str.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>
@@ -18,9 +18,9 @@
 #endif
 
 #ifdef __APPLE__
-#include <sys/sys_domain.h>
-#include <sys/kern_control.h>
 #include <net/if_utun.h>
+#include <sys/kern_control.h>
+#include <sys/sys_domain.h>
 #endif
 
 #if defined(__APPLE__) || defined(__OpenBSD__)
@@ -29,7 +29,8 @@
 
 #ifdef __APPLE__
 
-static int tun_create_by_id (char *name, size_t size, unsigned id)
+static int
+tun_create_by_id(char *name, size_t size, unsigned id)
 {
     int fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
 
@@ -64,7 +65,8 @@ static int tun_create_by_id (char *name, size_t size, unsigned id)
     return fd;
 }
 
-static int tun_create_by_name (char *name, size_t size, char *dev_name)
+static int
+tun_create_by_name(char *name, size_t size, char *dev_name)
 {
     unsigned id = 0;
 
@@ -78,7 +80,8 @@ static int tun_create_by_name (char *name, size_t size, char *dev_name)
 
 #ifdef __linux__
 
-static int tun_create_by_name (char *name, size_t size, char *dev_name)
+static int
+tun_create_by_name(char *name, size_t size, char *dev_name)
 {
     int fd = open("/dev/net/tun", O_RDWR);
 
@@ -103,7 +106,8 @@ static int tun_create_by_name (char *name, size_t size, char *dev_name)
 
 #else /* not __linux__ not __APPLE__ */
 
-static int tun_create_by_name (char *name, size_t size, char *dev_name)
+static int
+tun_create_by_name(char *name, size_t size, char *dev_name)
 {
     char path[64];
 
@@ -115,7 +119,8 @@ static int tun_create_by_name (char *name, size_t size, char *dev_name)
 
 #endif /* not __APPLE__ */
 
-static int tun_create_by_id (char *name, size_t size, unsigned id)
+static int
+tun_create_by_id(char *name, size_t size, unsigned id)
 {
     char dev_name[64];
 
@@ -126,7 +131,8 @@ static int tun_create_by_id (char *name, size_t size, unsigned id)
 
 #endif
 
-int tun_create (char *dev_name, char **ret_name)
+int
+tun_create(char *dev_name, char **ret_name)
 {
     char name[64] = {0};
     int fd = -1;
@@ -144,7 +150,8 @@ int tun_create (char *dev_name, char **ret_name)
     return fd;
 }
 
-ssize_t tun_read (int fd, void *data, size_t size)
+ssize_t
+tun_read(int fd, void *data, size_t size)
 {
     if (!size)
         return -1;
@@ -153,8 +160,14 @@ ssize_t tun_read (int fd, void *data, size_t size)
     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);
@@ -182,7 +195,8 @@ ssize_t tun_read (int fd, void *data, size_t size)
 #endif
 }
 
-ssize_t tun_write (int fd, const void *data, size_t size)
+ssize_t
+tun_write(int fd, const void *data, size_t size)
 {
     if (!size)
         return -1;
@@ -202,8 +216,14 @@ ssize_t tun_write (int fd, const void *data, size_t size)
     }
 
     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);
@@ -231,7 +251,8 @@ ssize_t tun_write (int fd, const void *data, size_t size)
 #endif
 }
 
-int tun_set_mtu (char *dev_name, int mtu)
+int
+tun_set_mtu(char *dev_name, int mtu)
 {
     struct ifreq ifr = {
         .ifr_mtu = mtu,