From: Roy Marples <roy@marples.name>
Date: Sat, 26 Jun 2010 09:08:47 +0000 (+0000)
Subject: Wait an extra second per interface for IPv4LL timeout.
X-Git-Tag: v5.2.6~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5fab05edeab78a1126a18f72273baf8dbda3dd57;p=thirdparty%2Fdhcpcd.git

Wait an extra second per interface for IPv4LL timeout.
---

diff --git a/dhcpcd.c b/dhcpcd.c
index e89d1aa8..cb33929e 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -195,12 +195,16 @@ void
 handle_exit_timeout(_unused void *arg)
 {
 	int timeout;
+	struct interface *ifp;
 
 	syslog(LOG_ERR, "timed out");
 	if (!(options & DHCPCD_TIMEOUT_IPV4LL))
 		exit(EXIT_FAILURE);
 	options &= ~DHCPCD_TIMEOUT_IPV4LL;
 	timeout = (PROBE_NUM * PROBE_MAX) + PROBE_WAIT + 1;
+	/* Add an extra second per interface */
+	for (ifp = ifaces; ifp; ifp = ifp->next)
+		timeout++;
 	syslog(LOG_WARNING, "allowing %d seconds for IPv4LL timeout", timeout);
 	add_timeout_sec(timeout, handle_exit_timeout, NULL);
 }