/*
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
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"
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)
{
} 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();
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++;
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);
}