Drop libevent and use our own event handling again.

[tinc] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 34c3f3b..bdc0378 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -165,7 +165,24 @@ static void free_past_request(past_request_t *r) {
        free(r);
 }
 
-static struct event past_request_event;
+static timeout_t past_request_timeout;
+
+static void age_past_requests(void *data) {
+       int left = 0, deleted = 0;
+
+       for splay_each(past_request_t, p, past_request_tree) {
+               if(p->firstseen + pinginterval <= now.tv_sec)
+                       splay_delete_node(past_request_tree, node), deleted++;
+               else
+                       left++;
+       }
+
+       if(left || deleted)
+               logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
+
+       if(left)
+               timeout_set(&past_request_timeout, &(struct timeval){10, rand() % 100000});
+}
 
 bool seen_request(const char *request) {
        past_request_t *new, p = {NULL};
@@ -180,39 +197,17 @@ bool seen_request(const char *request) {
                new->request = xstrdup(request);
                new->firstseen = time(NULL);
                splay_insert(past_request_tree, new);
-               event_add(&past_request_event, &(struct timeval){10, rand() % 100000});
+               timeout_add(&past_request_timeout, age_past_requests, NULL, &(struct timeval){10, rand() % 100000});
                return false;
        }
 }
 
-static void age_past_requests(int fd, short events, void *data) {
-       int left = 0, deleted = 0;
-       time_t now = time(NULL);
-
-       for splay_each(past_request_t, p, past_request_tree) {
-               if(p->firstseen + pinginterval <= now)
-                       splay_delete_node(past_request_tree, node), deleted++;
-               else
-                       left++;
-       }
-
-       if(left || deleted)
-               logger(DEBUG_SCARY_THINGS, LOG_DEBUG, "Aging past requests: deleted %d, left %d",
-                          deleted, left);
-
-       if(left)
-               event_add(&past_request_event, &(struct timeval){10, rand() % 100000});
-}
-
 void init_requests(void) {
        past_request_tree = splay_alloc_tree((splay_compare_t) past_request_compare, (splay_action_t) free_past_request);
-
-       timeout_set(&past_request_event, age_past_requests, NULL);
 }
 
 void exit_requests(void) {
        splay_delete_tree(past_request_tree);
 
-       if(timeout_initialized(&past_request_event))
-               event_del(&past_request_event);
+       timeout_del(&past_request_timeout);
 }