X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=57ac82429e6f97855799a3061c7912cbce4ce09d;hb=8852d4407d87cf5dcf2c212d352279015aa050c0;hp=31f1b0e4ca0f07d03585af74d1231b62331b91dd;hpb=1bb5a284fec8c538f8ba243d4f9b2e46f68cd7e8;p=tinc

diff --git a/src/net.c b/src/net.c
index 31f1b0e4..57ac8242 100644
--- a/src/net.c
+++ b/src/net.c
@@ -29,7 +29,6 @@
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
-#include "event.h"
 #include "graph.h"
 #include "logger.h"
 #include "meta.h"
@@ -37,11 +36,9 @@
 #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;
@@ -109,10 +106,10 @@ 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.
+  put all file descriptors into events
+  While we're at it, purge stuf that needs to be removed.
 */
-static int build_fdset(fd_set *readset, fd_set *writeset)
+static int build_fdset(void)
 {
 	avl_node_t *node, *next;
 	connection_t *c;
@@ -120,9 +117,6 @@ static int build_fdset(fd_set *readset, fd_set *writeset)
 
 	cp();
 
-	FD_ZERO(readset);
-	FD_ZERO(writeset);
-
 	for(node = connection_tree->head; node; node = next) {
 		next = node->next;
 		c = node->data;
@@ -131,29 +125,10 @@ static int build_fdset(fd_set *readset, fd_set *writeset)
 			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;
+	return 0;
 }
 
 /*
@@ -182,6 +157,8 @@ void terminate_connection(connection_t *c, bool report)
 	if(c->socket)
 		closesocket(c->socket);
 
+	event_del(&c->ev);
+
 	if(c->edge) {
 		if(report && !tunnelserver)
 			send_del_edge(broadcast, c->edge);
@@ -279,70 +256,147 @@ static void check_dead_connections(void)
 	}
 }
 
-/*
-  check all connections to see if anything
-  happened on their sockets
-*/
-static void check_network_activity(fd_set * readset, fd_set * writeset)
+void handle_meta_connection_data(int fd, short events, void *data)
 {
-	connection_t *c;
-	avl_node_t *node;
-	int result, i;
+	connection_t *c = data;
+	int result;
 	socklen_t len = sizeof(result);
-	vpn_packet_t packet;
 
-	cp();
+	if (c->status.remove)
+		return;
 
-	/* check input from kernel */
-	if(FD_ISSET(device_fd, readset)) {
-		if(read_packet(&packet))
-			route(myself, &packet);
+	if(c->status.connecting) {
+		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));
+			c->status.connecting = false;
+			closesocket(c->socket);
+			do_outgoing_connection(c);
+			return;
+		}
 	}
 
-	/* check meta connections */
-	for(node = connection_tree->head; node; node = node->next) {
-		c = node->data;
+	if (!receive_meta(c)) {
+		terminate_connection(c, c->status.active);
+		return;
+	}
+}
 
-		if(c->status.remove)
-			continue;
+static void dummy(int a, short b, void *c)
+{
+}
 
-		if(FD_ISSET(c->socket, readset)) {
-			if(c->status.connecting) {
-				c->status.connecting = false;
-				getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
+static void sigterm_handler(int signal, short events, void *data) {
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+	running = false;
+	event_loopexit(NULL);
+}
 
-				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;
-				}
-			}
+static void sigint_handler(int signal, short events, void *data) {
+	static int saved_debug_level = -1;
+
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+
+	if(saved_debug_level != -1) {
+		logger(LOG_NOTICE, _("Reverting to old debug level (%d)"),
+			saved_debug_level);
+		debug_level = saved_debug_level;
+		saved_debug_level = -1;
+	} else {
+		logger(LOG_NOTICE,
+			_("Temporarily setting debug level to 5.  Kill me with SIGINT again to go back to level %d."),
+			debug_level);
+		saved_debug_level = debug_level;
+		debug_level = 5;
+	}
+}
 
-			if(!receive_meta(c)) {
-				terminate_connection(c, c->status.active);
-				continue;
-			}
-		}
+static void sigusr1_handler(int signal, short events, void *data) {
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+	dump_connections();
+}
 
-		if(FD_ISSET(c->socket, writeset)) {
-			if(!flush_meta(c)) {
-				terminate_connection(c, c->status.active);
-				continue;
-			}
+static void sigusr2_handler(int signal, short events, void *data) {
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+	dump_device_stats();
+	dump_nodes();
+	dump_edges();
+	dump_subnets();
+}
+
+static void sigwinch_handler(int signal, short events, void *data) {
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+	purge();
+}
+
+static void sighup_handler(int signal, short events, void *data) {
+	connection_t *c;
+	avl_node_t *node;
+	char *fname;
+	struct stat s;
+	static time_t last_config_check = 0;
+	
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+
+	/* 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."));
+		event_loopexit(NULL);
+		return;
+	}
+
+	/* 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;
+		
+		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);
 	}
 
-	for(i = 0; i < listen_sockets; i++) {
-		if(FD_ISSET(listen_socket[i].udp, readset))
-			handle_incoming_vpn_data(listen_socket[i].udp);
+	last_config_check = time(NULL);
+
+	/* Try to make outgoing connections */
+	
+	try_outgoing_connections();
+}
+
+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;
 
-		if(FD_ISSET(listen_socket[i].tcp, readset))
-			handle_new_meta_connection(listen_socket[i].tcp);
+	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);
+		}
 	}
 }
 
@@ -351,17 +405,39 @@ static void check_network_activity(fd_set * readset, fd_set * writeset)
 */
 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 r;
+	time_t last_ping_check;
+	struct event timeout;
+	struct event sighup_event;
+	struct event sigint_event;
+	struct event sigterm_event;
+	struct event sigquit_event;
+	struct event sigusr1_event;
+	struct event sigusr2_event;
+	struct event sigwinch_event;
+	struct event sigalrm_event;
 
 	cp();
 
+	signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
+	signal_add(&sighup_event, NULL);
+	signal_set(&sigint_event, SIGINT, sigint_handler, NULL);
+	signal_add(&sigint_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);
+	signal_set(&sigusr1_event, SIGUSR1, sigusr1_handler, NULL);
+	signal_add(&sigusr1_event, NULL);
+	signal_set(&sigusr2_event, SIGUSR2, sigusr2_handler, NULL);
+	signal_add(&sigusr2_event, NULL);
+	signal_set(&sigwinch_event, SIGWINCH, sigwinch_handler, NULL);
+	signal_add(&sigwinch_event, NULL);
+	signal_set(&sigalrm_event, SIGALRM, sigalrm_handler, NULL);
+	signal_add(&sigalrm_event, NULL);
+
 	last_ping_check = now;
-	last_config_check = now;
-	last_graph_dump = now;
 	
 	srand(now);
 
@@ -374,40 +450,37 @@ int main_loop(void)
 		tv.tv_sec = 1;
 		tv.tv_usec = 0;
 
-		maxfd = build_fdset(&readset, &writeset);
-
-		r = select(maxfd + 1, &readset, &writeset, NULL, &tv);
+		/* XXX: libevent transition: old timeout code in this loop */
+		timeout_set(&timeout, dummy, NULL);
+		timeout_add(&timeout, &tv);
 
+		r = build_fdset();
 		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;
+			logger(LOG_ERR, _("Error building fdset: %s"), strerror(errno));
+			cp_trace();
+			dump_connections();
+			return 1;
 		}
 
-		check_network_activity(&readset, &writeset);
-
-		if(do_purge) {
-			purge();
-			do_purge = false;
+		r = event_loop(EVLOOP_ONCE);
+		now = time(NULL);
+		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 < 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) {
@@ -420,75 +493,16 @@ int main_loop(void)
 				keyexpires = now + keylifetime;
 			}
 		}
-
-
-		while((event = get_expired_event())) {
-			event->handler(event->data);
-			free_event(event);
-		}
-
-		if(sigalrm) {
-			logger(LOG_INFO, _("Flushing event queue"));
-
-			while(event_tree->head) {
-				event = event_tree->head->data;
-				event->handler(event->data);
-				event_del(event);
-			}
-			sigalrm = false;
-		}
-
-		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;
-				
-				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);
-			}
-
-			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;
-		}
 	}
 
+	signal_del(&sighup_event);
+	signal_del(&sigint_event);
+	signal_del(&sigterm_event);
+	signal_del(&sigquit_event);
+	signal_del(&sigusr1_event);
+	signal_del(&sigusr2_event);
+	signal_del(&sigwinch_event);
+	signal_del(&sigalrm_event);
+
 	return 0;
 }