X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=52e9bf88c35201a647b03b310bf896f16e8e0940;hp=ee18037be4cdf14ace6e99b213979445e330368e;hb=81f5713ab71944d51703653eab7f364fba0c482e;hpb=c08858baa91a00e38c0f5482dbb0817dbd0361f1

diff --git a/src/net.c b/src/net.c
index ee18037b..52e9bf88 100644
--- a/src/net.c
+++ b/src/net.c
@@ -17,7 +17,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: net.c,v 1.35.4.183 2003/01/17 00:37:18 guus Exp $
+    $Id: net.c,v 1.35.4.187 2003/07/06 17:15:25 guus Exp $
 */
 
 #include "config.h"
@@ -31,6 +31,7 @@
 #include <signal.h>
 #include <sys/time.h>
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <syslog.h>
 #include <unistd.h>
 #include <sys/ioctl.h>
@@ -73,10 +74,6 @@
 
 #include "system.h"
 
-#ifndef HAVE_RAND_PSEUDO_BYTES
-#define RAND_pseudo_bytes RAND_bytes
-#endif
-
 int do_purge = 0;
 int sighup = 0;
 int sigalrm = 0;
@@ -329,12 +326,13 @@ void main_loop(void)
 	fd_set fset;
 	struct timeval tv;
 	int r, maxfd;
-	time_t last_ping_check;
+	time_t last_ping_check, last_config_check;
 	event_t *event;
 
 	cp();
 
 	last_ping_check = now;
+	last_config_check = now;
 	srand(now);
 
 	for(;;) {
@@ -384,6 +382,7 @@ void main_loop(void)
 					syslog(LOG_INFO, _("Regenerating symmetric key"));
 
 				RAND_pseudo_bytes(myself->key, myself->keylength);
+				EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
 				send_key_changed(broadcast, myself);
 				keyexpires = now + keylifetime;
 			}
@@ -407,24 +406,47 @@ void main_loop(void)
 		}
 
 		if(sighup) {
+			connection_t *c;
+			avl_node_t *node;
+			char *fname;
+			struct stat s;
+			
 			sighup = 0;
-			close_network_connections();
-			exit_configuration(&config_tree);
-
-			syslog(LOG_INFO, _("Rereading configuration file and restarting in 5 seconds..."));
-			sleep(5);
+			
+			/* Reread our own configuration file */
 
+			exit_configuration(&config_tree);
 			init_configuration(&config_tree);
 
 			if(read_server_config()) {
-				syslog(LOG_ERR,
-					   _("Unable to reread configuration file, exitting."));
+				syslog(LOG_ERR, _("Unable to reread configuration file, exitting."));
 				exit(1);
 			}
 
-			if(setup_network_connections())
-				return;
+			/* Close connections to hosts that have a changed or deleted host config file */
+			
+			for(node = connection_tree->head; node; node = node->next) {
+				c = (connection_t *) node->data;
+				
+				if(c->outgoing) {
+					free(c->outgoing->name);
+					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();
+						
 			continue;
 		}
 	}