From: Michael Brown Date: Tue, 18 Aug 2015 16:18:38 +0000 (+0100) Subject: [dhcp] Ignore ProxyDHCPACKs without PXE options X-Git-Tag: v1.20.1~728 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a34c2aab9951bf571a5093a5a8d0f6d1f5ca107;p=thirdparty%2Fipxe.git [dhcp] Ignore ProxyDHCPACKs without PXE options Suggested-by: Wissam Shoukair Signed-off-by: Michael Brown --- diff --git a/src/net/udp/dhcp.c b/src/net/udp/dhcp.c index 7d5237bc0..aed5ee360 100644 --- a/src/net/udp/dhcp.c +++ b/src/net/udp/dhcp.c @@ -670,6 +670,8 @@ static void dhcp_proxy_rx ( struct dhcp_session *dhcp, DBGC ( dhcp, " (%s/", inet_ntoa ( server_id ) ); DBGC ( dhcp, "%s)", inet_ntoa ( pseudo_id ) ); } + if ( dhcp_has_pxeopts ( dhcppkt ) ) + DBGC ( dhcp, " pxe" ); DBGC ( dhcp, "\n" ); /* Filter out unacceptable responses */ @@ -679,6 +681,8 @@ static void dhcp_proxy_rx ( struct dhcp_session *dhcp, return; if ( ( pseudo_id.s_addr != dhcp->proxy_server.s_addr ) ) return; + if ( ! dhcp_has_pxeopts ( dhcppkt ) ) + return; /* Register settings */ if ( ( rc = register_settings ( settings, NULL,