[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 908e7b3fa67805803360df5a42c777dcdbeebe14..8789f925963e4852bb592f7e61f98ca730e01ef1 100644 (file)
--- 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 ) {