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

diff --git a/src/event.c b/src/event.c
index 5cf8b48b..8a63e12d 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-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
@@ -57,6 +57,28 @@ 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();
@@ -96,7 +118,7 @@ event_t *get_expired_event(void)
 		event = event_tree->head->data;
 
 		if(event->time < now) {
-			avl_delete(event_tree, event);
+			event_del(event);
 			return event;
 		}
 	}