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

Add keepalive

Browse Source 
Signed-off-by: Adrien Gallouët <adrien@gallouet.fr>
This commit is contained in:
Adrien Gallouët
2020-01-03 15:28:27 +00:00
parent 53e7a7ba0a
commit 020b115171
1 changed files with 22 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
src/bind.c
View File

@@ -107,6 +107,7 @@ gt_bind(int argc, char **argv)
struct sockaddr_storage peer_addr = { 0 }; struct sockaddr_storage peer_addr = { 0 };
unsigned short bind_port = 5000; unsigned short bind_port = 5000;
unsigned short peer_port = bind_port; unsigned short peer_port = bind_port;
unsigned long long keepalive = 20000;
const char *dev = NULL; const char *dev = NULL;
const char *keyfile = NULL; const char *keyfile = NULL;
@@ -123,6 +124,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},
{"keepalive", "SECONDS", &keepalive, argz_time},
{NULL}}; {NULL}};
if (argz(bindz, argc, argv)) if (argz(bindz, argc, argv))
@@ -225,45 +227,30 @@ gt_bind(int argc, char **argv)
unsigned char buf[1500]; unsigned char buf[1500];
while (!gt_quit) { while (!gt_quit) {
if (tun_can_write) { if (tun_can_write) FD_CLR(tun_fd, &wfds); else FD_SET(tun_fd, &wfds);
FD_CLR(tun_fd, &wfds); if (mud_can_write) FD_CLR(mud_fd, &wfds); else FD_SET(mud_fd, &wfds);
} else { if (tun_can_read) FD_CLR(tun_fd, &rfds); else FD_SET(tun_fd, &rfds);
FD_SET(tun_fd, &wfds); if (mud_can_read) FD_CLR(mud_fd, &rfds); else FD_SET(mud_fd, &rfds);
}
if (mud_can_write) {
FD_CLR(mud_fd, &wfds);
} else {
FD_SET(mud_fd, &wfds);
}
if (tun_can_read) {
FD_CLR(tun_fd, &rfds);
} else {
FD_SET(tun_fd, &rfds);
}
if (mud_can_read) {
FD_CLR(mud_fd, &rfds);
} else {
FD_SET(mud_fd, &rfds);
}
FD_SET(ctl_fd, &rfds); FD_SET(ctl_fd, &rfds);
struct timeval tv = { struct timeval tv = {
.tv_usec = 100000, .tv_sec = keepalive,
}; };
if (mud_can_read && tun_can_write) { long send_wait = mud_send_wait(mud);
tv.tv_usec = 0;
} else if (tun_can_read && mud_can_write) { if (send_wait >= 0) {
long send_wait = mud_send_wait(mud); if (mud_can_read && tun_can_write) {
if (send_wait >= 0) tv.tv_sec = 0;
tv.tv_usec = send_wait * 1000; } else if (tun_can_read && mud_can_write) {
tv.tv_sec = 0;
if (send_wait > 0)
tv.tv_usec = 1000;
}
} }
const int ret = select(last_fd, &rfds, &wfds, NULL, &tv); const int ret = select(last_fd, &rfds, &wfds, NULL, send_wait < 0 ? NULL : &tv);
if (ret == -1) { if (ret == -1) {
if (errno == EBADF) { if (errno == EBADF) {
@@ -273,17 +260,10 @@ gt_bind(int argc, char **argv)
continue; continue;
} }
if (FD_ISSET(tun_fd, &rfds)) if (FD_ISSET(tun_fd, &rfds)) tun_can_read = 1;
tun_can_read = 1; if (FD_ISSET(tun_fd, &wfds)) tun_can_write = 1;
if (FD_ISSET(mud_fd, &rfds)) mud_can_read = 1;
if (FD_ISSET(tun_fd, &wfds)) if (FD_ISSET(mud_fd, &wfds)) mud_can_write = 1;
tun_can_write = 1;
if (FD_ISSET(mud_fd, &rfds))
mud_can_read = 1;
if (FD_ISSET(mud_fd, &wfds))
mud_can_write = 1;
mtu = gt_setup_mtu(mud, mtu, tun_name); mtu = gt_setup_mtu(mud, mtu, tun_name);