projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Don't forget about outgoing connections on host file read errors.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
9799fea
..
b82dae8
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-1,7
+1,7
@@
/*
net.c -- most of the network code
Copyright (C) 1998-2005 Ivo Timmermans,
/*
net.c -- most of the network code
Copyright (C) 1998-2005 Ivo Timmermans,
- 2000-201
2
Guus Sliepen <guus@tinc-vpn.org>
+ 2000-201
5
Guus Sliepen <guus@tinc-vpn.org>
2006 Scott Lamb <slamb@slamb.org>
2011 Loïc Grenié <loic.grenie@gmail.com>
2006 Scott Lamb <slamb@slamb.org>
2011 Loïc Grenié <loic.grenie@gmail.com>
@@
-134,7
+134,7
@@
static int build_fdset(fd_set *readset, fd_set *writeset) {
purge();
} else {
FD_SET(c->socket, readset);
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;
FD_SET(c->socket, writeset);
if(c->socket > max)
max = c->socket;
@@
-182,6
+182,12
@@
void terminate_connection(connection_t *c, bool report) {
closesocket(c->socket);
if(c->edge) {
closesocket(c->socket);
if(c->edge) {
+ if(!c->node) {
+ logger(LOG_ERR, "Connection to %s (%s) has an edge but node is NULL!", c->name, c->hostname);
+ // And that should never happen.
+ abort();
+ }
+
if(report && !tunnelserver)
send_del_edge(everyone, c->edge);
if(report && !tunnelserver)
send_del_edge(everyone, c->edge);
@@
-212,6
+218,12
@@
void terminate_connection(connection_t *c, bool report) {
c->status.remove = false;
do_outgoing_connection(c);
}
c->status.remove = false;
do_outgoing_connection(c);
}
+
+#ifndef HAVE_MINGW
+ /* Clean up dead proxy processes */
+
+ while(waitpid(-1, NULL, WNOHANG) > 0);
+#endif
}
/*
}
/*
@@
-234,7
+246,7
@@
static void check_dead_connections(void) {
if(c->status.active) {
if(c->status.pinged) {
ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds",
if(c->status.active) {
if(c->status.pinged) {
ifdebug(CONNECTIONS) logger(LOG_INFO, "%s (%s) didn't respond to PING in %ld seconds",
- c->name, c->hostname, (long)
now - c->last_ping_time
);
+ c->name, c->hostname, (long)
(now - c->last_ping_time)
);
c->status.timeout = true;
terminate_connection(c, true);
} else if(c->last_ping_time + pinginterval <= now) {
c->status.timeout = true;
terminate_connection(c, true);
} else if(c->last_ping_time + pinginterval <= now) {
@@
-263,7
+275,7
@@
static void check_dead_connections(void) {
if(c->status.active) {
ifdebug(CONNECTIONS) logger(LOG_INFO,
"%s (%s) could not flush for %ld seconds (%d bytes remaining)",
if(c->status.active) {
ifdebug(CONNECTIONS) logger(LOG_INFO,
"%s (%s) could not flush for %ld seconds (%d bytes remaining)",
- c->name, c->hostname, (long)
now - c->last_flushed_time
, c->outbuflen);
+ c->name, c->hostname, (long)
(now - c->last_flushed_time)
, c->outbuflen);
c->status.timeout = true;
terminate_connection(c, true);
}
c->status.timeout = true;
terminate_connection(c, true);
}
@@
-308,7
+320,7
@@
static void check_network_activity(fd_set * readset, fd_set * writeset) {
if(c->status.remove)
continue;
if(c->status.remove)
continue;
- if(FD_ISSET(c->socket,
read
set)) {
+ if(FD_ISSET(c->socket,
write
set)) {
if(c->status.connecting) {
c->status.connecting = false;
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
if(c->status.connecting) {
c->status.connecting = false;
getsockopt(c->socket, SOL_SOCKET, SO_ERROR, (void *)&result, &len);
@@
-325,14
+337,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;
}
}
terminate_connection(c, c->status.active);
continue;
}
}
- if(FD_ISSET(c->socket,
write
set)) {
- if(!
flush
_meta(c)) {
+ if(FD_ISSET(c->socket,
read
set)) {
+ if(!
receive
_meta(c)) {
terminate_connection(c, c->status.active);
continue;
}
terminate_connection(c, c->status.active);
continue;
}
@@
-490,7
+502,8
@@
int main_loop(void) {
expire_events();
for(node = connection_tree->head; node; node = node->next) {
connection_t *c = node->data;
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;
}
}
sigalrm = false;
}