Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1
Conflicts: NEWS configure.in doc/tincd.8.in lib/pidfile.c lib/pidfile.h lib/xalloc.h lib/xmalloc.c src/conf.c src/conf.h src/connection.c src/connection.h src/event.c src/graph.c src/graph.h src/net.c src/net.h src/node.h src/openssl/crypto.c src/process.c src/protocol.c src/protocol_key.c src/route.c
This commit is contained in:
commit
33f241d978
34 changed files with 90 additions and 63 deletions
|
@ -205,7 +205,7 @@ static void age_past_requests(int fd, short events, void *data) {
|
|||
next = node->next;
|
||||
p = node->data;
|
||||
|
||||
if(p->firstseen + pinginterval < now)
|
||||
if(p->firstseen + pinginterval <= now)
|
||||
splay_delete_node(past_request_tree, node), deleted++;
|
||||
else
|
||||
left++;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue