mirrors/iodine
1
0
Fork 0
mirror of https://github.com/yarrick/iodine.git synced 2024-11-03 06:57:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Equal darwin and freebsd, fix bsd open_tun to return fd

Browse source
This commit is contained in:
Erik Ekman 2006-06-25 11:33:29 +00:00
parent c7191d27e7
commit a22721f395
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
tun.c
View file

@ -107,6 +107,9 @@ open_tun(const char *tun_device)
warn("open_tun: %s: %s", tun_name, strerror(errno)); warn("open_tun: %s: %s", tun_name, strerror(errno));
return -1; return -1;
} }
printf("Opened %s\n", tun_name);
return tun_fd;
} else { } else {
for (i = 0; i < TUN_MAX_TRY; i++) { for (i = 0; i < TUN_MAX_TRY; i++) {
snprintf(tun_name, sizeof(tun_name), "/dev/tun%d", i); snprintf(tun_name, sizeof(tun_name), "/dev/tun%d", i);
@ -139,10 +142,10 @@ close_tun(int tun_fd)
int int
write_tun(int tun_fd, char *data, int len) write_tun(int tun_fd, char *data, int len)
{ {
#ifdef FREEBSD #if defined (FREEBSD) || defined (DARWIN)
data += 4; data += 4;
len -= 4; len -= 4;
#else /* !FREEBSD */ #else /* !FREEBSD/DARWIN */
#ifdef LINUX #ifdef LINUX
data[0] = 0x00; data[0] = 0x00;
data[1] = 0x00; data[1] = 0x00;
@ -166,7 +169,7 @@ write_tun(int tun_fd, char *data, int len)
int int
read_tun(int tun_fd, char *buf, int len) read_tun(int tun_fd, char *buf, int len)
{ {
#ifdef FREEBSD #if defined (FREEBSD) || defined (DARWIN)
// FreeBSD has no header // FreeBSD has no header
return read(tun_fd, buf + 4, len - 4) + 4; return read(tun_fd, buf + 4, len - 4) + 4;
#else /* !FREEBSD */ #else /* !FREEBSD */