As we now use times to trigger again instead of decreasing timers, ensure our lease fits. We may wish to revisit this again if we need decreasing timers once more.

1 files changed, 3 insertions, 3 deletions

diff --git a/dhcp.c b/dhcp.c
index 0aa13fa6..2658e89d 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -1252,15 +1252,15 @@ configure_env(char **env, const char *prefix, const struct dhcp_message *dhcp,
 void
 get_lease(struct dhcp_lease *lease, const struct dhcp_message *dhcp)
 {
-	time_t t;
+	struct timeval now;
 
 	lease->addr.s_addr = dhcp->yiaddr;
 	if (get_option_addr(&lease->net.s_addr, dhcp, DHO_SUBNETMASK) == -1)
 		lease->net.s_addr = get_netmask(dhcp->yiaddr);
 	if (get_option_uint32(&lease->leasetime, dhcp, DHO_LEASETIME) == 0) {
 		/* Ensure that we can use the lease */
-		t = 0;
-		if (t + (time_t)lease->leasetime < t)
+		get_monotonic(&now);
+		if (now.tv_sec + (time_t)lease->leasetime < now.tv_sec)
 			lease->leasetime = ~0U; /* Infinite lease */
 	} else
 		lease->leasetime = DEFAULT_LEASETIME;