Clean up resources in the test cases.

[meshlink] / src / protocol.c

diff --git a/src/protocol.c b/src/protocol.c
index 95f6aa39f49eda059094a615753ce417c33a43ed..92418f179c12165432d535a75031c7d9fc49e786 100644 (file)
--- a/src/protocol.c
+++ b/src/protocol.c
@@ -181,13 +181,15 @@ static void free_past_request(past_request_t *r) {
        free(r);
 }
 
+static const int request_timeout = 60;
+
 static void age_past_requests(event_loop_t *loop, void *data) {
        (void)data;
        meshlink_handle_t *mesh = loop->data;
        int left = 0, deleted = 0;
 
        for splay_each(past_request_t, p, mesh->past_request_tree) {
-               if(p->firstseen + mesh->pinginterval <= mesh->loop.now.tv_sec) {
+               if(p->firstseen + request_timeout <= mesh->loop.now.tv_sec) {
                        splay_delete_node(mesh->past_request_tree, node), deleted++;
                } else {
                        left++;
@@ -198,10 +200,11 @@ static void age_past_requests(event_loop_t *loop, void *data) {
                logger(mesh, MESHLINK_DEBUG, "Aging past requests: deleted %d, left %d", deleted, left);
        }
 
-       if(left)
+       if(left) {
                timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timeval) {
-               10, rand() % 100000
-       });
+                       10, rand() % 100000
+               });
+       }
 }
 
 bool seen_request(meshlink_handle_t *mesh, const char *request) {
@@ -214,16 +217,23 @@ bool seen_request(meshlink_handle_t *mesh, const char *request) {
                new = xmalloc(sizeof(*new));
                new->request = xstrdup(request);
                new->firstseen = mesh->loop.now.tv_sec;
+
+               if(!mesh->past_request_tree->head) {
+                       timeout_set(&mesh->loop, &mesh->past_request_timeout, &(struct timeval) {
+                               10, rand() % 100000
+                       });
+               }
+
                splay_insert(mesh->past_request_tree, new);
-               timeout_add(&mesh->loop, &mesh->past_request_timeout, age_past_requests, NULL, &(struct timeval) {
-                       10, rand() % 100000
-               });
                return false;
        }
 }
 
 void init_requests(meshlink_handle_t *mesh) {
        mesh->past_request_tree = splay_alloc_tree((splay_compare_t) past_request_compare, (splay_action_t) free_past_request);
+       timeout_add(&mesh->loop, &mesh->past_request_timeout, age_past_requests, NULL, &(struct timeval) {
+               0, 0
+       });
 }
 
 void exit_requests(meshlink_handle_t *mesh) {