From: Michael Brown <mcb30@etherboot.org>
Date: Tue, 8 Jul 2008 00:13:59 +0000 (+0100)
Subject: [dhcp] Allow DHCP non-option settings to be cleared
X-Git-Tag: v0.9.4~94
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2df682c5beaaf6f0cc926a9b802f08a5c8175258;p=thirdparty%2Fipxe.git

[dhcp] Allow DHCP non-option settings to be cleared

dhcppkt_store() is supposed to clear the setting if passed NULL for the
setting data.  In the case of fixed-location fields (e.g. client IP
address), this requires setting the content of the field to all-zeros.
---

diff --git a/src/net/dhcppkt.c b/src/net/dhcppkt.c
index 2537e254f..c8bf215b0 100644
--- a/src/net/dhcppkt.c
+++ b/src/net/dhcppkt.c
@@ -138,12 +138,15 @@ find_dhcp_packet_field ( unsigned int tag ) {
 int dhcppkt_store ( struct dhcp_packet *dhcppkt, unsigned int tag,
 		    const void *data, size_t len ) {
 	struct dhcp_packet_field *field;
+	void *field_data;
 	int rc;
 
 	/* If this is a special field, fill it in */
 	if ( ( field = find_dhcp_packet_field ( tag ) ) != NULL ) {
 		if ( len > field->len )
 			return -ENOSPC;
+		field_data = dhcp_packet_field ( dhcppkt->dhcphdr, field );
+		memset ( field_data, 0, field->len );
 		memcpy ( dhcp_packet_field ( dhcppkt->dhcphdr, field ),
 			 data, len );
 		return 0;