X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet.c;h=9681a7bbdd1bfcc3686f4c5b010b20603c502a33;hb=ddc6a81a854023e38b563f213aa9a449ee91add8;hp=7513e3e5725c5aece365c50bae413f5fbb15c2bd;hpb=6d19ebd612e6387ba34419cce5cd4d5d861b9a9e;p=tinc

diff --git a/src/net.c b/src/net.c
index 7513e3e5..9681a7bb 100644
--- a/src/net.c
+++ b/src/net.c
@@ -36,14 +36,11 @@
 #include "netutl.h"
 #include "process.h"
 #include "protocol.h"
-#include "route.h"
 #include "subnet.h"
 #include "xalloc.h"
 
 volatile bool running = false;
 
-time_t now = 0;
-
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
 static void purge(void)
@@ -209,6 +206,7 @@ static void check_dead_connections(void)
 {
 	avl_node_t *node, *next;
 	connection_t *c;
+	time_t now = time(NULL);
 
 	cp();
 
@@ -244,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);
-			}
-		}
 	}
 }
 
@@ -267,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)
@@ -276,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;
@@ -381,6 +369,26 @@ static void sighup_handler(int signal, short events, void *data) {
 	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...
 */
@@ -397,6 +405,7 @@ int main_loop(void)
 	struct event sigusr1_event;
 	struct event sigusr2_event;
 	struct event sigwinch_event;
+	struct event sigalrm_event;
 
 	cp();
 
@@ -414,17 +423,16 @@ int main_loop(void)
 	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_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;
 
@@ -441,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));
@@ -455,32 +462,9 @@ int main_loop(void)
 
 		/* 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;
-			}
-		}
-
-		if(sigalrm) {
-			logger(LOG_INFO, _("Flushing event queue"));
-			// TODO: do this another way
-			sigalrm = false;
+			last_ping_check = time(NULL);
 		}
 	}
 
@@ -491,6 +475,7 @@ int main_loop(void)
 	signal_del(&sigusr1_event);
 	signal_del(&sigusr2_event);
 	signal_del(&sigwinch_event);
+	signal_del(&sigalrm_event);
 
 	return 0;
 }