X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fevent.c;h=359fa4285c532a0821127df80667531c20a468de;hp=acf2ffb7a90bf2874adbf88cfcd9156a543d85ca;hb=503c32eb0ef9d6329e931559082f4ddf6d487dc6;hpb=f75dcef72a81a337e847adf0bae54198894f65b9

diff --git a/src/event.c b/src/event.c
index acf2ffb7..359fa428 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1,7 +1,7 @@
 /*
     event.c -- event queue
-    Copyright (C) 2002 Guus Sliepen <guus@sliepen.eu.org>,
-                  2002 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2002-2007 Guus Sliepen <guus@tinc-vpn.org>,
+                  2002-2005 Ivo Timmermans
 
     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,28 +17,22 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: event.c,v 1.1.4.5 2002/09/09 21:24:31 guus Exp $
+    $Id$
 */
 
-#include "config.h"
-
-#include <stdlib.h>
-#include <xalloc.h>
-#include <string.h>
-#include <utils.h>
-#include <avl_tree.h>
-#include <time.h>
+#include "system.h"
 
+#include "avl_tree.h"
 #include "event.h"
-
-#include "system.h"
+#include "utils.h"
+#include "xalloc.h"
 
 avl_tree_t *event_tree;
 extern time_t now;
 
 int id;
 
-int event_compare(event_t * a, event_t * b)
+static int event_compare(const event_t *a, const event_t *b)
 {
 	if(a->time > b->time)
 		return 1;
@@ -53,7 +47,7 @@ void init_events(void)
 {
 	cp();
 
-	event_tree = avl_alloc_tree((avl_compare_t) event_compare, NULL);
+	event_tree = avl_alloc_tree((avl_compare_t) event_compare, (avl_action_t) free_event);
 }
 
 void exit_events(void)
@@ -63,21 +57,49 @@ void exit_events(void)
 	avl_delete_tree(event_tree);
 }
 
+void expire_events(void)
+{
+	avl_node_t *node;
+	event_t *event;
+	time_t diff;
+
+	/*
+	 * Make all events appear expired by substracting the difference between
+         * the expiration time of the last event and the current time.
+	 */
+
+	cp();
+
+	if(!event_tree->tail)
+		return;
+
+	event = event_tree->tail->data;
+	if(event->time < now)
+		return;
+
+	diff = 1 + event->time - now;
+	
+	for(node = event_tree->head; node; node = node->next) {
+		event = node->data;
+		event->time -= diff;
+	}
+}
+
 event_t *new_event(void)
 {
 	cp();
 
-	return (event_t *) xmalloc_and_zero(sizeof(event_t));
+	return xmalloc_and_zero(sizeof(event_t));
 }
 
-void free_event(event_t * event)
+void free_event(event_t *event)
 {
 	cp();
 
 	free(event);
 }
 
-void event_add(event_t * event)
+void event_add(event_t *event)
 {
 	cp();
 
@@ -85,7 +107,7 @@ void event_add(event_t * event)
 	avl_insert(event_tree, event);
 }
 
-void event_del(event_t * event)
+void event_del(event_t *event)
 {
 	cp();
 
@@ -99,10 +121,12 @@ event_t *get_expired_event(void)
 	cp();
 
 	if(event_tree->head) {
-		event = (event_t *) event_tree->head->data;
+		event = event_tree->head->data;
 
 		if(event->time < now) {
-			avl_delete(event_tree, event);
+			avl_node_t *node = event_tree->head;
+			avl_unlink_node(event_tree, node);
+			free(node);
 			return event;
 		}
 	}