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

Add the multiqueue option

Browse Source
This commit is contained in:
angt
2015-11-09 12:33:35 +01:00
parent 55275038c3
commit a406fb6096
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
main.c
View File

@@ -268,7 +268,7 @@ static struct addrinfo *ai_create (const char *host, const char *port, int liste
} }
#ifdef __linux__ #ifdef __linux__
static int tun_create (char *name) static int tun_create (char *name, int multiqueue)
{ {
int fd = open("/dev/net/tun", O_RDWR); int fd = open("/dev/net/tun", O_RDWR);
@@ -281,6 +281,9 @@ static int tun_create (char *name)
.ifr_flags = IFF_TUN|IFF_NO_PI, .ifr_flags = IFF_TUN|IFF_NO_PI,
}; };
if (multiqueue)
ifr.ifr_flags |= IFF_MULTI_QUEUE;
str_cpy(ifr.ifr_name, name, IFNAMSIZ-1); str_cpy(ifr.ifr_name, name, IFNAMSIZ-1);
int ret = ioctl(fd, TUNSETIFF, &ifr); int ret = ioctl(fd, TUNSETIFF, &ifr);
@@ -295,10 +298,8 @@ static int tun_create (char *name)
return fd; return fd;
} }
#else #else
static int tun_create (char *name) static int tun_create (_unused_ char *name, _unused_ int mq)
{ {
(void) name;
for (unsigned dev_id = 0U; dev_id < 32U; dev_id++) { for (unsigned dev_id = 0U; dev_id < 32U; dev_id++) {
char dev_path[11U]; char dev_path[11U];
@@ -585,6 +586,7 @@ int main (int argc, char **argv)
char *keyfile = NULL; char *keyfile = NULL;
char *congestion = NULL; char *congestion = NULL;
int nodelay = 0; int nodelay = 0;
int multiqueue = 0;
int version = 0; int version = 0;
#ifdef TCP_INFO #ifdef TCP_INFO
@@ -602,6 +604,7 @@ int main (int argc, char **argv)
{ "keyfile", &keyfile, option_str }, { "keyfile", &keyfile, option_str },
{ "congestion", &congestion, option_str }, { "congestion", &congestion, option_str },
{ "nodelay", &nodelay, option_flag }, { "nodelay", &nodelay, option_flag },
{ "multiqueue", &multiqueue, option_flag },
{ "version", &version, option_flag }, { "version", &version, option_flag },
{ NULL }, { NULL },
}; };
@@ -637,7 +640,7 @@ int main (int argc, char **argv)
struct netio tun = { .fd = -1 }; struct netio tun = { .fd = -1 };
struct netio sock = { .fd = -1 }; struct netio sock = { .fd = -1 };
tun.fd = tun_create(dev); tun.fd = tun_create(dev, multiqueue);
if (tun.fd==-1) if (tun.fd==-1)
return 1; return 1;