sysadmin/ipxe
1
0
Fork 0
mirror of https://github.com/ipxe/ipxe synced 2025-12-20 03:55:46 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove some assumptions about DHCP obtaining only a single options block.

Browse Source
This commit is contained in:
Michael Brown
2007-11-21 04:48:18 +00:00
parent 8d18338ae7
commit fb809da2df
4 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/net/dhcpopts.c
View File

@@ -35,7 +35,7 @@
*/
/** List of registered DHCP option blocks */
static LIST_HEAD ( option_blocks );
LIST_HEAD ( dhcp_option_blocks );
/** Registered DHCP option applicators */
static struct dhcp_option_applicator dhcp_option_applicators[0]
@@ -259,7 +259,7 @@ struct dhcp_option * find_dhcp_option ( struct dhcp_option_block *options,
if ( options ) {
return find_dhcp_option_with_encap ( options, tag, NULL );
} else {
list_for_each_entry ( options, &option_blocks, list ) {
list_for_each_entry ( options, &dhcp_option_blocks, list ) {
if ( ( option = find_dhcp_option ( options, tag ) ) )
return option;
}
@@ -283,7 +283,7 @@ void register_dhcp_options ( struct dhcp_option_block *options ) {
options, options->priority );
/* Insert after any existing blocks which have a higher priority */
list_for_each_entry ( existing, &option_blocks, list ) {
list_for_each_entry ( existing, &dhcp_option_blocks, list ) {
if ( options->priority > existing->priority )
break;
}

10
src/net/udp/dhcp.c
View File

@@ -1006,14 +1006,18 @@ int dhcp_configure_netdev ( struct net_device *netdev,
struct in_addr gateway = { INADDR_NONE };
int rc;
/* Clear any existing routing table entry */
del_ipv4_address ( netdev );
/* Retrieve IP address configuration */
find_dhcp_ipv4_option ( options, DHCP_EB_YIADDR, &address );
find_dhcp_ipv4_option ( options, DHCP_SUBNET_MASK, &netmask );
find_dhcp_ipv4_option ( options, DHCP_ROUTERS, &gateway );
/* Do nothing unless we have at least an IP address to use */
if ( ! address.s_addr )
return 0;
/* Clear any existing routing table entry */
del_ipv4_address ( netdev );
/* Set up new IP address configuration */
if ( ( rc = add_ipv4_address ( netdev, address, netmask,
gateway ) ) != 0 ) {