[dhcp] Do not transition to DHCPREQUEST without a valid DHCPOFFER

A missing test for dhcp->dhcpoffer in dhcp_timer_expired() was causing
the client to transition to DHCPREQUEST after timing out on waiting
for ProxyDHCP even if no DHCPOFFERs had been received.

diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index 0ce3c19d4048c579f6213c39aaa79b8e273fe6ca..6ff8afe9dfc26dab786ef6d8b1f038a5f9690976 100644 (file)
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -932,7 +932,7 @@ static void dhcp_timer_expired ( struct retry_timer *timer, int fail ) {
        }
 
        /* Give up waiting for ProxyDHCP before we reach the failure point */
-       if ( elapsed > PROXYDHCP_WAIT_TIME ) {
+       if ( dhcp->dhcpoffer && ( elapsed > PROXYDHCP_WAIT_TIME ) ) {
                if ( dhcp->state == DHCP_STATE_DISCOVER ) {
                        dhcp_set_state ( dhcp, DHCP_STATE_REQUEST );
                        return;