Allow broadcast packets to be sent directly instead of via the MST.

[tinc] / src / event.c

diff --git a/src/event.c b/src/event.c
index 304360c..89ee022 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -28,7 +28,7 @@
 avl_tree_t *event_tree;
 extern time_t now;
 
-int id;
+static int id;
 
 static int event_compare(const event_t *a, const event_t *b) {
        if(a->time > b->time)
@@ -41,14 +41,10 @@ static int event_compare(const event_t *a, const event_t *b) {
 }
 
 void init_events(void) {
-       cp();
-
        event_tree = avl_alloc_tree((avl_compare_t) event_compare, (avl_action_t) free_event);
 }
 
 void exit_events(void) {
-       cp();
-
        avl_delete_tree(event_tree);
 }
 
@@ -62,16 +58,14 @@ void expire_events(void) {
          * 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)
+       if(event->time <= now)
                return;
 
-       diff = 1 + event->time - now;
+       diff = event->time - now;
        
        for(node = event_tree->head; node; node = node->next) {
                event = node->data;
@@ -80,39 +74,29 @@ void expire_events(void) {
 }
 
 event_t *new_event(void) {
-       cp();
-
        return xmalloc_and_zero(sizeof(event_t));
 }
 
 void free_event(event_t *event) {
-       cp();
-
        free(event);
 }
 
 void event_add(event_t *event) {
-       cp();
-
        event->id = ++id;
        avl_insert(event_tree, event);
 }
 
 void event_del(event_t *event) {
-       cp();
-
        avl_delete(event_tree, event);
 }
 
 event_t *get_expired_event(void) {
        event_t *event;
 
-       cp();
-
        if(event_tree->head) {
                event = event_tree->head->data;
 
-               if(event->time < now) {
+               if(event->time <= now) {
                        avl_node_t *node = event_tree->head;
                        avl_unlink_node(event_tree, node);
                        free(node);
@@ -122,3 +106,9 @@ event_t *get_expired_event(void) {
 
        return NULL;
 }
+
+event_t *peek_next_event(void) {
+       if (event_tree->head)
+               return event_tree->head->data;
+       return NULL;
+}