X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=6ad9740fc1301003ca6aceae82b759a8e2b50d80;hb=ddc6a81a854023e38b563f213aa9a449ee91add8;hp=e6c13f4690833a07db9d0fed0a774c0f49f481f4;hpb=42e01abd54bd36ee84a45a2b646cfa27034de8d1;p=tinc

diff --git a/src/protocol.c b/src/protocol.c
index e6c13f46..6ad9740f 100644
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -1,7 +1,7 @@
 /*
     protocol.c -- handle the meta-protocol, basic functions
-    Copyright (C) 1999-2001 Ivo Timmermans <ivo@o2w.nl>,
-                  2000,2001 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans,
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: protocol.c,v 1.28.4.148 2003/11/17 15:30:17 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -195,19 +195,7 @@ static void free_past_request(past_request_t *r)
 	free(r);
 }
 
-void init_requests(void)
-{
-	cp();
-
-	past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request);
-}
-
-void exit_requests(void)
-{
-	cp();
-
-	avl_delete_tree(past_request_tree);
-}
+static struct event past_request_event;
 
 bool seen_request(char *request)
 {
@@ -223,17 +211,19 @@ bool seen_request(char *request)
 	} else {
 		new = xmalloc(sizeof(*new));
 		new->request = xstrdup(request);
-		new->firstseen = now;
+		new->firstseen = time(NULL);
 		avl_insert(past_request_tree, new);
+		event_add(&past_request_event, &(struct timeval){10, 0});
 		return false;
 	}
 }
 
-void age_past_requests(void)
+void age_past_requests(int fd, short events, void *data)
 {
 	avl_node_t *node, *next;
 	past_request_t *p;
 	int left = 0, deleted = 0;
+	time_t now = time(NULL);
 
 	cp();
 
@@ -241,7 +231,7 @@ void age_past_requests(void)
 		next = node->next;
 		p = node->data;
 
-		if(p->firstseen + pingtimeout < now)
+		if(p->firstseen + pinginterval < now)
 			avl_delete_node(past_request_tree, node), deleted++;
 		else
 			left++;
@@ -250,4 +240,25 @@ void age_past_requests(void)
 	if(left || deleted)
 		ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Aging past requests: deleted %d, left %d"),
 			   deleted, left);
+
+	if(left)
+		event_add(&past_request_event, &(struct timeval){10, 0});
+}
+
+void init_requests(void)
+{
+	cp();
+
+	past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request);
+
+	timeout_set(&past_request_event, age_past_requests, NULL);
+}
+
+void exit_requests(void)
+{
+	cp();
+
+	avl_delete_tree(past_request_tree);
+
+	event_del(&past_request_event);
 }