X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet_setup.c;h=121b989279bff7a810d316cc9737396bb33ff43e;hp=b11744354a438305d62048ad4da8250549f23f95;hb=09d60499af3acef2ba9bd7be15e8d1c44249f8d5;hpb=f61fd437ca36ff03cd669726894a09ae4e128427

diff --git a/src/net_setup.c b/src/net_setup.c
index b1174435..121b9892 100644
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -539,7 +539,12 @@ static bool setup_myself(void) {
 
 #if !defined(SOL_IP) || !defined(IP_TOS)
 	if(priorityinheritance)
-		logger(LOG_WARNING, "%s not supported on this platform", "PriorityInheritance");
+		logger(LOG_WARNING, "%s not supported on this platform for IPv4 connection", "PriorityInheritance");
+#endif
+
+#if !defined(IPPROTO_IPV6) || !defined(IPV6_TCLASS)
+	if(priorityinheritance)
+		logger(LOG_WARNING, "%s not supported on this platform for IPv6 connection", "PriorityInheritance");
 #endif
 
 	if(!get_config_int(lookup_config(config_tree, "MACExpire"), &macexpire))
@@ -553,6 +558,18 @@ static bool setup_myself(void) {
 	} else
 		maxtimeout = 900;
 
+	if(get_config_int(lookup_config(config_tree, "MinTimeout"), &mintimeout)) {
+			if(mintimeout < 0) {
+				logger(LOG_ERR, "Bogus minimum timeout!");
+				return false;
+			}
+			if(mintimeout > maxtimeout) {
+				logger(LOG_WARNING, "Minimum timeout (%d s) cannot be larger than maximum timeout (%d s). Correcting !", mintimeout, maxtimeout );
+				mintimeout=maxtimeout;
+			}
+		} else
+			mintimeout = 0;
+
 	if(get_config_int(lookup_config(config_tree, "UDPRcvBuf"), &udp_rcvbuf)) {
 		if(udp_rcvbuf <= 0) {
 			logger(LOG_ERR, "UDPRcvBuf cannot be negative!");
@@ -796,6 +813,10 @@ static bool setup_myself(void) {
 			hint.ai_protocol = IPPROTO_TCP;
 			hint.ai_flags = AI_PASSIVE;
 
+#ifdef HAVE_DECL_RES_INIT
+			// ensure glibc reloads /etc/resolv.conf.
+			res_init();
+#endif
 			err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
 			free(address);