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

Make keepalive an option (and not a flag)

Browse Source
This commit is contained in:
angt
2015-11-17 23:48:55 +01:00
parent 25b62bf4c6
commit 7fc368cf3c
3 changed files with 35 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main.c
View File

@@ -626,7 +626,6 @@ int main (int argc, char **argv)
long buffer_size = GT_BUFFER_SIZE; long buffer_size = GT_BUFFER_SIZE;
int delay = 0; int delay = 0;
int multiqueue = 0; int multiqueue = 0;
int keepalive = 0;
long ka_count = -1; long ka_count = -1;
long ka_idle = -1; long ka_idle = -1;
long ka_interval = -1; long ka_interval = -1;
@@ -640,22 +639,26 @@ int main (int argc, char **argv)
} tcpinfo = {0}; } tcpinfo = {0};
#endif #endif
struct option ka_opts[] = {
{ "count", &ka_count, option_long },
{ "idle", &ka_idle, option_long },
{ "interval", &ka_interval, option_long },
{ NULL },
};
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", ka_opts, option_option },
{ "ka-count", &ka_count, option_long }, { "buffer-size", &buffer_size, option_long },
{ "ka-idle", &ka_idle, option_long }, { "debug", &debug, option_flag },
{ "ka-interval", &ka_interval, option_long }, { "version", &version, option_flag },
{ "buffer-size", &buffer_size, option_long },
{ "debug", &debug, option_flag },
{ "version", &version, option_flag },
{ NULL }, { NULL },
}; };
@@ -667,6 +670,8 @@ int main (int argc, char **argv)
return 0; return 0;
} }
int keepalive = option_is_set(opts, "keepalive");
if (buffer_size < 2048) { if (buffer_size < 2048) {
buffer_size = 2048; buffer_size = 2048;
gt_log("buffer size must be greater than 2048!\n"); gt_log("buffer size must be greater than 2048!\n");

12
src/option.c
View File

@@ -46,6 +46,18 @@ int option_long (void *data, int argc, char **argv)
return 1; return 1;
} }
int option_is_set (struct option *opts, const char *name)
{
for (int k=0; opts[k].name; k++) {
if (str_cmp(opts[k].name, name))
continue;
return opts[k].set;
}
return 0;
}
int option_option (void *data, int argc, char **argv) int option_option (void *data, int argc, char **argv)
{ {
struct option *opts = (struct option *)data; struct option *opts = (struct option *)data;

3
src/option.h
View File

@@ -12,4 +12,5 @@ int option_str (void *, int, char **);
int option_long (void *, int, char **); int option_long (void *, int, char **);
int option_option (void *, int, char **); int option_option (void *, int, char **);
int option (struct option *, int, char **); int option_is_set (struct option *, const char *);
int option (struct option *, int, char **);