Update copyright information.

[tinc] / src / event.c

diff --git a/src/event.c b/src/event.c
index 2396d47..8a63e12 100644 (file)
--- 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.4 2003/08/24 20:38:24 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -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;
                }
        }