projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add description of IffOneQueue and MaxTimeout to the info manual.
[tinc]
/
src
/
net.c
diff --git
a/src/net.c
b/src/net.c
index
6979083
..
b2fe0de
100644
(file)
--- a/
src/net.c
+++ b/
src/net.c
@@
-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;
@@
-204,18
+204,14
@@
void terminate_connection(connection_t *c, bool report) {
}
}
}
}
+ free_connection_partially(c);
+
/* Check if this was our outgoing connection */
if(c->outgoing) {
/* Check if this was our outgoing connection */
if(c->outgoing) {
-
retry_outgoing(c->outgoing)
;
- c->outgoing = NULL;
+
c->status.remove = false
;
+ do_outgoing_connection(c);
}
}
-
- free(c->outbuf);
- c->outbuf = NULL;
- c->outbuflen = 0;
- c->outbufsize = 0;
- c->outbufstart = 0;
}
/*
}
/*
@@
-238,7
+234,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, 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) {
@@
-267,7
+263,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, 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);
}
@@
-290,9
+286,11
@@
static void check_network_activity(fd_set * readset, fd_set * writeset) {
/* check input from kernel */
if(device_fd >= 0 && FD_ISSET(device_fd, readset)) {
if(devops.read(&packet)) {
/* check input from kernel */
if(device_fd >= 0 && FD_ISSET(device_fd, readset)) {
if(devops.read(&packet)) {
- errors = 0;
- packet.priority = 0;
- route(myself, &packet);
+ if(packet.len) {
+ errors = 0;
+ packet.priority = 0;
+ route(myself, &packet);
+ }
} else {
usleep(errors * 50000);
errors++;
} else {
usleep(errors * 50000);
errors++;
@@
-310,7
+308,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);
@@
-327,14
+325,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;
}
@@
-492,7
+490,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;
}