Ticket #13385: dhcp_test.patch

src/servers/net/DHCPClient.cpp

@@ -39 +39 @@
 #define DHCP_CLIENT_PORT    68
 #define DHCP_SERVER_PORT    67
 
-#define DEFAULT_TIMEOUT     4   // secs
+#define DEFAULT_TIMEOUT     1   // secs
 #define MAX_TIMEOUT         64  // secs
 
 #define MAX_RETRIES         5
@@ -489 +489 @@
 status_t
 DHCPClient::Initialize()
 {
+    bool old = fAssignedAddress == 0;
     fStatus = _Negotiate(fAssignedAddress == 0 ? INIT : INIT_REBOOT);
-    syslog(LOG_DEBUG, "%s: DHCP status = %s\n", Device(), strerror(fStatus));
+    syslog(LOG_DEBUG, "%s: DHCP status = %s %s\n", Device(), strerror(fStatus), old ? "reusing": "");
     return fStatus;
 }
 
@@ -901 +902 @@
     tries = 0;
 
     struct timeval value;
-    value.tv_sec = timeout;
-    value.tv_usec = rand() % 1000000;
+    value.tv_sec = 0;
+    value.tv_usec = 200000 + rand() % 200000;
     setsockopt(socket, SOL_SOCKET, SO_RCVTIMEO, &value, sizeof(value));
 }