X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=8cf4a765673b755a5d87dfd0a79ab272e63a4718;hb=c5325ffdd1c6749beaf842c272eb28ecd5a070b6;hp=11fbcb1ce4ff5b0414be47d35f8e0206e9b2b4f8;hpb=f417271ea1447589ea05901f54fbb0377e7afaf9;p=tinc

diff --git a/src/net.c b/src/net.c
index 11fbcb1c..8cf4a765 100644
--- a/src/net.c
+++ b/src/net.c
@@ -40,6 +40,7 @@
 int contradicting_add_edge = 0;
 int contradicting_del_edge = 0;
 static int sleeptime = 10;
+time_t last_config_check = 0;
 
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
@@ -263,7 +264,6 @@ int reload_configuration(void) {
 	splay_node_t *node, *next;
 	char *fname;
 	struct stat s;
-	static time_t last_config_check = 0;
 
 	/* Reread our own configuration file */
 
@@ -286,31 +286,6 @@ int reload_configuration(void) {
 
 	setup_myself_reloadable();
 
-	/* 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->status.control)
-			continue;
-		
-		if(c->outgoing) {
-			free(c->outgoing->name);
-			if(c->outgoing->ai)
-				freeaddrinfo(c->outgoing->ai);
-			free(c->outgoing);
-			c->outgoing = NULL;
-		}
-		
-		xasprintf(&fname, "%s" SLASH "hosts" SLASH "%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);
-
 	/* If StrictSubnet is set, expire deleted Subnets and read new ones in */
 
 	if(strictsubnets) {
@@ -387,6 +362,25 @@ int reload_configuration(void) {
 	
 	try_outgoing_connections();
 
+	/* 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->status.control)
+			continue;
+
+		xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, c->name);
+		if(stat(fname, &s) || s.st_mtime > last_config_check) {
+			fprintf(stderr, "ZOMG %ld > %ld\n", s.st_mtime, last_config_check);
+			terminate_connection(c, c->status.active);
+		}
+		free(fname);
+	}
+
+	last_config_check = time(NULL);
+
 	return 0;
 }