From: Roy Marples <roy@marples.name>
Date: Tue, 1 Sep 2020 10:56:53 +0000 (+0100)
Subject: DHCP: Don't set address lifetimes when extending leases
X-Git-Tag: v9.2.0~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b581e67fe7065d45756ce0a54697ac9913767d75;p=thirdparty%2Fdhcpcd.git

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 --git a/src/ipv4.c b/src/ipv4.c
index c6a76ea3..0590eb0d 100644
--- a/src/ipv4.c
+++ b/src/ipv4.c
@@ -711,9 +711,18 @@ ipv4_daddaddr(struct interface *ifp, const struct dhcp_lease *lease)
 {
 	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 --git a/src/ipv6.c b/src/ipv6.c
index 1cd02bec..5442ebde 100644
--- a/src/ipv6.c
+++ b/src/ipv6.c
@@ -679,6 +679,14 @@ ipv6_addaddr1(struct ipv6_addr *ia, const struct timespec *now)
 	/* 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))