From: Roy Marples <roy@marples.name>
Date: Sat, 17 Jan 2015 00:32:18 +0000 (+0000)
Subject: Clarify the problem of identifying a bootp vs dhcp message.
X-Git-Tag: v6.7.0~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3d69056f1bc64fd9d52050813da385e653b7c5d;p=thirdparty%2Fdhcpcd.git

Clarify the problem of identifying a bootp vs dhcp message.
---

diff --git a/dhcp.c b/dhcp.c
index 91a9ce9d..23bdaf19 100644
--- a/dhcp.c
+++ b/dhcp.c
@@ -2574,7 +2574,10 @@ dhcp_handledhcp(struct interface *iface, struct dhcp_message **dhcpp,
 		    get_option_uint8(iface->ctx, &tmp, dhcp, (uint8_t)i) != 0)
 		{
 			/* If we are bootp, then ignore the need for serverid.
-			 * To ignore bootp, require dhcp_message_type. */
+			 * To ignore bootp, require dhcp_message_type.
+			 * However, nothing really stops bootp from providing
+			 * DHCP style options as well so the above isn't
+			 * always true. */
 			if (type == 0 && i == DHO_SERVERID)
 				continue;
 			log_dhcp(LOG_WARNING, "reject DHCP", iface, dhcp, from);