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

Use a list to setup mud_bind()

Browse Source
This commit is contained in:
angt
2016-02-29 15:28:37 +00:00
parent e750c46665
commit a7fbf806fb
1 changed files with 29 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/main.c
View File

@@ -254,10 +254,9 @@ int main (int argc, char **argv)
{ {
gt_set_signal(); gt_set_signal();
char *host_bind = NULL; char *host = NULL;
char *host_bind2 = NULL;
char *host_peer = NULL;
char *port = "5000"; char *port = "5000";
char *bind_list = NULL;
char *dev = NULL; char *dev = NULL;
char *keyfile = NULL; char *keyfile = NULL;
char *statefile = NULL; char *statefile = NULL;
@@ -265,16 +264,14 @@ int main (int argc, char **argv)
gt.timeout = 5000; gt.timeout = 5000;
struct option opts[] = { struct option opts[] = {
{ "bind", &host_bind, option_str }, { "host", &host, option_str },
{ "bind2", &host_bind2, option_str },
{ "peer", &host_peer, option_str },
{ "port", &port, option_str }, { "port", &port, option_str },
{ "bind", &bind_list, option_str },
{ "dev", &dev, option_str }, { "dev", &dev, option_str },
{ "keyfile", &keyfile, option_str }, { "keyfile", &keyfile, option_str },
{ "multiqueue", NULL, option_option }, { "multiqueue", NULL, option_option },
{ "statefile", &statefile, option_str }, { "statefile", &statefile, option_str },
{ "timeout", &gt.timeout, option_long }, { "timeout", &gt.timeout, option_long },
{ "debug", NULL, option_option },
{ "version", NULL, option_option }, { "version", NULL, option_option },
{ NULL }, { NULL },
}; };
@@ -287,16 +284,9 @@ int main (int argc, char **argv)
return 0; return 0;
} }
int listener = 0; if (!option_is_set(opts, "keyfile")) {
int debug = option_is_set(opts, "debug"); gt_log("keyfile option must be set\n");
return 1;
if (!host_peer) {
listener = 1;
if (!option_is_set(opts, "keyfile")) {
gt_log("keyfile option must be set\n");
return 1;
}
} }
if (gt.timeout<=0 || gt.timeout>INT_MAX) { if (gt.timeout<=0 || gt.timeout>INT_MAX) {
@@ -336,17 +326,33 @@ int main (int argc, char **argv)
struct mud *mud = mud_create(ctx.skey, sizeof(ctx.skey)); struct mud *mud = mud_create(ctx.skey, sizeof(ctx.skey));
if (!mud) { if (!mud) {
gt_log("unable to create the mud !!!\n"); gt_log("couldn't create mud\n");
return 1; return 1;
} }
if (host_bind && mud_bind(mud, host_bind)) if (bind_list) {
return 1; char tmp[1024];
char *name = &tmp[0];
if (host_bind2 && mud_bind(mud, host_bind2)) size_t size = str_cpy(tmp, bind_list, sizeof(tmp)-1);
return 1;
if (host_peer && mud_peer(mud, host_peer, port)) for (size_t i=0; i<size; i++) {
if (tmp[i]!=',')
continue;
tmp[i] = 0;
if (mud_bind(mud, name))
return 1;
name = &tmp[i+1];
}
if (name[0] && mud_bind(mud, name))
return 1;
}
if (host && mud_peer(mud, host, port))
return 1; return 1;
int mud_fd = mud_get_fd(mud); int mud_fd = mud_get_fd(mud);