From: Roy Marples <roy@marples.name>
Date: Fri, 31 Jan 2014 12:41:30 +0000 (+0000)
Subject: Force renew now works when we are in the informed state.
X-Git-Tag: v6.3.0~72
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b76d721651661b671a03e0def97afc5b7bad30db;p=thirdparty%2Fdhcpcd.git

Force renew now works when we are in the informed state.
---

diff --git a/dhcp.c b/dhcp.c
index 59f475e7..3eecb242 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -2182,7 +2182,7 @@ dhcp_handledhcp(struct interface *iface, struct dhcp_message **dhcpp,
 			    iface, dhcp, from);
 			return;
 		}
-		if (state->state != DHS_BOUND) {
+		if (state->state != DHS_BOUND && state->state != DHS_INFORM) {
 			log_dhcp(LOG_DEBUG, "not bound, ignoring Force Renew",
 			    iface, dhcp, from);
 			return;
@@ -2190,8 +2190,13 @@ dhcp_handledhcp(struct interface *iface, struct dhcp_message **dhcpp,
 		log_dhcp(LOG_ERR, "Force Renew from", iface, dhcp, from);
 		/* The rebind and expire timings are still the same, we just
 		 * enter the renew state early */
-		eloop_timeout_delete(dhcp_renew, iface);
-		dhcp_renew(iface);
+		if (state->state == DHS_BOUND) {
+			eloop_timeout_delete(dhcp_renew, iface);
+			dhcp_renew(iface);
+		} else {
+			eloop_timeout_delete(send_inform, iface);
+			dhcp_inform(iface);
+		}
 		return;
 	}