diff options
| author | Michael Brown | 2016-07-04 14:15:05 +0200 |
|---|---|---|
| committer | Michael Brown | 2016-07-04 14:15:05 +0200 |
| commit | 3d9f094022854ca06d02f34c688896abde9e1b20 (patch) | |
| tree | 3905fa7145b191aaa733fceea7f11f2a24b2f0dc /src/net | |
| parent | [pxe] Disable interrupts on the PIC before starting NBP (diff) | |
| download | ipxe-3d9f094022854ca06d02f34c688896abde9e1b20.tar.gz ipxe-3d9f094022854ca06d02f34c688896abde9e1b20.tar.xz ipxe-3d9f094022854ca06d02f34c688896abde9e1b20.zip | |
[dhcp] Allow for variable encapsulation of architecture-specific options
DHCPv4 and DHCPv6 share some values in common for the architecture-
specific options (such as the client system architecture type), but
use different encapsulations: DHCPv4 has a single byte for the option
length while DHCPv6 has a 16-bit field for the option length.
Move the containing DHCP_OPTION() and related wrappers from the
individual dhcp_arch.h files to dhcp.c, thus allowing for the
architecture-specific values to be reused in dhcpv6.c.
Signed-off-by: Michael Brown <mcb30@ipxe.org>
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/udp/dhcp.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index 9342ad21..0c6cea0f 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.c @@ -82,9 +82,9 @@ static uint8_t dhcp_request_options_data[] = { DHCP_MESSAGE_TYPE, DHCP_BYTE ( 0 ), DHCP_MAX_MESSAGE_SIZE, DHCP_WORD ( ETH_MAX_MTU - 20 /* IP header */ - 8 /* UDP header */ ), - DHCP_CLIENT_ARCHITECTURE, DHCP_ARCH_CLIENT_ARCHITECTURE, - DHCP_CLIENT_NDI, DHCP_ARCH_CLIENT_NDI, - DHCP_VENDOR_CLASS_ID, DHCP_ARCH_VENDOR_CLASS_ID, + DHCP_CLIENT_ARCHITECTURE, DHCP_WORD ( DHCP_ARCH_CLIENT_ARCHITECTURE ), + DHCP_CLIENT_NDI, DHCP_OPTION ( DHCP_ARCH_CLIENT_NDI ), + DHCP_VENDOR_CLASS_ID, DHCP_STRING ( DHCP_ARCH_VENDOR_CLASS_ID ), DHCP_USER_CLASS_ID, DHCP_STRING ( 'i', 'P', 'X', 'E' ), DHCP_PARAMETER_REQUEST_LIST, DHCP_OPTION ( DHCP_SUBNET_MASK, DHCP_ROUTERS, DHCP_DNS_SERVERS, |