GitLab/ocserv
1
0
Fork 0
mirror of https://gitlab.com/openconnect/ocserv.git synced 2026-02-10 16:57:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

BSD patches for ocserv

Browse Source 
Iterate over tunXX devices, for BSDs that can't just open /dev/tun to
retrieve the "next available tun".

This is just copied with minor changes from openconnect/src/tun.c,

Signed-off-by: Stuart Henderson <stu@spacehopper.org>
This commit is contained in:
Stuart Henderson
2015-02-13 16:39:57 +00:00
committed by Nikos Mavrogiannopoulos
parent a2b947de6f
commit 2c0849c8a9
1 changed files with 43 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/tun.c
View File

@@ -321,9 +321,39 @@ static int set_network_info(main_server_st * s, struct proc_st *proc)
#include <ccan/hash/hash.h>
#ifndef __linux__
# ifdef SIOCIFCREATE
static int bsd_open_tun(char *tun_name)
{
int fd;
int s;
struct ifreq ifr;
fd = open(tun_name, O_RDWR);
if (fd == -1) {
s = socket(AF_INET, SOCK_DGRAM, 0);
if (s < 0)
return -1;
memset(&ifr, 0, sizeof(ifr));
strncpy(ifr.ifr_name, tun_name + 5, sizeof(ifr.ifr_name) - 1);
if (!ioctl(s, SIOCIFCREATE, &ifr))
fd = open(tun_name, O_RDWR);
close(s);
}
return fd;
}
# else
# define bsd_open_tun(tun_name) open(tun_name, O_RDWR)
# endif
#endif
int open_tun(main_server_st * s, struct proc_st *proc)
{
int tunfd, ret, e;
static char tun_name[80];
int unit_nr = 0;
struct ifreq ifr;
unsigned int t;
@@ -394,12 +424,20 @@ int open_tun(main_server_st * s, struct proc_st *proc)
}
#endif
#else /* freebsd */
tunfd = open("/dev/tun", O_RDWR);
tunfd = bsd_open_tun("/dev/tun");
if (tunfd < 0) {
int e = errno;
mslog(s, NULL, LOG_ERR, "Can't open /dev/tun: %s\n",
strerror(e));
return -1;
for (unit_nr = 0; unit_nr < 255; unit_nr++) {
sprintf(tun_name, "/dev/tun%d", unit_nr);
tunfd = bsd_open_tun(tun_name);
if (tunfd >= 0)
break;
}
if (tunfd < 0) {
int e = errno;
mslog(s, NULL, LOG_ERR, "Can't open /dev/tun: %s\n",
strerror(e));
return -1;
}
}
/* find device name */