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

Add buffer-size option

Browse Source
This commit is contained in:
angt
2015-11-17 21:19:16 +01:00
parent bfcf38f380
commit 9ff87109f9
1 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main.c
View File

@@ -580,6 +580,7 @@ int main (int argc, char **argv)
char *dev = PACKAGE_NAME; char *dev = PACKAGE_NAME;
char *keyfile = NULL; char *keyfile = NULL;
char *congestion = NULL; char *congestion = NULL;
long buffer_size = GT_BUFFER_SIZE;
int delay = 0; int delay = 0;
int multiqueue = 0; int multiqueue = 0;
int keepalive = 0; int keepalive = 0;
@@ -594,17 +595,18 @@ int main (int argc, char **argv)
#endif #endif
struct option opts[] = { struct option opts[] = {
{ "listener", &listener, option_flag }, { "listener", &listener, option_flag },
{ "host", &host, option_str }, { "host", &host, option_str },
{ "port", &port, option_str }, { "port", &port, option_str },
{ "dev", &dev, option_str }, { "dev", &dev, option_str },
{ "keyfile", &keyfile, option_str }, { "keyfile", &keyfile, option_str },
{ "congestion", &congestion, option_str }, { "congestion", &congestion, option_str },
{ "delay", &delay, option_flag }, { "delay", &delay, option_flag },
{ "multiqueue", &multiqueue, option_flag }, { "multiqueue", &multiqueue, option_flag },
{ "keepalive", &keepalive, option_flag }, { "keepalive", &keepalive, option_flag },
{ "debug", &debug, option_flag }, { "buffer-size", &buffer_size, option_long },
{ "version", &version, option_flag }, { "debug", &debug, option_flag },
{ "version", &version, option_flag },
{ NULL }, { NULL },
}; };
@@ -616,6 +618,11 @@ int main (int argc, char **argv)
return 0; return 0;
} }
if (buffer_size < 2048) {
buffer_size = 2048;
gt_log("buffer size must be greater than 2048!\n");
}
if (sodium_init()==-1) { if (sodium_init()==-1) {
gt_log("libsodium initialization has failed!\n"); gt_log("libsodium initialization has failed!\n");
return 1; return 1;
@@ -646,8 +653,8 @@ int main (int argc, char **argv)
fd_set_nonblock(tun.fd); fd_set_nonblock(tun.fd);
buffer_setup(&sock.write.buf, NULL, GT_BUFFER_SIZE); buffer_setup(&sock.write.buf, NULL, buffer_size);
buffer_setup(&sock.read.buf, NULL, GT_BUFFER_SIZE); buffer_setup(&sock.read.buf, NULL, buffer_size);
int fd = -1; int fd = -1;