# HG changeset patch
# User Roy Marples <roy@marples.name>
# Date 1598957813 -3600
# Node ID d7cc41338b017ce61e49d5de7ca366098f9ba389
# Parent  f8d95f0027589081428d2d14d2949817e09fee4f
DHCP: Don't set address lifetimes when extending leases

Otherwise the kernel WILL remove them.
dhcpcd already manages address removal when needed because
some OS's do not support address lifetimes even for IPv6.

While here apply the same logic to IPv6.

diff -r f8d95f002758 -r d7cc41338b01 src/ipv4.c
--- a/src/ipv4.c	Mon Aug 31 06:51:27 2020 +0100
+++ b/src/ipv4.c	Tue Sep 01 11:56:53 2020 +0100
@@ -711,9 +711,18 @@
 {
 	struct dhcp_state *state;
 	struct ipv4_addr *ia;
+	uint32_t vltime, pltime;
+
+	if (ifp->options->options & DHCPCD_LASTLEASE_EXTEND) {
+		/* We don't want the kernel to expire the address. */
+		vltime = pltime = DHCP_INFINITE_LIFETIME;
+	} else {
+		vltime = lease->leasetime;
+		pltime = lease->rebindtime;
+	}
 
 	ia = ipv4_addaddr(ifp, &lease->addr, &lease->mask, &lease->brd,
-	    lease->leasetime, lease->rebindtime);
+	    vltime, pltime);
 	if (ia == NULL)
 		return -1;
 
diff -r f8d95f002758 -r d7cc41338b01 src/ipv6.c
--- a/src/ipv6.c	Mon Aug 31 06:51:27 2020 +0100
+++ b/src/ipv6.c	Tue Sep 01 11:56:53 2020 +0100
@@ -679,6 +679,14 @@
 	/* Adjust plftime and vltime based on acquired time */
 	pltime = ia->prefix_pltime;
 	vltime = ia->prefix_vltime;
+
+	if (ifp->options->options & DHCPCD_LASTLEASE_EXTEND) {
+		/* We don't want the kernel to expire the address.
+		 * The saved times will be re-applied to the ia
+		 * before exiting this function. */
+		ia->prefix_vltime = ia->prefix_pltime = ND6_INFINITE_LIFETIME;
+	}
+
 	if (timespecisset(&ia->acquired) &&
 	    (ia->prefix_pltime != ND6_INFINITE_LIFETIME ||
 	    ia->prefix_vltime != ND6_INFINITE_LIFETIME))