X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;ds=sidebyside;f=src%2Fnet.c;h=8fe3c516c14d08646ffad222a4bce8edb116c5e0;hb=46a5aa0d674914f4220d8583b1b2f87c7f05a804;hp=0b43d5acfceec9480e8b0b4bab8b4bc518bc2a42;hpb=f3a2bed063d98961d0619ca318185740f8cf6f99;p=tinc

diff --git a/src/net.c b/src/net.c
index 0b43d5ac..8fe3c516 100644
--- a/src/net.c
+++ b/src/net.c
@@ -32,11 +32,14 @@
 #include "names.h"
 #include "net.h"
 #include "netutl.h"
-#include "process.h"
 #include "protocol.h"
 #include "subnet.h"
 #include "xalloc.h"
 
+#ifdef HAVE_RESOLV_H
+#include <resolv.h>
+#endif
+
 int contradicting_add_edge = 0;
 int contradicting_del_edge = 0;
 static int sleeptime = 10;
@@ -130,6 +133,12 @@ void terminate_connection(connection_t *c, bool report) {
 
 	if(outgoing)
 		do_outgoing_connection(outgoing);
+
+#ifndef HAVE_MINGW
+	/* Clean up dead proxy processes */
+
+	while(waitpid(-1, NULL, WNOHANG) > 0);
+#endif
 }
 
 /*
@@ -199,7 +208,7 @@ static void periodic_handler(void *data) {
 				nc++;
 		}
 
-		if(nc < autoconnect) {
+		if(nc < 3) {
 			/* Not enough active connections, try to add one.
 			   Choose a random node, if we don't have a connection to it,
 			   and we are not already trying to make one, create an
@@ -233,7 +242,7 @@ static void periodic_handler(void *data) {
 				}
 				break;
 			}
-		} else if(nc > autoconnect) {
+		} else if(nc > 3) {
 			/* Too many active connections, try to remove one.
 			   Choose a random outgoing connection to a node
 			   that has at least one other connection.
@@ -259,7 +268,7 @@ static void periodic_handler(void *data) {
 			}
 		}
 
-		if(nc >= autoconnect) {
+		if(nc >= 3) {
 			/* If we have enough active connections,
 			   remove any pending outgoing connections.
 			*/
@@ -298,11 +307,15 @@ static void sigterm_handler(void *data) {
 static void sighup_handler(void *data) {
 	logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum));
 	reopenlogger();
-	reload_configuration();
+	if(reload_configuration())
+		exit(1);
 }
 
 static void sigalrm_handler(void *data) {
 	logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s signal", strsignal(((signal_t *)data)->signum));
+#ifdef HAVE_DECL_RES_INIT
+	res_init();
+#endif
 	retry();
 }
 #endif
@@ -316,8 +329,7 @@ int reload_configuration(void) {
 	init_configuration(&config_tree);
 
 	if(!read_server_config()) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file, exitting.");
-		event_exit();
+		logger(DEBUG_ALWAYS, LOG_ERR, "Unable to reread configuration file.");
 		return EINVAL;
 	}
 
@@ -335,11 +347,14 @@ int reload_configuration(void) {
 
 	if(strictsubnets) {
 		for splay_each(subnet_t, subnet, subnet_tree)
-			subnet->expires = 1;
+			if (subnet->owner)
+				subnet->expires = 1;
 
 		load_all_subnets();
 
 		for splay_each(subnet_t, subnet, subnet_tree) {
+			if (!subnet->owner)
+				continue;
 			if(subnet->expires == 1) {
 				send_del_subnet(everyone, subnet);
 				if(subnet->owner->status.reachable)
@@ -453,7 +468,7 @@ int main_loop(void) {
 #endif
 
 	if(!event_loop()) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error while waiting for input: %s", strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error while waiting for input: %s", sockstrerror(sockerrno));
 		return 1;
 	}