From: Roy Marples <roy@marples.name>
Date: Sat, 7 Jun 2008 00:10:15 +0000 (+0000)
Subject: Increase the default timeout to 30 seconds to allow 3 RFC conformant re-transmissions... 
X-Git-Tag: v4.0.2~295
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fedb3da0be34b47246d663e6ff55a7e0937515c0;p=thirdparty%2Fdhcpcd.git

Increase the default timeout to 30 seconds to allow 3 RFC conformant re-transmissions + 2 seconds grace.
---

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index 2e4fc69b..ed3fb41f 100644
--- a/dhcpcd.8.in
+++ b/dhcpcd.8.in
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 29, 2008
+.Dd Jun 07, 2008
 .Dt DHCPCD 8 SMM
 .Sh NAME
 .Nm dhcpcd
@@ -233,7 +233,7 @@ back on IPv4LL.
 .It Fl t , -timeout Ar seconds
 Timeout after
 .Ar seconds ,
-instead of the default 20.
+instead of the default 30.
 A setting of 0
 .Ar seconds
 causes
diff --git a/dhcpcd.conf.5.in b/dhcpcd.conf.5.in
index d7ecfd7c..6339d160 100644
--- a/dhcpcd.conf.5.in
+++ b/dhcpcd.conf.5.in
@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd May 20, 2008
+.Dd Jun 07, 2008
 .Dt DHCPCD.CONF 5 SMM
 .Sh NAME
 .Nm dhcpcd.conf
@@ -110,7 +110,7 @@ Use
 instead of the default
 .Pa @SCRIPT@ .
 .It Ic timeout Ar seconds
-The default timeout for waiting for a DHCP response is 20 seconds which may
+The default timeout for waiting for a DHCP response is 30 seconds which may
 be too long or too short and can be changed here.
 .It Ic userclass Ar string
 Tag the DHCP messages with the userclass.
diff --git a/dhcpcd.h b/dhcpcd.h
index 76fe30bd..bbdd2207 100644
--- a/dhcpcd.h
+++ b/dhcpcd.h
@@ -38,7 +38,7 @@
 
 #include "common.h"
 
-#define DEFAULT_TIMEOUT		20
+#define DEFAULT_TIMEOUT		30
 #define DEFAULT_LEASETIME	3600        /* 1 hour */
 
 #define CLASS_ID_MAX_LEN	48