X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprotocol.c;h=b8b8104328073b38445f3c56001c4126f78da998;hb=74c89c1dc9b14436c79cdf49366d3e5c19862457;hp=e866e3165ef19f3e3c29686365d024dff6e03e7f;hpb=886a6f61a1f4cc48a77b42d10f34f9126377d904;p=tinc diff --git a/src/protocol.c b/src/protocol.c index e866e316..b8b81043 100644 --- a/src/protocol.c +++ b/src/protocol.c @@ -190,12 +190,13 @@ bool seen_request(char *request) { new->request = xstrdup(request); new->firstseen = time(NULL); splay_insert(past_request_tree, new); - event_add(&past_request_event, &(struct timeval){10, 0}); + past_request_event.time = time(NULL) + 10; + event_add(&past_request_event); return false; } } -void age_past_requests(int fd, short events, void *data) { +void age_past_requests(void *data) { splay_node_t *node, *next; past_request_t *p; int left = 0, deleted = 0; @@ -215,14 +216,18 @@ void age_past_requests(int fd, short events, void *data) { 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}); + if(left) { + past_request_event.time = time(NULL) + 10; + event_add(&past_request_event); + } } 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); + past_request_event.handler = age_past_requests; + past_request_event.time = time(NULL) + 10; + event_add(&past_request_event); } void exit_requests(void) {