Don't delete events in event_del(), none of them are allocated with event_new().

[tinc] / src / event.c

diff --git a/src/event.c b/src/event.c
index 2fb65ec..03efc67 100644 (file)
--- a/src/event.c
+++ b/src/event.c
@@ -20,18 +20,16 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "event.h"
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *event_tree;
-extern time_t now;
+splay_tree_t *event_tree;
 
 int id;
 
-static int event_compare(const event_t *a, const event_t *b)
-{
+static int event_compare(const event_t *a, const event_t *b) {
        if(a->time > b->time)
                return 1;
 
@@ -41,23 +39,16 @@ static int event_compare(const event_t *a, const event_t *b)
        return a->id - b->id;
 }
 
-void init_events(void)
-{
-       cp();
-
-       event_tree = avl_alloc_tree((avl_compare_t) event_compare, (avl_action_t) free_event);
+void init_events(void) {
+       event_tree = splay_alloc_tree((splay_compare_t) event_compare, NULL);
 }
 
-void exit_events(void)
-{
-       cp();
-
-       avl_delete_tree(event_tree);
+void exit_events(void) {
+       splay_delete_tree(event_tree);
 }
 
-void expire_events(void)
-{
-       avl_node_t *node;
+void expire_events(void) {
+       splay_node_t *node;
        event_t *event;
        time_t diff;
 
@@ -66,12 +57,12 @@ 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;
+       time_t now = time(NULL);
+
        if(event->time < now)
                return;
 
@@ -83,47 +74,32 @@ void expire_events(void)
        }
 }
 
-event_t *new_event(void)
-{
-       cp();
-
+event_t *new_event(void) {
        return xmalloc_and_zero(sizeof(event_t));
 }
 
-void free_event(event_t *event)
-{
-       cp();
-
+void free_event(event_t *event) {
        free(event);
 }
 
-void event_add(event_t *event)
-{
-       cp();
-
+void event_add(event_t *event) {
        event->id = ++id;
-       avl_insert(event_tree, event);
+       splay_insert(event_tree, event);
 }
 
-void event_del(event_t *event)
-{
-       cp();
-
-       avl_delete(event_tree, event);
+void event_del(event_t *event) {
+       splay_delete(event_tree, event);
 }
 
-event_t *get_expired_event(void)
-{
+event_t *get_expired_event(void) {
        event_t *event;
 
-       cp();
-
        if(event_tree->head) {
                event = event_tree->head->data;
 
-               if(event->time < now) {
-                       avl_node_t *node = event_tree->head;
-                       avl_unlink_node(event_tree, node);
+               if(event->time < time(NULL)) {
+                       splay_node_t *node = event_tree->head;
+                       splay_unlink_node(event_tree, node);
                        free(node);
                        return event;
                }