X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=650c512951ad4ad957942515d616ec50ab1a1378;hb=33f241d97852d7a171f1aaf1bda7f66356ff889e;hp=e866e3165ef19f3e3c29686365d024dff6e03e7f;hpb=ce8775000ab38229a78ecf3dc26bab008ca0f332;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index e866e316..650c5129 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -178,7 +178,7 @@ static void free_past_request(past_request_t *r) {
 static struct event past_request_event;
 
 bool seen_request(char *request) {
-	past_request_t *new, p = {0};
+	past_request_t *new, p = {NULL};
 
 	p.request = request;
 
@@ -195,7 +195,7 @@ bool seen_request(char *request) {
 	}
 }
 
-void age_past_requests(int fd, short events, void *data) {
+static void age_past_requests(int fd, short events, void *data) {
 	splay_node_t *node, *next;
 	past_request_t *p;
 	int left = 0, deleted = 0;
@@ -205,7 +205,7 @@ 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++;
@@ -228,5 +228,6 @@ void init_requests(void) {
 void exit_requests(void) {
 	splay_delete_tree(past_request_tree);
 
-	event_del(&past_request_event);
+	if(timeout_initialized(&past_request_event))
+		event_del(&past_request_event);
 }