From: Roy Marples <roy@marples.name>
Date: Thu, 8 May 2008 11:00:15 +0000 (+0000)
Subject: Fix infinite timeouts.
X-Git-Tag: v4.0.2~431
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f19bd3c3d7d2dbf7b558ad54d1415de7a2ce03b5;p=thirdparty%2Fdhcpcd.git

Fix infinite timeouts.
---

diff --git a/client.c b/client.c
index 2fc52dc2..bcd3b643 100644
--- a/client.c
+++ b/client.c
@@ -921,7 +921,7 @@ handle_timeout(struct if_state *state, const struct options *options)
 			break;
 		}
 		state->state = STATE_RENEWING;
-		state->xid = (uint32_t) random ();
+		state->xid = (uint32_t)random();
 		/* FALLTHROUGH */
 	case STATE_RENEWING:
 		iface->start_uptime = uptime();
@@ -1156,9 +1156,9 @@ handle_dhcp(struct if_state *state, struct dhcp_message **dhcpp,
 				logger(LOG_DEBUG, "rebind in %u seconds",
 				       lease->rebindtime);
 
+			state->timeout = lease->renewaltime;
 		}
 
-		state->timeout = lease->renewaltime;
 		state->state = STATE_BOUND;
 	}