From: Guus Sliepen Date: Thu, 17 May 2007 23:14:42 +0000 (+0000) Subject: Use libevent to age past requests. X-Git-Tag: release-1.1pre1~181 X-Git-Url: https://git.tinc-vpn.org/git/browse?a=commitdiff_plain;h=a530f94e7c4acd94d1cd568b384931eec6f60563;p=tinc Use libevent to age past requests. --- diff --git a/src/net.c b/src/net.c index b1b7a2f9..e09734cf 100644 --- a/src/net.c +++ b/src/net.c @@ -485,8 +485,6 @@ int main_loop(void) if(routing_mode == RMODE_SWITCH) age_subnets(); - age_past_requests(); - /* Should we regenerate our key? */ if(keyexpires < now) { diff --git a/src/protocol.c b/src/protocol.c index 2e93cff4..93f27514 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -195,19 +195,7 @@ static void free_past_request(past_request_t *r) free(r); } -void init_requests(void) -{ - cp(); - - past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request); -} - -void exit_requests(void) -{ - cp(); - - avl_delete_tree(past_request_tree); -} +static struct event past_request_event; bool seen_request(char *request) { @@ -225,11 +213,12 @@ bool seen_request(char *request) new->request = xstrdup(request); new->firstseen = now; avl_insert(past_request_tree, new); + event_add(&past_request_event, &(struct timeval){10, 0}); return false; } } -void age_past_requests(void) +void age_past_requests(int fd, short events, void *data) { avl_node_t *node, *next; past_request_t *p; @@ -250,4 +239,25 @@ void age_past_requests(void) if(left || deleted) ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Aging past requests: deleted %d, left %d"), deleted, left); + + if(left) + event_add(&past_request_event, &(struct timeval){10, 0}); +} + +void init_requests(void) +{ + cp(); + + past_request_tree = avl_alloc_tree((avl_compare_t) past_request_compare, (avl_action_t) free_past_request); + + timeout_set(&past_request_event, age_past_requests, NULL); +} + +void exit_requests(void) +{ + cp(); + + avl_delete_tree(past_request_tree); + + event_del(&past_request_event); } diff --git a/src/protocol.h b/src/protocol.h index 0664d4cf..ab4ed78d 100644 --- a/src/protocol.h +++ b/src/protocol.h @@ -79,7 +79,6 @@ extern bool check_id(const char *); extern void init_requests(void); extern void exit_requests(void); extern bool seen_request(char *); -extern void age_past_requests(void); /* Requests */