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

diff --git a/src/net.c b/src/net.c
index a1ca9ab9..9681a7bb 100644
--- a/src/net.c
+++ b/src/net.c
@@ -29,7 +29,6 @@
 #include "conf.h"
 #include "connection.h"
 #include "device.h"
-#include "tevent.h"
 #include "graph.h"
 #include "logger.h"
 #include "meta.h"
@@ -37,15 +36,11 @@
 #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)
@@ -211,6 +206,7 @@ static void check_dead_connections(void)
 {
 	avl_node_t *node, *next;
 	connection_t *c;
+	time_t now = time(NULL);
 
 	cp();
 
@@ -246,16 +242,6 @@ static void check_dead_connections(void)
 				}
 			}
 		}
-
-		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);
-			}
-		}
 	}
 }
 
@@ -269,7 +255,6 @@ void handle_meta_connection_data(int fd, short events, void *data)
 		return;
 
 	if(c->status.connecting) {
-		c->status.connecting = false;
 		getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
 
 		if(!result)
@@ -278,6 +263,7 @@ void handle_meta_connection_data(int fd, short events, void *data)
 			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;
@@ -294,6 +280,115 @@ 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);
+}
+
+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;
+	}
+}
+
+static void sigusr1_handler(int signal, short events, void *data) {
+	logger(LOG_NOTICE, _("Got %s signal"), strsignal(signal));
+	dump_connections();
+}
+
+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);
+	}
+
+	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;
+
+	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);
+		}
+	}
+}
+
 /*
   this is where it all happens...
 */
@@ -301,23 +396,43 @@ int main_loop(void)
 {
 	struct timeval tv;
 	int r;
-	time_t last_ping_check, last_config_check;
-	tevent_t *event;
+	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();
 
-	last_ping_check = now;
-	last_config_check = now;
+	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 = time(NULL);
 	
-	srand(now);
+	srand(time(NULL));
 
 	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;
 
@@ -334,7 +449,6 @@ int main_loop(void)
 		}
 
 		r = event_loop(EVLOOP_ONCE);
-		now = time(NULL);
 		if(r < 0) {
 			logger(LOG_ERR, _("Error while waiting for input: %s"),
 				   strerror(errno));
@@ -346,91 +460,22 @@ int main_loop(void)
 		/* XXX: more libevent transition */
 		timeout_del(&timeout);
 
-		if(do_purge) {
-			purge();
-			do_purge = false;
-		}
-
 		/* Let's check if everybody is still alive */
 
-		if(last_ping_check + pingtimeout < now) {
+		if(last_ping_check + pingtimeout < time(NULL)) {
 			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;
-			}
-		}
-
-
-		while((event = get_expired_tevent())) {
-			event->handler(event->data);
-			free_tevent(event);
-		}
-
-		if(sigalrm) {
-			logger(LOG_INFO, _("Flushing event queue"));
-			flush_tevents();
-			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();
+			last_ping_check = time(NULL);
 		}
 	}
 
+	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;
 }