Update THANKS and copyright information.

[tinc] / src / event.c

diff --git a/src/event.c b/src/event.c
index e7fbb88..5fee783 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -1,6 +1,6 @@
 /*
     event.c -- event queue
-    Copyright (C) 2002-2006 Guus Sliepen <guus@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
@@ -47,7 +47,7 @@ void init_events(void)
 {
        cp();
 
-       event_tree = avl_alloc_tree((avl_compare_t) event_compare, NULL);
+       event_tree = avl_alloc_tree((avl_compare_t) event_compare, (avl_action_t) free_event);
 }
 
 void exit_events(void)
@@ -57,6 +57,34 @@ void exit_events(void)
        avl_delete_tree(event_tree);
 }
 
+void expire_events(void)
+{
+       avl_node_t *node;
+       event_t *event;
+       time_t diff;
+
+       /*
+        * Make all events appear expired by substracting the difference between
+         * the expiration time of the last event and the current time.
+        */
+
+       cp();
+
+       if(!event_tree->tail)
+               return;
+
+       event = event_tree->tail->data;
+       if(event->time < now)
+               return;
+
+       diff = 1 + event->time - now;
+       
+       for(node = event_tree->head; node; node = node->next) {
+               event = node->data;
+               event->time -= diff;
+       }
+}
+
 event_t *new_event(void)
 {
        cp();
@@ -96,7 +124,9 @@ event_t *get_expired_event(void)
                event = event_tree->head->data;
 
                if(event->time < now) {
-                       event_del(event);
+                       avl_node_t *node = event_tree->head;
+                       avl_unlink_node(event_tree, node);
+                       free(node);
                        return event;
                }
        }