From: Roy Marples <roy@marples.name>
Date: Mon, 15 Jun 2020 11:52:55 +0000 (+0100)
Subject: DHCP6: Add requested addresses after freeing all state addresses
X-Git-Tag: v9.1.2~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b74b77390c06465d2f417342d3005a1dbedb2fb8;p=thirdparty%2Fdhcpcd.git

DHCP6: Add requested addresses after freeing all state addresses

Otherwise we don't request the correct prefix delegation length
for example....
---

diff --git a/src/dhcp6.c b/src/dhcp6.c
index 0e7743e3..70d56a81 100644
--- a/src/dhcp6.c
+++ b/src/dhcp6.c
@@ -1727,6 +1727,7 @@ dhcp6_fail(struct interface *ifp)
 		if (state->old != NULL)
 			script_runreason(ifp, "EXPIRE6");
 		dhcp_unlink(ifp->ctx, state->leasefile);
+		dhcp6_addrequestedaddrs(ifp);
 	}
 
 	if (!dhcp6_startdiscoinform(ifp)) {
@@ -2672,6 +2673,7 @@ ex:
 	free(state->new);
 	state->new = NULL;
 	state->new_len = 0;
+	dhcp6_addrequestedaddrs(ifp);
 	return bytes == 0 ? 0 : -1;
 }