X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fevent.c;h=85b18f784c99ea740f7bb1bda622a5ca80dc53fe;hp=2fb65ec09f1239c88f7e654a1576f4c35a4c1f2f;hb=3fae14fae5a347823679ef694ab630b4991a201d;hpb=ab7c61b06f6c6e991225f2fcc32d02b8e1084aee

diff --git a/src/event.c b/src/event.c
index 2fb65ec0..85b18f78 100644
--- a/src/event.c
+++ b/src/event.c
@@ -28,100 +28,80 @@
 avl_tree_t *event_tree;
 extern time_t now;
 
-int id;
+static int id;
 
-static int event_compare(const event_t *a, const event_t *b)
-{
-	if(a->time > b->time)
+static int event_compare(const event_t *a, const event_t *b) {
+	if(a->time > b->time) {
 		return 1;
+	}
 
-	if(a->time < b->time)
+	if(a->time < b->time) {
 		return -1;
+	}
 
 	return a->id - b->id;
 }
 
-void init_events(void)
-{
-	cp();
-
+void init_events(void) {
 	event_tree = avl_alloc_tree((avl_compare_t) event_compare, (avl_action_t) free_event);
 }
 
-void exit_events(void)
-{
-	cp();
-
+void exit_events(void) {
 	avl_delete_tree(event_tree);
 }
 
-void expire_events(void)
-{
+void expire_events(void) {
 	avl_node_t *node;
 	event_t *event;
 	time_t diff;
 
 	/*
 	 * Make all events appear expired by substracting the difference between
-         * the expiration time of the last event and the current time.
+	 * the expiration time of the last event and the current time.
 	 */
 
-	cp();
-
-	if(!event_tree->tail)
+	if(!event_tree->tail) {
 		return;
+	}
 
 	event = event_tree->tail->data;
-	if(event->time < now)
+
+	if(event->time <= now) {
 		return;
+	}
+
+	diff = event->time - now;
 
-	diff = 1 + event->time - now;
-	
 	for(node = event_tree->head; node; node = node->next) {
 		event = node->data;
 		event->time -= diff;
 	}
 }
 
-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);
 }
 
-void event_del(event_t *event)
-{
-	cp();
-
+void event_del(event_t *event) {
 	avl_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) {
+		if(event->time <= now) {
 			avl_node_t *node = event_tree->head;
 			avl_unlink_node(event_tree, node);
 			free(node);
@@ -131,3 +111,11 @@ event_t *get_expired_event(void)
 
 	return NULL;
 }
+
+event_t *peek_next_event(void) {
+	if(event_tree->head) {
+		return event_tree->head->data;
+	}
+
+	return NULL;
+}