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

Add option sync to command bind

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2018-06-07 16:56:43 +00:00
parent da350aff9c
commit 9c7f98a823
2 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mud

Submodule mud updated: 6ebda9368c...03be90b606

23
src/bind.c
View File

@@ -111,6 +111,7 @@ gt_bind(int argc, char **argv)
unsigned short peer_port = bind_port; unsigned short peer_port = bind_port;
const char *dev = NULL; const char *dev = NULL;
const char *keyfile = NULL; const char *keyfile = NULL;
unsigned long sync = 0;
struct argz toz[] = { struct argz toz[] = {
{NULL, "IPADDR", &peer_addr, argz_addr}, {NULL, "IPADDR", &peer_addr, argz_addr},
@@ -125,6 +126,7 @@ gt_bind(int argc, char **argv)
{"keyfile", "FILE", &keyfile, argz_str}, {"keyfile", "FILE", &keyfile, argz_str},
{"chacha", NULL, NULL, argz_option}, {"chacha", NULL, NULL, argz_option},
{"persist", NULL, NULL, argz_option}, {"persist", NULL, NULL, argz_option},
{"sync", "SECONDS", &sync, argz_time},
{NULL}}; {NULL}};
if (argz(bindz, argc, argv)) if (argz(bindz, argc, argv))
@@ -211,11 +213,19 @@ gt_bind(int argc, char **argv)
FD_SET(mud_fd, &rfds); FD_SET(mud_fd, &rfds);
FD_SET(ctl_fd, &rfds); FD_SET(ctl_fd, &rfds);
if (select(last_fd, &rfds, NULL, NULL, NULL) == -1) { struct timeval tv = {
if (errno != EBADF) .tv_sec = sync / 1000UL,
continue; };
perror("select");
return 1; const int ret = select(last_fd, &rfds, NULL, NULL, sync ? &tv : NULL);
if (ret == -1) {
if (errno == EBADF) {
perror("select");
return 1;
}
continue;
} }
mtu = gt_setup_mtu(mud, tun_name); mtu = gt_setup_mtu(mud, tun_name);
@@ -329,6 +339,9 @@ gt_bind(int argc, char **argv)
perror("tun_write"); perror("tun_write");
} }
} }
if (!ret)
mud_send(mud, NULL, 0, 0);
} }
if (gt_reload && tun_fd >= 0) { if (gt_reload && tun_fd >= 0) {