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

diff --git a/src/net.c b/src/net.c
index a1ca9ab9..f9f6bd0a 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"
@@ -294,6 +293,50 @@ static void dummy(int a, short b, void *c)
 {
 }
 
+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;
+	
+	/* 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();
+}
+
 /*
   this is where it all happens...
 */
@@ -301,14 +344,16 @@ 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;
 
 	cp();
 
+	signal_set(&sighup_event, SIGHUP, sighup_handler, NULL);
+	signal_add(&sighup_event, NULL);
+
 	last_ping_check = now;
-	last_config_check = now;
 	
 	srand(now);
 
@@ -375,62 +420,14 @@ int main_loop(void)
 			}
 		}
 
-
-		while((event = get_expired_tevent())) {
-			event->handler(event->data);
-			free_tevent(event);
-		}
-
 		if(sigalrm) {
 			logger(LOG_INFO, _("Flushing event queue"));
-			flush_tevents();
+			// TODO: do this another way
 			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();
-		}
 	}
 
+	signal_del(&sighup_event);
+
 	return 0;
 }