From: Roy Marples <roy@marples.name>
Date: Sat, 27 Oct 2012 11:38:17 +0000 (+0000)
Subject: Show renew and rebind times when debugging is enabled.
X-Git-Tag: v5.99.3~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8c48758ad593189b3a5c63caa69a454ff3cecdf1;p=thirdparty%2Fdhcpcd.git

Show renew and rebind times when debugging is enabled.
Trying to help #259.
---

diff --git a/bind.c b/bind.c
index 889d99e8..30e639ac 100644
--- a/bind.c
+++ b/bind.c
@@ -223,6 +223,9 @@ bind_interface(void *arg)
 		add_timeout_sec(lease->renewaltime, start_renew, iface);
 		add_timeout_sec(lease->rebindtime, start_rebind, iface);
 		add_timeout_sec(lease->leasetime, start_expire, iface);
+		syslog(LOG_DEBUG,
+		    "%s: renew in %u seconds, rebind in %u seconds",
+		    iface->name, lease->renewaltime, lease->rebindtime);
 	}
 	ifo->options &= ~ DHCPCD_CSR_WARNED;
 	configure(iface);
diff --git a/dhcpcd.c b/dhcpcd.c
index cb473962..8fd3fdc9 100644
--- a/dhcpcd.c
+++ b/dhcpcd.c
@@ -1016,9 +1016,12 @@ void
 start_renew(void *arg)
 {
 	struct interface *iface = arg;
+	struct dhcp_lease *lease = &iface->state->lease;
 
 	syslog(LOG_INFO, "%s: renewing lease of %s",
-	    iface->name, inet_ntoa(iface->state->lease.addr));
+	    iface->name, inet_ntoa(lease->addr));
+	syslog(LOG_DEBUG, "%s: rebind in %u seconds",
+	   iface->name, lease->rebindtime - lease->renewaltime);
 	iface->state->state = DHS_RENEW;
 	iface->state->xid = dhcp_xid(iface);
 	send_renew(iface);
@@ -1028,9 +1031,12 @@ void
 start_rebind(void *arg)
 {
 	struct interface *iface = arg;
+	struct dhcp_lease *lease = &iface->state->lease;
 
 	syslog(LOG_ERR, "%s: failed to renew, attempting to rebind",
 	    iface->name);
+	syslog(LOG_DEBUG, "%s: expre in %u seconds",
+	   iface->name, lease->leasetime - lease->rebindtime);
 	iface->state->state = DHS_REBIND;
 	delete_timeout(send_renew, iface);
 	iface->state->lease.server.s_addr = 0;