Apply patch from Scott Lamb preventing an infinite loop when sending SIGALRM.

[oweals/tinc.git] / src / event.c

diff --git a/src/event.c b/src/event.c
index c58175a1e5f06da8fc815e8082c57ec726554863..c791205f477d2bcda0c8ed50c03b53e631fc57ea 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -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;
                }
        }