Check for clock_gettime()

Chacha20 will be automatically used if aesni is not available.

Makefile.am

@@ -6,16 +6,19 @@ glorytun_CFLAGS = $(libsodium_CFLAGS)
 glorytun_LDADD = $(libsodium_LIBS)
 glorytun_SOURCES = \
     src/common.h \
-    src/common-static.h \
     src/common.c \
-    src/ip-static.h \
+    src/buffer.h \
+    src/ip.h \
+    src/str.h \
     src/main.c \
     src/option.c \
     src/option.h \
     src/tun.c \
     src/tun.h \
     src/db.c \
-    src/db.h
+    src/db.h \
+    src/state.c \
+    src/state.h
 
 EXTRA_DIST = \
     LICENSE \

README.md

@@ -1,4 +1,4 @@
-# Glorytun
+# π₁(Glorytun)=ℤ²
 
 Small, Simple and Stupid TCP VPN.
 
@@ -8,8 +8,7 @@ This code will probably format your harddisk!
 
 #### Build and Install
 
-Glorytun depends on [libsodium](https://github.com/jedisct1/libsodium) version >= 1.0.4
-and needs an AES-NI capable CPU.
+Glorytun depends on [libsodium](https://github.com/jedisct1/libsodium) version >= 1.0.4.
 
 To build and install the latest version:
 

configure.ac

@@ -16,6 +16,8 @@ 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/buffer.h

@@ -0,0 +1,66 @@
+#pragma once
+
+#include "common.h"
+
+typedef struct buffer buffer_t;
+
+struct buffer {
+    uint8_t *data;
+    uint8_t *read;
+    uint8_t *write;
+    uint8_t *end;
+};
+
+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;
+}
+
+_pure_
+static inline size_t buffer_size (buffer_t *buffer)
+{
+    return buffer->end-buffer->data;
+}
+
+_pure_
+static inline size_t buffer_write_size (buffer_t *buffer)
+{
+    return buffer->end-buffer->write;
+}
+
+_pure_
+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->data)
+        return;
+
+    if (buffer->read==buffer->write) {
+        buffer_format(buffer);
+        return;
+    }
+
+    const size_t size = buffer_read_size(buffer);
+
+    memmove(buffer->data, buffer->read, size);
+
+    buffer->read  = buffer->data;
+    buffer->write = buffer->data+size;
+}

src/common-static.h

@@ -1,155 +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)
-        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;
-}
-
-_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)
-{
-    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;
-}
-
-_pure_
-static inline size_t buffer_size (buffer_t *buffer)
-{
-    return buffer->end-buffer->data;
-}
-
-_pure_
-static inline size_t buffer_write_size (buffer_t *buffer)
-{
-    return buffer->end-buffer->write;
-}
-
-_pure_
-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.h

@@ -2,8 +2,11 @@
 
 #include <stdlib.h>
 #include <stdint.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
 
-#define COUNT(x) (sizeof(x)/sizeof(x[0]))
+#define COUNT(x)       (sizeof(x)/sizeof(x[0]))
 
 #define ALIGN_SIZE     (1<<4)
 #define ALIGN_MASK     (ALIGN_SIZE-1)
@@ -26,15 +29,6 @@
 #define _const_        __attribute__ ((const))
 #define _align_(...)   __attribute__ ((aligned(__VA_ARGS__)))
 
-typedef struct buffer buffer_t;
-
-struct buffer {
-    uint8_t *data;
-    uint8_t *read;
-    uint8_t *write;
-    uint8_t *end;
-};
-
 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_;

src/db.c

@@ -1,5 +1,7 @@
+#include "common.h"
+
 #include "db.h"
-#include "common-static.h"
+#include "str.h"
 
 #define CBIT(X)      (1&(intptr_t)(X))
 #define CBIT_PTR(X)  (uint8_t *)(1|(intptr_t)(X))

src/ip-static.h

@@ -1,57 +0,0 @@
-#pragma once
-
-#include <stdint.h>
-
-_pure_
-static inline int ip_get_version (const uint8_t *data, size_t size)
-{
-    if (size<20)   // XXX
-        return -1; // XXX
-
-    return data[0]>>4;
-}
-
-_pure_
-static inline ssize_t ip_get_size (const int ip_version, const uint8_t *data, size_t size)
-{
-    switch (ip_version) {
-    case 4:
-        return ((data[2]<<8)|data[3]);
-    case 6:
-        return ((data[4]<<8)|data[5])+40;
-    case -1:
-        return -1;
-    }
-
-    return 0;
-}
-
-_pure_
-static inline ssize_t ip_get_proto (const int ip_version, const uint8_t *data, size_t size)
-{
-    switch (ip_version) {
-    case 4:
-        return data[9];
-    case 6:
-        return data[6];
-    case -1:
-        return -1;
-    }
-
-    return 0;
-}
-
-_pure_
-static inline ssize_t ip_get_hdr_size (const int ip_version, const uint8_t *data, size_t size)
-{
-    switch (ip_version) {
-    case 4:
-        return (data[0]&0xF)<<2;
-    case 6:
-        return 40;
-    case -1:
-        return -1;
-    }
-
-    return 0;
-}

src/ip.h

@@ -0,0 +1,39 @@
+#pragma once
+
+#include <stdint.h>
+
+struct ip_common {
+    uint8_t version;
+    uint8_t proto;
+    uint8_t hdr_size;
+    uint16_t size;
+};
+
+_pure_
+static inline uint8_t ip_get_version (const uint8_t *data, size_t size)
+{
+    if (size<20)
+        return 0;
+
+    return data[0]>>4;
+}
+
+static inline int ip_get_common (struct ip_common *ic, const uint8_t *data, size_t size)
+{
+    ic->version = ip_get_version(data, size);
+
+    switch (ic->version) {
+    case 4:
+        ic->proto = data[9];
+        ic->hdr_size = (data[0]&0xF)<<2;
+        ic->size = ((data[2]<<8)|data[3]);
+        return 0;
+    case 6:
+        ic->proto = data[6];
+        ic->hdr_size = 40;
+        ic->size = ((data[4]<<8)|data[5])+40;
+        return 0;
+    }
+
+    return -1;
+}

src/option.c

@@ -1,25 +1,23 @@
-#include "common-static.h"
-
-#include <stdio.h>
-#include <stdlib.h>
+#include "common.h"
 
 #include "option.h"
+#include "str.h"
 
 int option_str (void *data, int argc, char **argv)
 {
-    if (argc<2 || !argv[1]) {
+    if (argc<2 || str_empty(argv[1])) {
         gt_print("option `%s' need a string argument\n", argv[0]);
         return -1;
     }
 
-    byte_cpy(data, &argv[1], sizeof(argv[1]));
+    memcpy(data, &argv[1], sizeof(argv[1]));
 
     return 1;
 }
 
 int option_long (void *data, int argc, char **argv)
 {
-    if (argc<2 || !argv[1]) {
+    if (argc<2 || str_empty(argv[1])) {
         gt_print("option `%s' need an integer argument\n", argv[0]);
         return -1;
     }
@@ -33,7 +31,7 @@ int option_long (void *data, int argc, char **argv)
         return -1;
     }
 
-    byte_cpy(data, &val, sizeof(val));
+    memcpy(data, &val, sizeof(val));
 
     return 1;
 }

src/state.c

@@ -0,0 +1,62 @@
+#include "common.h"
+
+#include "state.h"
+#include "str.h"
+
+#include <stdio.h>
+#include <fcntl.h>
+#include <sys/stat.h>
+
+int state_create (const char *filename)
+{
+    if (str_empty(filename))
+        return -1;
+
+    int fd = open(filename, O_WRONLY);
+
+    if (fd==-1) {
+        if (errno!=EINTR)
+            perror("open");
+        return -1;
+    }
+
+    struct stat st = {0};
+
+    if (fstat(fd, &st)==-1) {
+        perror("fstat");
+        close(fd);
+        return -1;
+    }
+
+    if (!S_ISFIFO(st.st_mode)) {
+        gt_log("`%s' is not a fifo\n", filename);
+        close(fd);
+        return -1;
+    }
+
+    return fd;
+}
+
+void state_send (int fd, 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");
+        return;
+    }
+
+    if (write(fd, str, str_len(str))==-1 && errno!=EINTR)
+        perror("write");
+
+    free(str);
+}

src/state.h

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

src/str.h

@@ -0,0 +1,73 @@
+#pragma once
+
+#include "common.h"
+
+static inline size_t str_cpy (char *restrict dst, const char *restrict src, size_t len)
+{
+    if (!dst || !src)
+        return 0;
+
+    size_t i;
+
+    for (i=0; i<len && src[i]; i++)
+        dst[i] = src[i];
+
+    dst[i] = 0;
+
+    return i;
+}
+
+_pure_
+static inline int str_empty (const char *restrict str)
+{
+    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)
+{
+    if (!str)
+        return 0;
+
+    return strlen(str);
+}
+
+static inline char *str_cat (const char **strs, size_t count)
+{
+    size_t size = 1;
+
+    for (size_t i=0; i<count; i++)
+        size += str_len(strs[i]);
+
+    char *str = malloc(size);
+
+    if (!str)
+        return NULL;
+
+    char *p = str;
+
+    for (size_t i=0; i<count; i++) {
+        size_t len = str_len(strs[i]);
+        memcpy(p, strs[i], len);
+        p += len;
+    }
+
+    p[0] = 0;
+
+    return str;
+}

src/tun.c

@@ -1,7 +1,8 @@
-#include "common-static.h"
-#include "ip-static.h"
+#include "common.h"
 
 #include "tun.h"
+#include "str.h"
+#include "ip.h"
 
 #include <stdio.h>
 #include <fcntl.h>
@@ -36,7 +37,7 @@ static int tun_create_by_id (char *name, size_t size, unsigned id, _unused_ int
 
     struct ctl_info ci;
 
-    byte_set(&ci, 0, sizeof(ci));
+    memset(&ci, 0, sizeof(ci));
     str_cpy(ci.ctl_name, UTUN_CONTROL_NAME, sizeof(ci.ctl_name)-1);
 
     if (ioctl(fd, CTLIOCGINFO, &ci)) {
@@ -130,9 +131,9 @@ static int tun_create_by_id (char *name, size_t size, unsigned id, int mq)
 
 #endif
 
-int tun_create (char *dev_name, int mq)
+int tun_create (char *dev_name, char **ret_name, int mq)
 {
-    char name[64];
+    char name[64] = {0};
     int fd = -1;
 
 #ifndef IFF_MULTI_QUEUE
@@ -147,8 +148,8 @@ int tun_create (char *dev_name, int mq)
         fd = tun_create_by_name(name, sizeof(name), dev_name, mq);
     }
 
-    if (fd!=-1)
-        gt_print("tun name: %s\n", name);
+    if (fd!=-1 && ret_name)
+        *ret_name = strdup(name);
 
     return fd;
 }

src/tun.h

@@ -2,6 +2,6 @@
 
 #include <unistd.h>
 
-int     tun_create (char *, int);
+int     tun_create (char *, char **, int);
 ssize_t tun_read   (int, void *, size_t);
 ssize_t tun_write  (int, const void *, size_t);

version.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-[ -z "${VERSION}" ] && VERSION=`git describe --tags --always 2>/dev/null` \
+[ -z "${VERSION}" ] && VERSION=`git describe --tags --match='v[0-9].*' 2>/dev/null` \
                     && VERSION=${VERSION#v}
 
 [ -z "${VERSION}" ] && VERSION=`cat VERSION 2>/dev/null`