Compare commits

...

130 Commits

Author SHA1 Message Date
Adrien Gallouët
2cb24c0523 Update mud 2017-01-16 16:11:18 +00:00
Adrien Gallouët
65be22202c Update mud 2017-01-12 13:26:35 +00:00
Adrien Gallouët
6cc32bafd9 Code cleanup 2017-01-12 13:26:23 +00:00
Adrien Gallouët
6c268e658f Reset default MTU to 1500 2017-01-06 13:17:46 +00:00
Adrien Gallouët
33e24632d0 Update mud 2017-01-06 11:50:31 +00:00
Adrien Gallouët
e1b4c6aafc Add debug.bin 2017-01-06 11:02:09 +00:00
Adrien Gallouët
09d1932588 Code cleanup 2017-01-06 10:16:13 +00:00
Adrien Gallouët
4988479df4 Drop packets with bad length (too small) 2017-01-05 16:45:14 +00:00
Adrien Gallouët
7779e61c15 Update mud 2017-01-04 14:37:51 +00:00
Adrien Gallouët
2cc8caec35 Don't try to send empty packet 2017-01-04 14:35:26 +00:00
Adrien Gallouët
8c8715187b Code cleanup 2017-01-04 14:27:55 +00:00
Adrien Gallouët
c591a4d3cc Drop too large packets 2017-01-04 14:15:18 +00:00
Adrien Gallouët
76cd7ed4b8 Don't handle errors in tun.c 2017-01-04 14:07:30 +00:00
Adrien Gallouët
a8595c36b4 Update mud 2016-12-22 13:44:31 +00:00
Adrien Gallouët
1dfe105bd0 Don't modify mtu from mud_get_mtu() 2016-12-22 10:25:34 +00:00
Adrien Gallouët
f2ead2e4e2 Set nonblock to all fds 2016-12-22 10:22:16 +00:00
Adrien Gallouët
234f0d8592 Update and fix MTU 2016-12-21 16:14:40 +00:00
Adrien Gallouët
bd102c5fb0 Don't use linux/if_tun.h
This allows to build easily with other libc.
2016-12-21 11:43:19 +00:00
Adrien Gallouët
521d02e6e8 Code cleanup 2016-12-20 16:29:40 +00:00
Adrien Gallouët
91efdfe4e8 Exit only on EBADF for select() 2016-12-20 11:44:42 +00:00
Adrien Gallouët
deba26a7cb Code cleanup 2016-12-20 10:57:42 +00:00
Adrien Gallouët
b2f01687a8 Ignore SIGUSR2 2016-12-20 10:25:00 +00:00
Adrien Gallouët
dc295f9dc0 Remove old gt.info 2016-12-20 10:24:20 +00:00
Adrien Gallouët
04f7c20494 Remove fd_read*() 2016-12-20 10:19:05 +00:00
Adrien Gallouët
cd1f122a59 Add gt_print_secretkey() 2016-12-20 10:06:24 +00:00
Adrien Gallouët
8ecd24564f Remove old fd_write*() 2016-12-20 10:00:24 +00:00
Adrien Gallouët
577938432a Remove buffer.h 2016-12-20 08:51:11 +00:00
Adrien Gallouët
89f8379c73 Remove statefile option 2016-12-20 08:49:43 +00:00
Adrien Gallouët
5934e3b94d Update mud 2016-12-19 16:46:17 +00:00
Adrien Gallouët
0e5974aea2 Update README.md and mud 2016-12-15 10:10:05 +00:00
Adrien Gallouët
3675820555 Add mtu-auto option 2016-12-14 14:56:53 +00:00
Adrien Gallouët
3ba1b914d6 Update mud 2016-12-13 13:54:33 +00:00
Adrien Gallouët
1dbf3fcc80 Update mud 2016-12-12 16:41:28 +00:00
Adrien Gallouët
6167145454 Update mud 2016-12-12 15:11:52 +00:00
Adrien Gallouët
97ae583707 Update mud 2016-12-08 11:24:15 +00:00
Adrien Gallouët
0d97df6b50 Reformat 2016-12-05 15:05:54 +00:00
Adrien Gallouët
0645f0d4d0 Update mud 2016-12-02 11:19:21 +00:00
Adrien Gallouët
3656ab9e2a Add bind-backup option 2016-11-28 11:02:06 +00:00
Adrien Gallouët
adb791d3ba Update mud 2016-11-25 16:44:00 +00:00
Adrien Gallouët
f1a5d55613 Update mud 2016-11-18 18:03:12 +00:00
Adrien Gallouët
f46305847e Rework buffer 2016-11-18 11:55:21 +00:00
Adrien Gallouët
a75f3b0fd8 Remove STARTED and STOPPED 2016-11-07 15:08:25 +00:00
Adrien Gallouët
2934228005 Remove pull/push of mud 2016-10-27 15:04:11 +00:00
Adrien Gallouët
d599e545f7 Update mud 2016-10-25 09:15:34 +00:00
Frank Denis
048870e280 <linux/if.h> is not required any more (#19) 2016-10-24 11:19:43 +02:00
Frank Denis
31045456fe include <net/if.h> for the ifreq structure (#18)
Required on BSD. Doesn't break anything elsewhere.
2016-10-23 12:38:32 +02:00
Adrien Gallouët
0bb5be63b9 Get ICMP type 3 to set the next-hop MTU 2016-10-18 16:44:20 +00:00
Adrien Gallouët
c9f737197c Remove multiqueue (not used with mud) 2016-10-05 09:49:14 +00:00
Adrien Gallouët
d4e70feddc Update mud 2016-10-05 08:02:48 +00:00
Adrien Gallouët
726a3eed13 Add MTU negotiation 2016-10-04 15:27:37 +00:00
Adrien Gallouët
caeed75918 Update mud 2016-09-21 16:17:20 +00:00
Adrien Gallouët
9a6795125d Update mud 2016-09-16 15:13:18 +00:00
Adrien Gallouët
db26fc5676 Update mud 2016-09-06 08:46:23 +00:00
Adrien Gallouët
05cc7b1087 Be more verbose when mud fails 2016-09-06 08:45:53 +00:00
Adrien Gallouët
6df1f9e243 Update mud 2016-09-05 09:31:34 +00:00
Adrien Gallouët
73ce84ccf7 Fixes #15 2016-08-26 11:19:52 +00:00
Adrien Gallouët
91bb0b1231 Forward tos/tclass to mud 2016-07-25 15:15:27 +00:00
Adrien Gallouët
84156a9eba Update mud 2016-07-20 15:15:11 +00:00
Adrien Gallouët
b13501b9fb Update mud 2016-07-19 16:53:53 +00:00
Adrien Gallouët
3363e219a7 Update mud 2016-07-15 18:45:36 +00:00
Adrien Gallouët
00ee23b0b6 Allow IPv4 and IPv6 only on Linux 2016-07-15 18:42:28 +00:00
Adrien Gallouët
1286b0f69e Update mud 2016-07-15 17:35:45 +00:00
Adrien Gallouët
fe5bc5454e Add chacha20 option and AES-NI negotiation 2016-07-12 17:01:41 +00:00
Adrien Gallouët
f4e94a9089 Remove -flto for now 2016-07-11 10:24:47 +00:00
Adrien Gallouët
6a7da371e2 Add .build.sh 2016-07-11 09:34:16 +00:00
Adrien Gallouët
4cf5f7a118 Update mud 2016-07-07 14:39:19 +00:00
Adrien Gallouët
35fd01f9ee Update mud 2016-07-06 13:42:30 +00:00
Adrien Gallouët
04aad57789 Update mud 2016-07-05 15:41:32 +00:00
Adrien Gallouët
7a277a8810 Update configure.ac 2016-06-30 09:52:34 +00:00
Adrien Gallouët
b232a101d2 Update mud 2016-06-30 09:41:32 +00:00
Adrien Gallouët
a01dc81500 Don't wait too long when we have data to send 2016-06-27 11:19:16 +00:00
Adrien Gallouët
1db628d84a Update mud 2016-06-24 13:21:02 +00:00
Adrien Gallouët
f11cd34dc4 Update mud 2016-06-22 17:55:18 +00:00
Adrien Gallouët
d0376e3aa5 Update mud 2016-06-22 09:18:34 +00:00
Adrien Gallouët
a7518c0e5a Update mud 2016-06-21 16:51:24 +00:00
Adrien Gallouët
378316bd68 Add mtu option 2016-06-13 15:43:45 +00:00
angt
286d6abf2d Update mud 2016-05-10 10:46:15 +00:00
angt
1f1464e90d Update mud 2016-05-09 14:23:17 +00:00
angt
55d9dd9277 Update mud 2016-05-02 09:18:44 +00:00
angt
2f290dbf85 Update mud and merge from master 2016-04-26 06:54:30 +00:00
angt
39e3f53139 Add v{4,6}only option 2016-04-25 16:29:20 +00:00
angt
babe14d544 Quit on tun error 2016-04-25 10:24:42 +00:00
angt
278fc69789 Update mud 2016-04-21 15:35:35 +00:00
angt
99262777fc Update mud 2016-04-17 10:16:13 +00:00
angt
b0f60caab2 Update mud 2016-04-14 20:12:45 +00:00
angt
efd5e0bb36 Remove down-timeout and use timeout for send-timeout 2016-04-08 14:38:07 +00:00
angt
ade4617d53 Update mud 2016-04-08 13:00:52 +00:00
angt
64a5fd8227 Update mud 2016-04-05 14:23:45 +00:00
angt
eba968797c Add {down,send,pong}-timeout and time-tolerance option 2016-04-05 14:17:07 +00:00
angt
d60f28a7fe Update mud 2016-04-05 06:42:03 +00:00
angt
32069eb104 Print tun device on STARTED and STOPPED too 2016-04-04 20:05:33 +00:00
angt
a6adcefc25 Update mud 2016-04-04 16:48:11 +00:00
angt
743b0ee0da Don't check AES-NI 2016-04-01 16:50:04 +00:00
angt
ba06a6fc10 Update mud 2016-04-01 16:37:02 +00:00
Adrien Gallouët
80d4c2814f Update README.md 2016-03-24 18:52:18 +01:00
angt
b0d5007bfb Restore STARTED and STOPPED states 2016-03-24 14:45:15 +00:00
angt
d2046eb00b Revert "Add branch name in version"
This reverts commit 03cd87df1c.
2016-03-09 11:42:51 +00:00
angt
d04acc9c0f Update mud 2016-03-09 10:59:52 +00:00
angt
03cd87df1c Add branch name in version 2016-03-09 10:20:01 +00:00
angt
8e8ad7178d Update mud 2016-03-04 11:32:42 +00:00
angt
0e26b4def7 Update mud 2016-03-04 11:20:15 +00:00
angt
f800985766 Update mud 2016-03-04 11:01:43 +00:00
angt
7b88c28a45 Update mud 2016-03-03 10:49:28 +00:00
angt
194dfe17d3 Update mud 2016-03-02 12:59:33 +00:00
angt
664160e0cc Add bind-port option 2016-03-01 15:11:16 +00:00
angt
1dd760e382 Code cleanup 2016-03-01 08:13:05 +00:00
angt
05219b81f7 Update README.md 2016-02-29 16:14:08 +00:00
angt
0bb7e4f1d0 Update mud 2016-02-29 15:35:57 +00:00
angt
a7fbf806fb Use a list to setup mud_bind() 2016-02-29 15:28:37 +00:00
angt
e750c46665 Update mud 2016-02-25 15:22:47 +00:00
angt
935111cfea Fix Makefile.am 2016-02-04 11:31:02 +01:00
angt
c4b2512df4 Add .gitmodules 2016-02-04 10:44:53 +01:00
angt
27970e24fb Import and use mud 2016-02-04 10:39:36 +01:00
angt
acc3ee3461 Encrypt only one packet at a time 2016-01-26 12:18:00 +01:00
angt
eefa7722c5 Use timeout in connect() too 2016-01-21 16:22:31 +01:00
angt
17547f555d Add SECRETKEY state 2016-01-18 18:07:35 +01:00
angt
ec9c59ce69 Code cleanup 2016-01-18 18:00:41 +01:00
angt
679927a684 Show device name in INITIALIZED state 2016-01-18 17:58:20 +01:00
angt
2999faf5d7 Move up state_init() 2016-01-18 17:26:42 +01:00
angt
219384b7e5 Remove the old school daemon option 2016-01-18 16:09:29 +01:00
angt
3649e46b03 Remove the absolute path restriction on statefile 2016-01-18 16:02:29 +01:00
angt
88f314bc75 Add state.[ch] 2016-01-18 15:59:18 +01:00
angt
e2b3dc1b46 Use only v[0-9].* tags to get VERSION 2016-01-17 10:56:55 +01:00
angt
1815ea519f Create a tcp_entry only on ACK 2016-01-17 10:18:39 +01:00
angt
33356d5d35 Don't work too much 2016-01-17 09:40:56 +01:00
angt
4a5d07ec45 Merge pull request #11 from jedisct1/notag
Cope with branches that don't have tags
2016-01-16 16:16:05 +01:00
Frank Denis
a50882e1ac Cope with branches that don't have tags
`version.sh` used to return only the hash of the last commit, causing
VERSION_MAJOR to possibly contain non-numeric junk.
2016-01-16 15:37:42 +01:00
angt
b2cb8ebcbe The minimum value for buffer-size option is GT_PKT_MAX 2016-01-15 17:02:11 +01:00
angt
6fd6cf8c4a Merge pull request #10 from jedisct1/socket
Include <sys/socket.h> for AF_INET/AF_INET6 definitions
2016-01-14 17:14:56 +01:00
Frank Denis
f0fc2751e5 Include <sys/socket.h> for AF_INET/AF_INET6 definitions
Required on OpenBSD
2016-01-14 17:11:27 +01:00
17 changed files with 609 additions and 1631 deletions

18
.build.sh Executable file
View File

@@ -0,0 +1,18 @@
#!/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
cp glorytun deploy/glorytun-$(cat VERSION)-$(uname -m).debug.bin
strip -s glorytun
cp glorytun deploy/glorytun-$(cat VERSION)-$(uname -m).bin

3
.gitmodules vendored Normal file
View File

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

View File

@@ -7,7 +7,6 @@ glorytun_LDADD = $(libsodium_LIBS)
glorytun_SOURCES = \ glorytun_SOURCES = \
src/common.h \ src/common.h \
src/common.c \ src/common.c \
src/buffer.h \
src/ip.h \ src/ip.h \
src/str.h \ src/str.h \
src/main.c \ src/main.c \
@@ -18,6 +17,10 @@ glorytun_SOURCES = \
src/db.c \ src/db.c \
src/db.h src/db.h
glorytun_SOURCES += \
mud/mud.h \
mud/mud.c
EXTRA_DIST = \ EXTRA_DIST = \
LICENSE \ LICENSE \
README.md \ README.md \

View File

@@ -1,19 +1,14 @@
# Glorytun # π₁(Glorytun)=0
Small, Simple and Stupid TCP VPN. 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 #### 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: 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 $ cd glorytun
$ ./autogen.sh $ ./autogen.sh
$ ./configure $ ./configure

View File

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

1
mud Submodule

Submodule mud added at 762b4487bf

View File

@@ -1,63 +0,0 @@
#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->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) {
memcpy(buffer->data, src, size);
buffer->read -= src-buffer->data;
buffer->write -= src-buffer->data;
}
}
}

View File

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

View File

@@ -29,6 +29,12 @@
#define _const_ __attribute__ ((const)) #define _const_ __attribute__ ((const))
#define _align_(...) __attribute__ ((aligned(__VA_ARGS__))) #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; })
int gt_print (const char *, ...) _printf_(1,2); int gt_print (const char *, ...) _printf_(1,2);
void gt_log (const char *, ...) _printf_(1,2); void gt_log (const char *, ...) _printf_(1,2);
void gt_fatal (const char *, ...) _printf_(1,2) _noreturn_; void gt_fatal (const char *, ...) _printf_(1,2) _noreturn_;

View File

@@ -12,14 +12,14 @@ struct node {
uint32_t point; 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; 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]; 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; 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; 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; 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; return NULL;
uint8_t *r = *p; uint8_t *r = *p;
@@ -69,12 +70,13 @@ uint8_t *db_search (uint8_t **p, uint8_t *data)
return NULL; 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; return NULL;
if _0_(!*p) { if (_0_(!*p)) {
*p = data; *p = data;
return 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); const size_t diff = db_cmp(r, data);
if _0_(!diff) if (_0_(!diff))
return r; return r;
const size_t pos = diff - 1; 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)); struct node *node = malloc(sizeof(struct node));
if _0_(!node) if (_0_(!node))
return NULL; return NULL;
const int dir = (mask | r[pos]) == 255; const int dir = (mask | r[pos]) == 255;
@@ -121,9 +123,10 @@ uint8_t *db_insert (uint8_t **p, uint8_t *data)
return 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; return NULL;
const size_t size = db_size(data); 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; p = node->child + dir;
} }
if _0_(db_cmp(data, *p)) if (_0_(db_cmp(data, *p)))
return NULL; return NULL;
uint8_t *r = *p; uint8_t *r = *p;

View File

@@ -4,13 +4,14 @@
struct ip_common { struct ip_common {
uint8_t version; uint8_t version;
uint8_t tc;
uint8_t proto; uint8_t proto;
uint8_t hdr_size; uint8_t hdr_size;
uint16_t size; uint16_t size;
}; };
_pure_ _pure_ static inline uint8_t
static inline uint8_t ip_get_version (const uint8_t *data, size_t size) ip_get_version(const uint8_t *data, size_t size)
{ {
if (size < 20) if (size < 20)
return 0; return 0;
@@ -18,17 +19,22 @@ static inline uint8_t ip_get_version (const uint8_t *data, size_t size)
return data[0] >> 4; return data[0] >> 4;
} }
static inline int ip_get_common (struct ip_common *ic, const uint8_t *data, size_t size) static inline int
ip_get_common(struct ip_common *ic, const uint8_t *data, size_t size)
{ {
ic->version = ip_get_version(data, size); ic->version = ip_get_version(data, size);
switch (ic->version) { switch (ic->version) {
case 4: case 4:
ic->tc = data[1];
ic->proto = data[9]; ic->proto = data[9];
ic->hdr_size = (data[0] & 0xF) << 2; ic->hdr_size = (data[0] & 0xF) << 2;
ic->size = ((data[2] << 8) | data[3]); ic->size = ((data[2] << 8) | data[3]);
if (ic->size >= 20)
return 0; return 0;
break;
case 6: case 6:
ic->tc = ((data[0] & 0xF) << 4) | (data[1] >> 4);
ic->proto = data[6]; ic->proto = data[6];
ic->hdr_size = 40; ic->hdr_size = 40;
ic->size = ((data[4] << 8) | data[5]) + 40; ic->size = ((data[4] << 8) | data[5]) + 40;

1594
src/main.c

File diff suppressed because it is too large Load Diff

View File

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

View File

@@ -2,7 +2,8 @@
#include "common.h" #include "common.h"
static inline size_t str_cpy (char *restrict dst, const char *restrict src, size_t len) static inline size_t
str_cpy(char *restrict dst, const char *restrict src, size_t len)
{ {
if (!dst || !src) if (!dst || !src)
return 0; return 0;
@@ -17,14 +18,14 @@ static inline size_t str_cpy (char *restrict dst, const char *restrict src, size
return i; return i;
} }
_pure_ _pure_ static inline int
static inline int str_empty (const char *restrict str) str_empty(const char *restrict str)
{ {
return !str || !str[0]; return !str || !str[0];
} }
_pure_ _pure_ static inline size_t
static inline size_t str_cmp (const char *restrict sa, const char *restrict sb) str_cmp(const char *restrict sa, const char *restrict sb)
{ {
if (!sa || !sb) if (!sa || !sb)
return 1; return 1;
@@ -38,8 +39,8 @@ static inline size_t str_cmp (const char *restrict sa, const char *restrict sb)
return i + 1; return i + 1;
} }
_pure_ _pure_ static inline size_t
static inline size_t str_len (const char *restrict str) str_len(const char *restrict str)
{ {
if (!str) if (!str)
return 0; return 0;
@@ -47,7 +48,8 @@ static inline size_t str_len (const char *restrict str)
return strlen(str); return strlen(str);
} }
static inline char *str_cat (const char *const strs[], size_t count) static inline char *
str_cat(const char **strs, size_t count)
{ {
size_t size = 1; size_t size = 1;

160
src/tun.c
View File

@@ -1,25 +1,28 @@
#include "common.h" #include "common.h"
#include "tun.h"
#include "str.h"
#include "ip.h" #include "ip.h"
#include "str.h"
#include "tun.h"
#include <stdio.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdio.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/uio.h> #include <sys/uio.h>
#include <net/if.h>
#ifdef __linux__ #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)
#endif #endif
#ifdef __APPLE__ #ifdef __APPLE__
#include <sys/sys_domain.h>
#include <sys/kern_control.h>
#include <net/if_utun.h> #include <net/if_utun.h>
#include <sys/kern_control.h>
#include <sys/sys_domain.h>
#endif #endif
#if defined(__APPLE__) || defined(__OpenBSD__) #if defined(__APPLE__) || defined(__OpenBSD__)
@@ -28,7 +31,8 @@
#ifdef __APPLE__ #ifdef __APPLE__
static int tun_create_by_id (char *name, size_t size, unsigned id, _unused_ int mq) static int
tun_create_by_id(char *name, size_t size, unsigned id)
{ {
int fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL); int fd = socket(PF_SYSTEM, SOCK_DGRAM, SYSPROTO_CONTROL);
@@ -41,7 +45,9 @@ static int tun_create_by_id (char *name, size_t size, unsigned id, _unused_ int
str_cpy(ci.ctl_name, UTUN_CONTROL_NAME, sizeof(ci.ctl_name) - 1); str_cpy(ci.ctl_name, UTUN_CONTROL_NAME, sizeof(ci.ctl_name) - 1);
if (ioctl(fd, CTLIOCGINFO, &ci)) { if (ioctl(fd, CTLIOCGINFO, &ci)) {
int err = errno;
close(fd); close(fd);
errno = err;
return -1; return -1;
} }
@@ -54,7 +60,9 @@ static int tun_create_by_id (char *name, size_t size, unsigned id, _unused_ int
}; };
if (connect(fd, (struct sockaddr *)&sc, sizeof(sc))) { if (connect(fd, (struct sockaddr *)&sc, sizeof(sc))) {
int err = errno;
close(fd); close(fd);
errno = err;
return -1; return -1;
} }
@@ -63,21 +71,25 @@ static int tun_create_by_id (char *name, size_t size, unsigned id, _unused_ int
return fd; return fd;
} }
static int tun_create_by_name (char *name, size_t size, char *dev_name, int mq) static int
tun_create_by_name(char *name, size_t size, char *dev_name)
{ {
unsigned id = 0; unsigned id = 0;
if (sscanf(dev_name, "utun%u", &id)!=1) if (sscanf(dev_name, "utun%u", &id) != 1) {
errno = EINVAL;
return -1; return -1;
}
return tun_create_by_id(name, size, id, mq); return tun_create_by_id(name, size, id);
} }
#else /* not __APPLE__ */ #else /* not __APPLE__ */
#ifdef __linux__ #ifdef __linux__
static int tun_create_by_name (char *name, size_t size, char *dev_name, int mq) static int
tun_create_by_name(char *name, size_t size, char *dev_name)
{ {
int fd = open("/dev/net/tun", O_RDWR); int fd = open("/dev/net/tun", O_RDWR);
@@ -88,12 +100,6 @@ static int tun_create_by_name (char *name, size_t size, char *dev_name, int mq)
.ifr_flags = IFF_TUN | IFF_NO_PI, .ifr_flags = IFF_TUN | IFF_NO_PI,
}; };
if (mq) {
#ifdef IFF_MULTI_QUEUE
ifr.ifr_flags |= IFF_MULTI_QUEUE;
#endif
}
str_cpy(ifr.ifr_name, dev_name, IFNAMSIZ - 1); str_cpy(ifr.ifr_name, dev_name, IFNAMSIZ - 1);
if (ioctl(fd, TUNSETIFF, &ifr)) { if (ioctl(fd, TUNSETIFF, &ifr)) {
@@ -108,7 +114,8 @@ static int tun_create_by_name (char *name, size_t size, char *dev_name, int mq)
#else /* not __linux__ not __APPLE__ */ #else /* not __linux__ not __APPLE__ */
static int tun_create_by_name (char *name, size_t size, char *dev_name, _unused_ int mq) static int
tun_create_by_name(char *name, size_t size, char *dev_name)
{ {
char path[64]; char path[64];
@@ -120,82 +127,76 @@ static int tun_create_by_name (char *name, size_t size, char *dev_name, _unused_
#endif /* not __APPLE__ */ #endif /* not __APPLE__ */
static int tun_create_by_id (char *name, size_t size, unsigned id, int mq) static int
tun_create_by_id(char *name, size_t size, unsigned id)
{ {
char dev_name[64]; char dev_name[64];
snprintf(dev_name, sizeof(dev_name), "tun%u", id); snprintf(dev_name, sizeof(dev_name), "tun%u", id);
return tun_create_by_name(name, size, dev_name, mq); return tun_create_by_name(name, size, dev_name);
} }
#endif #endif
int tun_create (char *dev_name, int mq) int
tun_create(char *dev_name, char **ret_name)
{ {
char name[64]; char name[64] = {0};
int fd = -1; int fd = -1;
#ifndef IFF_MULTI_QUEUE
if (mq)
gt_na("IFF_MULTI_QUEUE");
#endif
if (str_empty(dev_name)) { if (str_empty(dev_name)) {
for (unsigned id = 0; id < 32 && fd == -1; id++) for (unsigned id = 0; id < 32 && fd == -1; id++)
fd = tun_create_by_id(name, sizeof(name), id, mq); fd = tun_create_by_id(name, sizeof(name), id);
} else { } else {
fd = tun_create_by_name(name, sizeof(name), dev_name, mq); fd = tun_create_by_name(name, sizeof(name), dev_name);
} }
if (fd!=-1) if (fd != -1 && ret_name)
gt_print("tun name: %s\n", name); *ret_name = strdup(name);
return fd; return fd;
} }
ssize_t tun_read (int fd, void *data, size_t size) int
tun_read(int fd, void *data, size_t size)
{ {
if (!size) if (!size)
return -1; return 0;
#ifdef GT_BSD_TUN #ifdef GT_BSD_TUN
uint32_t family; uint32_t family;
struct iovec iov[2] = { 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); 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("tun read");
return 0;
}
#ifdef GT_BSD_TUN
if (ret<(ssize_t) sizeof(family))
return 0; return 0;
return ret - sizeof(family); return ret - sizeof(family);
#else #else
return ret; return read(fd, data, size);
#endif #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) if (!size)
return -1; return 0;
#ifdef GT_BSD_TUN #ifdef GT_BSD_TUN
uint32_t family; uint32_t family;
@@ -208,35 +209,54 @@ ssize_t tun_write (int fd, const void *data, size_t size)
family = htonl(AF_INET6); family = htonl(AF_INET6);
break; break;
default: default:
errno = EINVAL;
return -1; return -1;
} }
struct iovec iov[2] = { 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); 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("tun write");
return 0;
}
#ifdef GT_BSD_TUN
if (ret<(ssize_t) sizeof(family))
return 0; return 0;
return ret - sizeof(family); return ret - sizeof(family);
#else #else
return ret; return write(fd, data, size);
#endif #endif
} }
int
tun_set_mtu(char *dev_name, int mtu)
{
struct ifreq ifr = {
.ifr_mtu = mtu,
};
str_cpy(ifr.ifr_name, dev_name, IFNAMSIZ - 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;
}

View File

@@ -1,7 +1,6 @@
#pragma once #pragma once
#include <unistd.h> int tun_create (char *, 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_mtu (char *, int);
ssize_t tun_write (int, const void *, size_t);

View File

@@ -1,6 +1,6 @@
#!/bin/sh #!/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} && VERSION=${VERSION#v}
[ -z "${VERSION}" ] && VERSION=`cat VERSION 2>/dev/null` [ -z "${VERSION}" ] && VERSION=`cat VERSION 2>/dev/null`