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

diff --git a/dhcpcd.8.in b/dhcpcd.8.in
index 2e4fc69b000896c2a27c3443a5d0f17c67475b6c..ed3fb41f82527de41bab90f73ac68bb1250f844b 100644 (file)
--- 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 d7ecfd7c6ff9ca6ee6bef96424f9748345160c06..6339d16020d1b62c6d64d63130d70120fd6e34b7 100644 (file)
--- 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 76fe30bd3306b0da45946a1b00a97792e3b7e4ee..bbdd22076b8f02d85a85030ca0530722ef8eca97 100644 (file)
--- 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