X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fevent.c;h=8a63e12d39fa4d598f8daef9b51016e3d87a9466;hb=67df7fb7e1c9eefe4bbc920fdc68b595ef28abd9;hp=4eae34d134ab3bbee86e130f3eb50b07f95ff125;hpb=e449d94caef963809d417f16497f6f978e10d731;p=tinc

diff --git a/src/event.c b/src/event.c
index 4eae34d1..8a63e12d 100644
--- a/src/event.c
+++ b/src/event.c
@@ -1,7 +1,7 @@
 /*
     event.c -- event queue
-    Copyright (C) 2002-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2002-2003 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,7 +17,7 @@
     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.9 2003/07/17 15:06:26 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -32,7 +32,7 @@ extern time_t now;
 
 int id;
 
-static 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;
@@ -57,11 +57,33 @@ void exit_events(void)
 	avl_delete_tree(event_tree);
 }
 
+void flush_events(void)
+{
+	avl_tree_t *to_flush;
+	event_t *event;
+
+	/*
+	 * Events can be inserted from event handlers, so only flush events
+	 * already in the priority queue.
+	 */
+
+	cp();
+
+	to_flush = event_tree;
+	init_events();
+	while (to_flush->head) {
+		event = to_flush->head->data;
+		event->handler(event->data);
+		avl_delete(to_flush, event);
+	}
+	avl_delete_tree(to_flush);
+}
+
 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)
@@ -93,10 +115,10 @@ 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);
+			event_del(event);
 			return event;
 		}
 	}