Configure minimum reconnect timeouts.

[tinc] / src / net_socket.c

diff --git a/src/net_socket.c b/src/net_socket.c
index 4beb665..948ce01 100644 (file)
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -1,7 +1,7 @@
 /*
     net_socket.c -- Handle various kinds of sockets.
     Copyright (C) 1998-2005 Ivo Timmermans,
-                  2000-2013 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2009      Florian Forster <octo@verplant.org>
 
@@ -40,6 +40,7 @@
 #endif
 
 int addressfamily = AF_UNSPEC;
+int mintimeout = 0;
 int maxtimeout = 900;
 int seconds_till_retry = 5;
 int udp_rcvbuf = 0;
@@ -240,8 +241,6 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
                option = 1;
                setsockopt(nfd, IPPROTO_IP, IP_DONTFRAGMENT, (void *)&option, sizeof(option));
        }
-#else
-#warning No way to disable IPv4 fragmentation
 #endif
 
 #if defined(SOL_IPV6) && defined(IPV6_MTU_DISCOVER) && defined(IPV6_PMTUDISC_DO)
@@ -254,8 +253,6 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
                option = 1;
                setsockopt(nfd, IPPROTO_IPV6, IPV6_DONTFRAG, (void *)&option, sizeof(option));
        }
-#else
-#warning No way to disable IPv6 fragmentation
 #endif
 
        if (!bind_to_interface(nfd)) {
@@ -277,6 +274,9 @@ int setup_vpn_in_socket(const sockaddr_t *sa) {
 void retry_outgoing(outgoing_t *outgoing) {
        outgoing->timeout += 5;
 
+       if(outgoing->timeout < mintimeout)
+               outgoing->timeout = mintimeout;
+
        if(outgoing->timeout > maxtimeout)
                outgoing->timeout = maxtimeout;