david/ipxe
david
/
ipxe
Archived
1
0
Fork 0
Code

[dhcp] Allow for missing server ID in ProxyDHCPACK 

The Linux PXE server (http://www.kano.org.uk/projects/pxe) does not
set the server identifier in its ProxyDHCP responses.  If the server
ID is missing, do not treat this as an error.

This resolves the "vague and unsettling memory" mentioned in commit
fdb8481d ("[dhcp] Verify server identifier on ProxyDHCPACKs").

Note that we already accept ProxyDHCPOFFERs without a server
identifier; they get treated as potential BOOTP packets.
This commit is contained in:
Michael Brown 2009-01-21 00:55:42 +00:00
parent 08f6d22410
commit d7de30e5e4
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -845,16 +845,20 @@ static void dhcp_rx_proxydhcpack ( struct dhcp_session *dhcp,
struct in_addr ack_server_id = { 0 };
int rc;
/* Verify server ID matches */
/* Verify server ID matches, if present */
assert ( dhcp->proxydhcpoffer != NULL );
dhcppkt_fetch ( &dhcp->proxydhcpoffer->dhcppkt, DHCP_SERVER_IDENTIFIER,
&offer_server_id, sizeof ( offer_server_id ) );
dhcppkt_fetch ( &proxydhcpack->dhcppkt, DHCP_SERVER_IDENTIFIER,
&ack_server_id, sizeof ( ack_server_id ) );
if ( offer_server_id.s_addr != ack_server_id.s_addr ) {
DBGC ( dhcp, "DHCP %p ignoring ProxyDHCPACK with wrong server "
"ID %s\n", dhcp, inet_ntoa ( ack_server_id ) );
return;
if ( ( rc = dhcppkt_fetch ( &proxydhcpack->dhcppkt,
DHCP_SERVER_IDENTIFIER, &ack_server_id,
sizeof ( ack_server_id ) ) ) > 0 ) {
dhcppkt_fetch ( &dhcp->proxydhcpoffer->dhcppkt,
DHCP_SERVER_IDENTIFIER, &offer_server_id,
sizeof ( offer_server_id ) );
if ( offer_server_id.s_addr != ack_server_id.s_addr ) {
DBGC ( dhcp, "DHCP %p ignoring ProxyDHCPACK with "
"wrong server ID %s\n",
dhcp, inet_ntoa ( ack_server_id ) );
return;
}
}
/* Rename settings */