From: Roy Marples <roy@marples.name>
Date: Fri, 5 May 2017 13:59:00 +0000 (+0100)
Subject: Apply the real D108 patch, my bad.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2aa39c9c95cdd7cf01b3b1b529f56e963f25614b;p=thirdparty%2Fdhcpcd.git

Apply the real D108 patch, my bad.
---

diff --git a/src/dhcp6.c b/src/dhcp6.c
index 264779ec..7d9b20a8 100644
--- a/src/dhcp6.c
+++ b/src/dhcp6.c
@@ -2039,7 +2039,7 @@ dhcp6_findia(struct interface *ifp, struct dhcp6_message *m, size_t l,
 	uint16_t nl;
 	uint8_t iaid[4];
 	char buf[sizeof(iaid) * 3];
-	struct ipv6_addr *ap, *nap;
+	struct ipv6_addr *ap;
 
 	if (l < sizeof(*m)) {
 		/* Should be impossible with guards at packet in
@@ -2162,30 +2162,58 @@ dhcp6_findia(struct interface *ifp, struct dhcp6_message *m, size_t l,
 		i++;
 	}
 
-	TAILQ_FOREACH_SAFE(ap, &state->addrs, next, nap) {
-		if (!(ap->flags & IPV6_AF_STALE))
-			continue;
-		if (ap->flags & IPV6_AF_REQUEST) {
-			ap->prefix_vltime = ap->prefix_pltime = 0;
-			eloop_q_timeout_delete(ifp->ctx->eloop,
-			    0, NULL, ap);
+	if (i == 0 && e)
+		return -1;
+	return i;
+}
+
+static void
+dhcp6_deprecateaddrs(struct ipv6_addrhead *addrs)
+{
+	struct ipv6_addr *ia, *ian;
+
+	TAILQ_FOREACH_SAFE(ia, addrs, next, ian) {
+		if (ia->flags & IPV6_AF_STALE) {
+			if (ia->prefix_vltime != 0)
+				logdebugx("%s: %s: became stale",
+				    ia->iface->name, ia->saddr);
+			ia->prefix_pltime = 0;
+		} else if (ia->prefix_vltime == 0)
+			loginfox("%s: %s: no valid lifetime",
+			    ia->iface->name, ia->saddr);
+		else
 			continue;
-		}
-		TAILQ_REMOVE(&state->addrs, ap, next);
-		if (ap->flags & IPV6_AF_DELEGATEDPFX) {
+
+		/* If we delegated from this prefix, deprecate or remove
+		 * the delegations. */
+		if (ia->flags & IPV6_AF_DELEGATEDPFX) {
 			struct ipv6_addr *da;
+			bool touched = false;
 
-			/* Deprecate delegated addresses. */
-			TAILQ_FOREACH(da, &ap->pd_pfxs, pd_next) {
-				da->prefix_pltime = 0;
+			TAILQ_FOREACH(da, &ia->pd_pfxs, pd_next) {
+				if (ia->prefix_vltime == 0) {
+					if (da->prefix_vltime != 0) {
+						da->prefix_vltime = 0;
+						touched = true;
+					}
+				} else if (da->prefix_pltime != 0) {
+					da->prefix_pltime = 0;
+					touched = true;
+				}
 			}
-			ipv6_addaddrs(&ap->pd_pfxs);
+			if (touched)
+				ipv6_addaddrs(&ia->pd_pfxs);
 		}
-		ipv6_freeaddr(ap);
+
+		if (ia->flags & IPV6_AF_REQUEST) {
+			ia->prefix_vltime = ia->prefix_pltime = 0;
+			eloop_q_timeout_delete(ia->iface->ctx->eloop,
+			    0, NULL, ia);
+			continue;
+		}
+		TAILQ_REMOVE(addrs, ia, next);
+		ipv6_freeaddr(ia);
 	}
-	if (i == 0 && e)
-		return -1;
-	return i;
 }
 
 static int
@@ -3176,6 +3204,7 @@ dhcp6_handledata(void *arg)
 			eloop_timeout_add_sec(ifp->ctx->eloop,
 			    (time_t)state->expire, dhcp6_startexpire, ifp);
 
+		dhcp6_deprecateaddrs(&state->addrs);
 		ipv6_addaddrs(&state->addrs);
 
 		if (state->state == DH6S_INFORMED)