X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=0b43d5acfceec9480e8b0b4bab8b4bc518bc2a42;hb=f3a2bed063d98961d0619ca318185740f8cf6f99;hp=f34c8c632d207fcf34728d9706d1f18610f536fa;hpb=f5bb64b36ae0807cdd3f241f81a8e933065437f6;p=tinc

diff --git a/src/net.c b/src/net.c
index f34c8c63..0b43d5ac 100644
--- a/src/net.c
+++ b/src/net.c
@@ -1,7 +1,7 @@
 /*
     net.c -- most of the network code
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2012 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2011      Loïc Grenié <loic.grenie@gmail.com>
 
@@ -41,6 +41,8 @@ int contradicting_add_edge = 0;
 int contradicting_del_edge = 0;
 static int sleeptime = 10;
 time_t last_config_check = 0;
+static timeout_t pingtimer;
+static timeout_t periodictimer;
 
 /* Purge edges and subnets of unreachable nodes. Use carefully. */
 
@@ -224,7 +226,7 @@ static void periodic_handler(void *data) {
 
 				if(!found) {
 					logger(DEBUG_CONNECTIONS, LOG_INFO, "Autoconnecting to %s", n->name);
-					outgoing_t *outgoing = xmalloc_and_zero(sizeof *outgoing);
+					outgoing_t *outgoing = xzalloc(sizeof *outgoing);
 					outgoing->name = xstrdup(n->name);
 					list_insert_tail(outgoing_list, outgoing);
 					setup_outgoing_connection(outgoing);
@@ -281,29 +283,13 @@ static void periodic_handler(void *data) {
 }
 
 void handle_meta_connection_data(connection_t *c) {
-	int result;
-	socklen_t len = sizeof result;
-
-	if(c->status.connecting) {
-		c->status.connecting = false;
-
-		getsockopt(c->socket, SOL_SOCKET, SO_ERROR, &result, &len);
-
-		if(!result)
-			finish_connecting(c);
-		else {
-			logger(DEBUG_CONNECTIONS, LOG_DEBUG, "Error while connecting to %s (%s): %s", c->name, c->hostname, sockstrerror(result));
-			terminate_connection(c, false);
-			return;
-		}
-	}
-
 	if (!receive_meta(c)) {
 		terminate_connection(c, c->status.active);
 		return;
 	}
 }
 
+#ifndef HAVE_MINGW
 static void sigterm_handler(void *data) {
 	logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum));
 	event_exit();
@@ -319,9 +305,10 @@ static void sigalrm_handler(void *data) {
 	logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum));
 	retry();
 }
+#endif
 
 int reload_configuration(void) {
-	char *fname;
+	char *fname = NULL;
 
 	/* Reread our own configuration file */
 
@@ -421,30 +408,33 @@ int reload_configuration(void) {
 		free(fname);
 	}
 
-	last_config_check = time(NULL);
+	last_config_check = now.tv_sec;
 
 	return 0;
 }
 
 void retry(void) {
+	/* Reset the reconnection timers for all outgoing connections */
+	for list_each(outgoing_t, outgoing, outgoing_list) {
+		outgoing->timeout = 0;
+		if(outgoing->ev.cb)
+			timeout_set(&outgoing->ev, &(struct timeval){0, 0});
+	}
+
+	/* Check for outgoing connections that are in progress, and reset their ping timers */
 	for list_each(connection_t, c, connection_list) {
-		if(c->outgoing && !c->node) {
-			timeout_del(&c->outgoing->ev);
-			if(c->status.connecting)
-				close(c->socket);
-			c->outgoing->timeout = 0;
-			terminate_connection(c, c->status.active);
-		}
+		if(c->outgoing && !c->node)
+			c->last_ping_time = 0;
 	}
+
+	/* Kick the ping timeout handler */
+	timeout_set(&pingtimer, &(struct timeval){0, 0});
 }
 
 /*
   this is where it all happens...
 */
 int main_loop(void) {
-	timeout_t pingtimer = {{0}};
-	timeout_t periodictimer = {{0}};
-
 	timeout_add(&pingtimer, timeout_handler, &pingtimer, &(struct timeval){pingtimeout, rand() % 100000});
 	timeout_add(&periodictimer, periodic_handler, &periodictimer, &(struct timeval){pingtimeout, rand() % 100000});
 
@@ -469,9 +459,10 @@ int main_loop(void) {
 
 #ifndef HAVE_MINGW
 	signal_del(&sighup);
-	signal_del(&sigalrm);
-	signal_del(&sigquit);
 	signal_del(&sigterm);
+	signal_del(&sigquit);
+	signal_del(&sigint);
+	signal_del(&sigalrm);
 #endif
 
 	timeout_del(&periodictimer);