diff options
| author | Michael Brown | 2006-07-17 15:07:14 +0200 |
|---|---|---|
| committer | Michael Brown | 2006-07-17 15:07:14 +0200 |
| commit | 6c01d3bb95c8dfbbbc3f2b4fb36fce6bd2f3e952 (patch) | |
| tree | a43152f027ef99025063ac818393e45ea8480629 | |
| parent | Tidy up hex_dump() output. (diff) | |
| download | ipxe-6c01d3bb95c8dfbbbc3f2b4fb36fce6bd2f3e952.tar.gz ipxe-6c01d3bb95c8dfbbbc3f2b4fb36fce6bd2f3e952.tar.xz ipxe-6c01d3bb95c8dfbbbc3f2b4fb36fce6bd2f3e952.zip | |
Fix creation of the htype field; the ll_proto field from which it is
derived is a 16-bit big-endian field, but htype is only 8 bits wide.
| -rw-r--r-- | src/include/gpxe/dhcp.h | 12 | ||||
| -rw-r--r-- | src/net/udp/dhcp.c | 7 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/include/gpxe/dhcp.h b/src/include/gpxe/dhcp.h index e35b7eaba..71c6c14a0 100644 --- a/src/include/gpxe/dhcp.h +++ b/src/include/gpxe/dhcp.h @@ -23,7 +23,9 @@ struct dhcp_packet { uint8_t op; /** Hardware address type * - * This is an ARPHRD_XXX constant. + * This is an ARPHRD_XXX constant. Note that ARPHRD_XXX + * constants are nominally 16 bits wide; this could be + * considered to be a bug in the BOOTP/DHCP specification. */ uint8_t htype; /** Hardware address length */ @@ -274,6 +276,14 @@ struct dhcp_option_block { signed int priority; }; +/** A DHCP session */ +struct dhcp_session { + /** Network device being configured */ + struct net_device *netdev; + /** Transaction ID, in network-endian order */ + uint32_t xid; +}; + extern unsigned long dhcp_num_option ( struct dhcp_option *option ); extern struct dhcp_option * find_dhcp_option ( struct dhcp_option_block *options, unsigned int tag ); diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index 1523e404b..7e9af09f7 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.c @@ -29,11 +29,6 @@ * */ -struct dhcp_session { - struct net_device *netdev; - uint32_t xid; -}; - /** DHCP operation types * * This table maps from DHCP message types (i.e. values of the @c @@ -186,7 +181,7 @@ size_t dhcp_assemble ( struct dhcp_session *dhcp, void *data, dhcppkt->op = dhcp_op[dhcp_message_type]; /* Fill in NIC details */ - dhcppkt->htype = dhcp->netdev->ll_protocol->ll_proto; + dhcppkt->htype = ntohs ( dhcp->netdev->ll_protocol->ll_proto ); dhcppkt->hlen = dhcp->netdev->ll_protocol->ll_addr_len; memcpy ( dhcppkt->chaddr, dhcp->netdev->ll_addr, dhcppkt->hlen ); |