miegl/glorytun
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove Linuxisms

Browse Source
This commit is contained in:
Frank Denis
2015-10-22 17:08:20 +02:00
parent 7fb0e3f97d
commit 577f91e42b
1 changed files with 28 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
glorytun.c
View File

@@ -11,8 +11,10 @@
#include <arpa/inet.h> #include <arpa/inet.h>
#include <netdb.h> #include <netdb.h>
#include <linux/if.h> #ifdef __linux__
#include <linux/if_tun.h> # include <linux/if.h>
# include <linux/if_tun.h>
#endif
#define GT_BUFFER_SIZE (256*1024) #define GT_BUFFER_SIZE (256*1024)
@@ -54,8 +56,11 @@ static void fd_set_congestion (int fd, const char *name)
if (!len) if (!len)
return; return;
(void) fd;
#ifdef TCP_CONGESTION
if (setsockopt(fd, IPPROTO_TCP, TCP_CONGESTION, name, len+1)==-1) if (setsockopt(fd, IPPROTO_TCP, TCP_CONGESTION, name, len+1)==-1)
printf("setsockopt TCP_CONGESTION: %m\n"); printf("setsockopt TCP_CONGESTION: %m\n");
#endif
} }
static int fd_listen (int fd, struct addrinfo *ai) static int fd_listen (int fd, struct addrinfo *ai)
@@ -101,6 +106,7 @@ static int fd_create (struct addrinfo *res, int(*func)(int, struct addrinfo *))
return -1; return -1;
} }
#ifdef __linux__
static int tun_create (char *name) static int tun_create (char *name)
{ {
int fd = open("/dev/net/tun", O_RDWR); int fd = open("/dev/net/tun", O_RDWR);
@@ -127,6 +133,24 @@ static int tun_create (char *name)
return fd; return fd;
} }
#else
static int tun_create (char *name)
{
char dev_path[11U];
unsigned int dev_id;
int fd;
(void) name;
for (dev_id = 0U; dev_id < 32U; dev_id++) {
snprintf(dev_path, sizeof dev_path, "/dev/tun%u", dev_id);
fd = open(dev_path, O_RDWR);
if (fd != -1) {
break;
}
}
return fd;
}
#endif
static void gt_sa_stop (int sig) static void gt_sa_stop (int sig)
{ {
@@ -139,8 +163,9 @@ static void gt_sa_stop (int sig)
static void gt_set_signal (void) static void gt_set_signal (void)
{ {
struct sigaction sa = {0}; struct sigaction sa;
byte_set(&sa, 0, sizeof sa);
running = 1; running = 1;
sa.sa_handler = gt_sa_stop; sa.sa_handler = gt_sa_stop;