X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fevent.c;h=12232220a8914c7ec75b72207cb0ef7f0f0465db;hp=5cf8b48b4cc22d5865fe44c43e95c10c03c5589e;hb=92afeec172f1f8a9f8b0bfdb94311bf0405433bb;hpb=df3220a1549f992cbf4a9b6e67c1e67b69896c7d

diff --git a/src/event.c b/src/event.c
index 5cf8b48b..12232220 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1,7 +1,7 @@
 /*
     event.c -- event queue
-    Copyright (C) 2002-2005 Guus Sliepen <guus@tinc-vpn.org>,
-                  2002-2005 Ivo Timmermans <ivo@tinc-vpn.org>
+    Copyright (C) 2002-2009 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
@@ -13,11 +13,9 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id$
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
 #include "system.h"
@@ -30,76 +28,94 @@
 avl_tree_t *event_tree;
 extern time_t now;
 
-int id;
+static int id;
 
-static int event_compare(const event_t *a, const event_t *b)
-{
-	if(a->time > b->time)
+static int event_compare(const event_t *a, const event_t *b) {
+	if(a->time > b->time) {
 		return 1;
+	}
 
-	if(a->time < b->time)
+	if(a->time < b->time) {
 		return -1;
+	}
 
 	return a->id - b->id;
 }
 
-void init_events(void)
-{
-	cp();
-
-	event_tree = avl_alloc_tree((avl_compare_t) event_compare, NULL);
+void init_events(void) {
+	event_tree = avl_alloc_tree((avl_compare_t) event_compare, (avl_action_t) free_event);
 }
 
-void exit_events(void)
-{
-	cp();
-
+void exit_events(void) {
 	avl_delete_tree(event_tree);
 }
 
-event_t *new_event(void)
-{
-	cp();
+void expire_events(void) {
+	avl_node_t *node;
+	event_t *event;
+	time_t diff;
 
-	return xmalloc_and_zero(sizeof(event_t));
+	/*
+	 * Make all events appear expired by subtracting the difference between
+	 * the expiration time of the last event and the current time.
+	 */
+
+	if(!event_tree->tail) {
+		return;
+	}
+
+	event = event_tree->tail->data;
+
+	if(event->time <= now) {
+		return;
+	}
+
+	diff = event->time - now;
+
+	for(node = event_tree->head; node; node = node->next) {
+		event = node->data;
+		event->time -= diff;
+	}
 }
 
-void free_event(event_t *event)
-{
-	cp();
+event_t *new_event(void) {
+	return xmalloc_and_zero(sizeof(event_t));
+}
 
+void free_event(event_t *event) {
 	free(event);
 }
 
-void event_add(event_t *event)
-{
-	cp();
-
+void event_add(event_t *event) {
 	event->id = ++id;
 	avl_insert(event_tree, event);
 }
 
-void event_del(event_t *event)
-{
-	cp();
-
+void event_del(event_t *event) {
 	avl_delete(event_tree, event);
 }
 
-event_t *get_expired_event(void)
-{
+event_t *get_expired_event(void) {
 	event_t *event;
 
-	cp();
-
 	if(event_tree->head) {
 		event = event_tree->head->data;
 
-		if(event->time < now) {
-			avl_delete(event_tree, event);
+		if(event->time <= now) {
+			avl_node_t *node = event_tree->head;
+			avl_unlink_node(event_tree, node);
+			free(node);
 			return event;
 		}
 	}
 
 	return NULL;
 }
+
+event_t *peek_next_event(void) {
+	if(event_tree->head) {
+		return event_tree->head->data;
+	}
+
+	return NULL;
+}