From: Michael Brown <mcb30@etherboot.org>
Date: Tue, 25 Mar 2008 16:38:01 +0000 (+0000)
Subject: [DHCP] Fix DHCP state confusion.
X-Git-Tag: v0.9.4~191
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7234f91bf87df67b770a44cad2351e5c73e67ea4;p=thirdparty%2Fipxe.git

[DHCP] Fix DHCP state confusion.

DHCP code was using an incorrect check for whether to construct a
DHCPDISCOVER or DHCPREQUEST packet.
---

diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c
index 908e7b3fa..8789f9259 100644
--- a/src/net/udp/dhcp.c
+++ b/src/net/udp/dhcp.c
@@ -622,7 +622,7 @@ static int dhcp_send_request ( struct dhcp_session *dhcp ) {
 		.netdev = dhcp->netdev,
 	};
 	struct io_buffer *iobuf;
-	struct dhcp_packet *dhcpoffer;
+	struct dhcp_packet *dhcpoffer = NULL;
 	struct dhcp_packet dhcppkt;
 	int rc;
 	
@@ -643,7 +643,10 @@ static int dhcp_send_request ( struct dhcp_session *dhcp ) {
 		return -ENOMEM;
 
 	/* Create DHCP packet in temporary buffer */
-	dhcpoffer = ( dhcp->response ? &dhcp->response->dhcppkt : NULL );
+	if ( dhcp->state == DHCPREQUEST ) {
+		assert ( dhcp->response );
+		dhcpoffer = &dhcp->response->dhcppkt;
+	}
 	if ( ( rc = create_dhcp_request ( &dhcppkt, dhcp->netdev,
 					  dhcpoffer, iobuf->data,
 					  iob_tailroom ( iobuf ) ) ) != 0 ) {