From 7ca1bb0fbe804b2a206543850193949b8a613e8f Mon Sep 17 00:00:00 2001 From: Michael Brown Date: Thu, 20 Jul 2006 02:19:06 +0000 Subject: Now successfully negotiates the whole DHCPDISCOVER/OFFER/REQUEST/ACK cycle. :) --- src/include/gpxe/dhcp.h | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'src/include') diff --git a/src/include/gpxe/dhcp.h b/src/include/gpxe/dhcp.h index 6825e406a..1dbb290ef 100644 --- a/src/include/gpxe/dhcp.h +++ b/src/include/gpxe/dhcp.h @@ -12,6 +12,7 @@ #include #include #include +#include /** BOOTP/DHCP server port */ #define BOOTPS_PORT 67 @@ -407,6 +408,14 @@ struct dhcp_session { /** UDP connection for this session */ struct udp_connection udp; + /** Network device being configured */ + struct net_device *netdev; + + /** Options obtained from server */ + struct dhcp_option_block *options; + + /** Transaction ID, in network-endian order */ + uint32_t xid; /** State of the session * * This is a value for the @c DHCP_MESSAGE_TYPE option @@ -415,11 +424,8 @@ struct dhcp_session { int state; /** Asynchronous operation for this DHCP session */ struct async_operation aop; - - /** Network device being configured */ - struct net_device *netdev; - /** Transaction ID, in network-endian order */ - uint32_t xid; + /** Retransmission timer */ + struct retry_timer timer; }; extern unsigned long dhcp_num_option ( struct dhcp_option *option ); -- cgit v1.2.3-55-g7522