X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fnet.c;h=1487e8182b7dd928b1a55bfd8d476fa584bc613e;hb=4c30004cb6dc23616d7295b0ce631f066e7f1f82;hp=3d17d3cfeb60777c49d37c46541b844f899e1aa4;hpb=cc3c69c892b0dad9a6ece0a0f4ccd429a22fcbff;p=tinc

diff --git a/src/net.c b/src/net.c
index 3d17d3cf..1487e818 100644
--- a/src/net.c
+++ b/src/net.c
@@ -281,29 +281,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,6 +303,7 @@ 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;
@@ -421,7 +406,7 @@ int reload_configuration(void) {
 		free(fname);
 	}
 
-	last_config_check = time(NULL);
+	last_config_check = now.tv_sec;
 
 	return 0;
 }