X-Git-Url: http://git.meshlink.io/?p=meshlink;a=blobdiff_plain;f=src%2Fnet.c;h=8ee782145cbd9b28a5d12734b50022db2dffd7ce;hp=0cdc72cc5ad8f150ad6520f20ef06d1847850098;hb=08aabbf9317806bc50a9a6693ca866c8936ce26b;hpb=43fa7283ac01f2ecc95381b519ef6b3342546f35

diff --git a/src/net.c b/src/net.c
index 0cdc72cc..8ee78214 100644
--- a/src/net.c
+++ b/src/net.c
@@ -25,11 +25,10 @@
 #include <openssl/rand.h>
 
 #include "utils.h"
-#include "avl_tree.h"
+#include "splay_tree.h"
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
-#include "event.h"
 #include "graph.h"
 #include "logger.h"
 #include "meta.h"
@@ -37,20 +36,13 @@
 #include "netutl.h"
 #include "process.h"
 #include "protocol.h"
-#include "route.h"
 #include "subnet.h"
 #include "xalloc.h"
 
-bool do_purge = false;
-volatile bool running = false;
-
-time_t now = 0;
-
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
-static void purge(void)
-{
-	avl_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
+void purge(void) {
+	splay_node_t *nnode, *nnext, *enode, *enext, *snode, *snext;
 	node_t *n;
 	edge_t *e;
 	subnet_t *s;
@@ -108,54 +100,6 @@ static void purge(void)
 	}
 }
 
-/*
-  put all file descriptors in an fd_set array
-  While we're at it, purge stuff that needs to be removed.
-*/
-static int build_fdset(fd_set *readset, fd_set *writeset)
-{
-	avl_node_t *node, *next;
-	connection_t *c;
-	int i, max = 0;
-
-	cp();
-
-	FD_ZERO(readset);
-	FD_ZERO(writeset);
-
-	for(node = connection_tree->head; node; node = next) {
-		next = node->next;
-		c = node->data;
-
-		if(c->status.remove) {
-			connection_del(c);
-			if(!connection_tree->head)
-				purge();
-		} else {
-			FD_SET(c->socket, readset);
-			if(c->outbuflen > 0)
-				FD_SET(c->socket, writeset);
-			if(c->socket > max)
-				max = c->socket;
-		}
-	}
-
-	for(i = 0; i < listen_sockets; i++) {
-		FD_SET(listen_socket[i].tcp, readset);
-		if(listen_socket[i].tcp > max)
-			max = listen_socket[i].tcp;
-		FD_SET(listen_socket[i].udp, readset);
-		if(listen_socket[i].udp > max)
-			max = listen_socket[i].udp;
-	}
-
-	FD_SET(device_fd, readset);
-	if(device_fd > max)
-		max = device_fd;
-	
-	return max;
-}
-
 /*
   Terminate a connection:
   - Close the socket
@@ -163,17 +107,12 @@ static int build_fdset(fd_set *readset, fd_set *writeset)
   - 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)
-		return;
-
 	ifdebug(CONNECTIONS) logger(LOG_NOTICE, _("Closing connection with %s (%s)"),
 			   c->name, c->hostname);
 
-	c->status.remove = true;
 	c->status.active = false;
 
 	if(c->node)
@@ -207,16 +146,10 @@ void terminate_connection(connection_t *c, bool report)
 
 	/* Check if this was our outgoing connection */
 
-	if(c->outgoing) {
+	if(c->outgoing)
 		retry_outgoing(c->outgoing);
-		c->outgoing = NULL;
-	}
 
-	free(c->outbuf);
-	c->outbuf = NULL;
-	c->outbuflen = 0;
-	c->outbufsize = 0;
-	c->outbufstart = 0;
+	connection_del(c);
 }
 
 /*
@@ -227,10 +160,10 @@ 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);
 
 	cp();
 
@@ -243,241 +176,162 @@ static void check_dead_connections(void)
 				if(c->status.pinged) {
 					ifdebug(CONNECTIONS) logger(LOG_INFO, _("%s (%s) didn't respond to PING in %ld seconds"),
 							   c->name, c->hostname, now - c->last_ping_time);
-					c->status.timeout = true;
 					terminate_connection(c, true);
+					continue;
 				} else if(c->last_ping_time + pinginterval < now) {
 					send_ping(c);
 				}
 			} else {
-				if(c->status.remove) {
-					logger(LOG_WARNING, _("Old connection_t for %s (%s) status %04x still lingering, deleting..."),
-						   c->name, c->hostname, c->status.value);
-					connection_del(c);
-					continue;
-				}
-				ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"),
-						   c->name, c->hostname);
 				if(c->status.connecting) {
+					ifdebug(CONNECTIONS)
+						logger(LOG_WARNING, _("Timeout while connecting to %s (%s)"), c->name, c->hostname);
 					c->status.connecting = false;
 					closesocket(c->socket);
 					do_outgoing_connection(c);
 				} else {
+					ifdebug(CONNECTIONS) logger(LOG_WARNING, _("Timeout from %s (%s) during authentication"), c->name, c->hostname);
 					terminate_connection(c, false);
+					continue;
 				}
 			}
 		}
+	}
 
-		if(c->outbuflen > 0 && c->last_flushed_time + pingtimeout < now) {
-			if(c->status.active) {
-				ifdebug(CONNECTIONS) logger(LOG_INFO,
-						_("%s (%s) could not flush for %ld seconds (%d bytes remaining)"),
-						c->name, c->hostname, now - c->last_flushed_time, c->outbuflen);
-				c->status.timeout = true;
-				terminate_connection(c, true);
-			}
+	event_add(event, &(struct timeval){pingtimeout, 0});
+}
+
+void handle_meta_connection_data(int fd, short events, void *data) {
+	connection_t *c = data;
+	int result;
+	socklen_t len = sizeof result;
+
+	if(c->status.connecting) {
+		c->status.connecting = false;
+
+		getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+
+		if(!result)
+			finish_connecting(c);
+		else {
+			ifdebug(CONNECTIONS) logger(LOG_DEBUG,
+					   _("Error while connecting to %s (%s): %s"),
+					   c->name, c->hostname, strerror(result));
+			closesocket(c->socket);
+			do_outgoing_connection(c);
+			return;
 		}
 	}
+
+	if (!receive_meta(c)) {
+		terminate_connection(c, c->status.active);
+		return;
+	}
 }
 
-/*
-  check all connections to see if anything
-  happened on their sockets
-*/
-static void check_network_activity(fd_set * readset, fd_set * writeset)
-{
+static void sigterm_handler(int signal, short events, void *data) {
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+	event_loopexit(NULL);
+}
+
+static void sighup_handler(int signal, short events, void *data) {
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+	reload_configuration();
+}
+
+int reload_configuration(void) {
 	connection_t *c;
-	avl_node_t *node;
-	int result, i;
-	socklen_t len = sizeof(result);
-	vpn_packet_t packet;
+	splay_node_t *node, *next;
+	char *fname;
+	struct stat s;
+	static time_t last_config_check = 0;
 
-	cp();
+	/* Reread our own configuration file */
 
-	/* check input from kernel */
-	if(FD_ISSET(device_fd, readset)) {
-		if(read_packet(&packet)) {
-			packet.priority = 0;
-			route(myself, &packet);
-		}
+	exit_configuration(&config_tree);
+	init_configuration(&config_tree);
+
+	if(!read_server_config()) {
+		logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
+		event_loopexit(NULL);
+		return EINVAL;
 	}
 
-	/* check meta connections */
-	for(node = connection_tree->head; node; node = node->next) {
+	/* Close connections to hosts that have a changed or deleted host config file */
+	
+	for(node = connection_tree->head; node; node = next) {
 		c = node->data;
+		next = node->next;
+		
+		if(c->outgoing) {
+			free(c->outgoing->name);
+			if(c->outgoing->ai)
+				freeaddrinfo(c->outgoing->ai);
+			free(c->outgoing);
+			c->outgoing = NULL;
+		}
+		
+		asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+		if(stat(fname, &s) || s.st_mtime > last_config_check)
+			terminate_connection(c, c->status.active);
+		free(fname);
+	}
 
-		if(c->status.remove)
-			continue;
+	last_config_check = time(NULL);
 
-		if(FD_ISSET(c->socket, readset)) {
-			if(c->status.connecting) {
-				c->status.connecting = false;
-				getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+	/* Try to make outgoing connections */
+	
+	try_outgoing_connections();
 
-				if(!result)
-					finish_connecting(c);
-				else {
-					ifdebug(CONNECTIONS) logger(LOG_DEBUG,
-							   _("Error while connecting to %s (%s): %s"),
-							   c->name, c->hostname, strerror(result));
-					closesocket(c->socket);
-					do_outgoing_connection(c);
-					continue;
-				}
-			}
+	return 0;
+}
 
-			if(!receive_meta(c)) {
-				terminate_connection(c, c->status.active);
-				continue;
-			}
-		}
+void retry(void) {
+	connection_t *c;
+	splay_node_t *node;
 
-		if(FD_ISSET(c->socket, writeset)) {
-			if(!flush_meta(c)) {
-				terminate_connection(c, c->status.active);
-				continue;
-			}
+	for(node = connection_tree->head; node; node = node->next) {
+		c = node->data;
+		
+		if(c->outgoing && !c->node) {
+			if(timeout_initialized(&c->outgoing->ev))
+				event_del(&c->outgoing->ev);
+			if(c->status.connecting)
+				close(c->socket);
+			c->outgoing->timeout = 0;
+			do_outgoing_connection(c);
 		}
 	}
-
-	for(i = 0; i < listen_sockets; i++) {
-		if(FD_ISSET(listen_socket[i].udp, readset))
-			handle_incoming_vpn_data(listen_socket[i].udp);
-
-		if(FD_ISSET(listen_socket[i].tcp, readset))
-			handle_new_meta_connection(listen_socket[i].tcp);
-	}
 }
 
 /*
   this is where it all happens...
 */
-int main_loop(void)
-{
-	fd_set readset, writeset;
-	struct timeval tv;
-	int r, maxfd;
-	time_t last_ping_check, last_config_check, last_graph_dump;
-	event_t *event;
+int main_loop(void) {
+	struct event timeout_event;
+	struct event sighup_event;
+	struct event sigterm_event;
+	struct event sigquit_event;
 
 	cp();
 
-	last_ping_check = now;
-	last_config_check = now;
-	last_graph_dump = now;
-	
-	srand(now);
-	srand48(now);
-
-	running = true;
-
-	while(running) {
-		now = time(NULL);
-
-	//	tv.tv_sec = 1 + (rand() & 7);	/* Approx. 5 seconds, randomized to prevent global synchronisation effects */
-		tv.tv_sec = 1;
-		tv.tv_usec = 0;
-
-		maxfd = build_fdset(&readset, &writeset);
-
-		r = select(maxfd + 1, &readset, &writeset, NULL, &tv);
-
-		if(r < 0) {
-			if(errno != EINTR && errno != EAGAIN) {
-				logger(LOG_ERR, _("Error while waiting for input: %s"),
-					   strerror(errno));
-				cp_trace();
-				dump_connections();
-				return 1;
-			}
-
-			continue;
-		}
-
-		check_network_activity(&readset, &writeset);
-
-		if(do_purge) {
-			purge();
-			do_purge = false;
-		}
-
-		/* Let's check if everybody is still alive */
-
-		if(last_ping_check + pingtimeout < now) {
-			check_dead_connections();
-			last_ping_check = now;
-
-			if(routing_mode == RMODE_SWITCH)
-				age_subnets();
-
-			age_past_requests();
-
-			/* Should we regenerate our key? */
-
-			if(keyexpires < now) {
-				ifdebug(STATUS) logger(LOG_INFO, _("Regenerating symmetric key"));
-
-				RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength);
-				if(myself->cipher)
-					EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, (unsigned char *)myself->key, (unsigned char *)myself->key + myself->cipher->key_len);
-				send_key_changed(broadcast, myself);
-				keyexpires = now + keylifetime;
-			}
-		}
-
-		if(sigalrm) {
-			logger(LOG_INFO, _("Flushing event queue"));
-			expire_events();
-			sigalrm = false;
-		}
-
-		while((event = get_expired_event())) {
-			event->handler(event->data);
-			free_event(event);
-		}
-
-		if(sighup) {
-			connection_t *c;
-			avl_node_t *node;
-			char *fname;
-			struct stat s;
-			
-			sighup = false;
-			
-			/* Reread our own configuration file */
-
-			exit_configuration(&config_tree);
-			init_configuration(&config_tree);
-
-			if(!read_server_config()) {
-				logger(LOG_ERR, _("Unable to reread configuration file, exitting."));
-				return 1;
-			}
-
-			/* Close connections to hosts that have a changed or deleted host config file */
-			
-			for(node = connection_tree->head; node; node = node->next) {
-				c = node->data;
-				
-				asprintf(&fname, "%s/hosts/%s", confbase, c->name);
-				if(stat(fname, &s) || s.st_mtime > last_config_check)
-					terminate_connection(c, c->status.active);
-				free(fname);
-			}
-
-			last_config_check = now;
-
-			/* Try to make outgoing connections */
-			
-			try_outgoing_connections();
-		}
-		
-		/* Dump graph if wanted every 60 seconds*/
-
-		if(last_graph_dump + 60 < now) {
-			dump_graph();
-			last_graph_dump = now;
-		}
+	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(&sigterm_event, SIGTERM, sigterm_handler, NULL);
+	signal_add(&sigterm_event, NULL);
+	signal_set(&sigquit_event, SIGQUIT, sigterm_handler, NULL);
+	signal_add(&sigquit_event, NULL);
+
+	if(event_loop(0) < 0) {
+		logger(LOG_ERR, _("Error while waiting for input: %s"), strerror(errno));
+		return 1;
 	}
 
+	signal_del(&sighup_event);
+	signal_del(&sigterm_event);
+	signal_del(&sigquit_event);
+	event_del(&timeout_event);
+
 	return 0;
 }