From: Roy Marples <roy@marples.name>
Date: Sun, 9 Jun 2013 21:51:52 +0000 (+0000)
Subject: RFC 3633 says that IA_PD should send a rebind, but at like a
X-Git-Tag: v6.0.0~31
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=10b5d4d07dc255638c5c69f0ab7baf420491c452;p=thirdparty%2Fdhcpcd.git

RFC 3633 says that IA_PD should send a rebind, but at like a
confirm, so add a timeout to it to re-enter the discover phase.
---

diff --git a/dhcp6.c b/dhcp6.c
index 6e038ef1..b485da24 100644
--- a/dhcp6.c
+++ b/dhcp6.c
@@ -903,37 +903,6 @@ dhcp6_startrenew(void *arg)
 		dhcp6_sendrenew(ifp);
 }
 
-static void
-dhcp6_startrebind(void *arg)
-{
-	struct interface *ifp;
-	struct dhcp6_state *state;
-
-	ifp = arg;
-	eloop_timeout_delete(dhcp6_sendrenew, ifp);
-	state = D6_STATE(ifp);
-	if (state->state == DH6S_RENEW)
-		syslog(LOG_WARNING, "%s: failed to renew DHCPv6, rebinding",
-		    ifp->name);
-	state->state = DH6S_REBIND;
-	state->RTC = 0;
-	state->MRC = 0;
-
-	/* RFC 3633 section 12.1 */
-	if (ifp->options->ia_type == D6_OPTION_IA_PD) {
-	    state->IRT = CNF_TIMEOUT;
-	    state->MRT = CNF_MAX_RT;
-	} else {
-	    state->IRT = REB_TIMEOUT;
-	    state->MRT = REB_MAX_RT;
-	}
-
-	if (dhcp6_makemessage(ifp) == -1)
-		syslog(LOG_ERR, "%s: dhcp6_makemessage: %m", ifp->name);
-	else
-		dhcp6_sendrebind(ifp);
-}
-
 static void
 dhcp6_startdiscover(void *arg)
 {
@@ -971,7 +940,11 @@ dhcp6_failconfirm(void *arg)
 	struct interface *ifp;
 
 	ifp = arg;
-	syslog(LOG_ERR, "%s: failed to confirm prior address", ifp->name);
+	syslog(LOG_ERR,
+	    ifp->options->ia_type == D6_OPTION_IA_PD ?
+	    "%s: failed to rebind delegated prefix" :
+	    "%s: failed to confirm prior address",
+	    ifp->name);
 	/* Section 18.1.2 says that we SHOULD use the last known
 	 * IP address(s) and lifetimes if we didn't get a reply.
 	 * I disagree with this. */
@@ -993,6 +966,42 @@ dhcp6_failrequest(void *arg)
 	dhcp6_startdiscover(ifp);
 }
 
+static void
+dhcp6_startrebind(void *arg)
+{
+	struct interface *ifp;
+	struct dhcp6_state *state;
+
+	ifp = arg;
+	eloop_timeout_delete(dhcp6_sendrenew, ifp);
+	state = D6_STATE(ifp);
+	if (state->state == DH6S_RENEW)
+		syslog(LOG_WARNING, "%s: failed to renew DHCPv6, rebinding",
+		    ifp->name);
+	state->state = DH6S_REBIND;
+	state->RTC = 0;
+	state->MRC = 0;
+
+	/* RFC 3633 section 12.1 */
+	if (ifp->options->ia_type == D6_OPTION_IA_PD) {
+	    state->IRT = CNF_TIMEOUT;
+	    state->MRT = CNF_MAX_RT;
+	} else {
+	    state->IRT = REB_TIMEOUT;
+	    state->MRT = REB_MAX_RT;
+	}
+
+	if (dhcp6_makemessage(ifp) == -1)
+		syslog(LOG_ERR, "%s: dhcp6_makemessage: %m", ifp->name);
+	else
+		dhcp6_sendrebind(ifp);
+
+	/* RFC 3633 section 12.1 */
+	if (ifp->options->ia_type == D6_OPTION_IA_PD)
+		eloop_timeout_add_sec(CNF_MAX_RD, dhcp6_failconfirm, ifp);
+}
+
+
 static void
 dhcp6_startrequest(struct interface *ifp)
 {