X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=469f10fce94ae69827d640ec23365268a152e882;hb=fb0cfccf7dc2240b576011edcf74fd5b058916cb;hp=9681a7bbdd1bfcc3686f4c5b010b20603c502a33;hpb=ddc6a81a854023e38b563f213aa9a449ee91add8;p=tinc

diff --git a/src/net.c b/src/net.c
index 9681a7bb..469f10fc 100644
--- a/src/net.c
+++ b/src/net.c
@@ -25,7 +25,7 @@
 #include <openssl/rand.h>
 
 #include "utils.h"
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
@@ -39,13 +39,10 @@
 #include "subnet.h"
 #include "xalloc.h"
 
-volatile bool running = false;
-
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
-static void purge(void)
-{
-	avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
+static void purge(void) {
+	splay_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
 	node_t *n;
 	edge_t *e;
 	subnet_t *s;
@@ -107,9 +104,8 @@ static void purge(void)
   put all file descriptors into events
   While we're at it, purge stuf that needs to be removed.
 */
-static int build_fdset(void)
-{
-	avl_node_t *node, *next;
+static int build_fdset(void) {
+	splay_node_t *node, *next;
 	connection_t *c;
 	int i, max = 0;
 
@@ -136,8 +132,7 @@ static int build_fdset(void)
   - Check if we need to retry making an outgoing connection
   - Deactivate the host
 */
-void terminate_connection(connection_t *c, bool report)
-{
+void terminate_connection(connection_t *c, bool report) {
 	cp();
 
 	if(c->status.remove)
@@ -202,9 +197,8 @@ void terminate_connection(connection_t *c, bool report)
   end does not reply in time, we consider them dead
   and close the connection.
 */
-static void check_dead_connections(void)
-{
-	avl_node_t *node, *next;
+static void timeout_handler(int fd, short events, void *event) {
+	splay_node_t *node, *next;
 	connection_t *c;
 	time_t now = time(NULL);
 
@@ -243,10 +237,11 @@ static void check_dead_connections(void)
 			}
 		}
 	}
+
+	event_add(event, &(struct timeval){pingtimeout, 0});
 }
 
-void handle_meta_connection_data(int fd, short events, void *data)
-{
+void handle_meta_connection_data(int fd, short events, void *data) {
 	connection_t *c = data;
 	int result;
 	socklen_t len = sizeof(result);
@@ -276,13 +271,8 @@ void handle_meta_connection_data(int fd, short events, void *data)
 	}
 }
 
-static void dummy(int a, short b, void *c)
-{
-}
-
 static void sigterm_handler(int signal, short events, void *data) {
 	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
-	running = false;
 	event_loopexit(NULL);
 }
 
@@ -325,7 +315,7 @@ static void sigwinch_handler(int signal, short events, void *data) {
 
 static void sighup_handler(int signal, short events, void *data) {
 	connection_t *c;
-	avl_node_t *node;
+	splay_node_t *node;
 	char *fname;
 	struct stat s;
 	static time_t last_config_check = 0;
@@ -373,7 +363,7 @@ static void sigalrm_handler(int signal, short events, void *data) {
 	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
 
 	connection_t *c;
-	avl_node_t *node;
+	splay_node_t *node;
 
 	for(node = connection_tree->head; node; node = node->next) {
 		c = node->data;
@@ -392,12 +382,10 @@ static void sigalrm_handler(int signal, short events, void *data) {
 /*
   this is where it all happens...
 */
-int main_loop(void)
-{
+int main_loop(void) {
 	struct timeval tv;
 	int r;
-	time_t last_ping_check;
-	struct event timeout;
+	struct event timeout_event;
 	struct event sighup_event;
 	struct event sigint_event;
 	struct event sigterm_event;
@@ -409,6 +397,8 @@ int main_loop(void)
 
 	cp();
 
+	timeout_set(&timeout_event, timeout_handler, &timeout_event);
+	event_add(&timeout_event, &(struct timeval){pingtimeout, 0});
 	signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
 	signal_add(&sighup_event, NULL);
 	signal_set(&sigint_event, SIGINT, sigint_handler, NULL);
@@ -426,46 +416,9 @@ int main_loop(void)
 	signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL);
 	signal_add(&sigalrm_event, NULL);
 
-	last_ping_check = time(NULL);
-	
-	srand(time(NULL));
-
-	running = true;
-
-	while(running) {
-		tv.tv_sec = 1;
-		tv.tv_usec = 0;
-
-		/* XXX: libevent transition: old timeout code in this loop */
-		timeout_set(&timeout, dummy, NULL);
-		timeout_add(&timeout, &tv);
-
-		r = build_fdset();
-		if(r < 0) {
-			logger(LOG_ERR, _("Error building fdset: %s"), strerror(errno));
-			cp_trace();
-			dump_connections();
-			return 1;
-		}
-
-		r = event_loop(EVLOOP_ONCE);
-		if(r < 0) {
-			logger(LOG_ERR, _("Error while waiting for input: %s"),
-				   strerror(errno));
-			cp_trace();
-			dump_connections();
-			return 1;
-		}
-
-		/* XXX: more libevent transition */
-		timeout_del(&timeout);
-
-		/* Let's check if everybody is still alive */
-
-		if(last_ping_check + pingtimeout < time(NULL)) {
-			check_dead_connections();
-			last_ping_check = time(NULL);
-		}
+	if(event_loop(0) < 0) {
+		logger(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno));
+		return 1;
 	}
 
 	signal_del(&sighup_event);
@@ -476,6 +429,7 @@ int main_loop(void)
 	signal_del(&sigusr2_event);
 	signal_del(&sigwinch_event);
 	signal_del(&sigalrm_event);
+	event_del(&timeout_event);
 
 	return 0;
 }