lagertonne/tinc
1
0
Fork 0
Code Issues Pull requests Projects Releases 6 Wiki Activity

Import Upstream version 1.0.23

Browse source
This commit is contained in:
Guus Sliepen 2019-08-26 13:44:44 +02:00
parent 8dab3abc97
commit 413f90b815
57 changed files with 1202 additions and 2498 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/net.c
View file

@ -134,7 +134,7 @@ static int build_fdset(fd_set *readset, fd_set *writeset) {
purge();
} else {
FD_SET(c->socket, readset);
if(c->outbuflen > 0)
if(c->outbuflen > 0 || c->status.connecting)
FD_SET(c->socket, writeset);
if(c->socket > max)
max = c->socket;
@ -212,6 +212,12 @@ void terminate_connection(connection_t *c, bool report) {
c->status.remove = false;
do_outgoing_connection(c);
}
#ifndef HAVE_MINGW
/* Clean up dead proxy processes */
while(waitpid(-1, NULL, WNOHANG) > 0);
#endif
}
/*
@ -308,7 +314,7 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
if(c->status.remove)
continue;
if(FD_ISSET(c->socket, readset)) {
if(FD_ISSET(c->socket, writeset)) {
if(c->status.connecting) {
c->status.connecting = false;
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
@ -325,14 +331,14 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
}
}
if(!receive_meta(c)) {
if(!flush_meta(c)) {
terminate_connection(c, c->status.active);
continue;
}
}
if(FD_ISSET(c->socket, writeset)) {
if(!flush_meta(c)) {
if(FD_ISSET(c->socket, readset)) {
if(!receive_meta(c)) {
terminate_connection(c, c->status.active);
continue;
}
@ -490,7 +496,8 @@ int main_loop(void) {
expire_events();
for(node = connection_tree->head; node; node = node->next) {
connection_t *c = node->data;
send_ping(c);
if(c->status.active)
send_ping(c);
}
sigalrm = false;
}