From: Nick Porter <nick@portercomputing.co.uk>
Date: Tue, 6 Jun 2023 11:29:50 +0000 (+0100)
Subject: DO_NOT_RESPOND is a valid reply packet type for DHCP
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=165341dd5cace8a8f9a26439c7e79698e6be7259;p=thirdparty%2Ffreeradius-server.git

DO_NOT_RESPOND is a valid reply packet type for DHCP
---

diff --git a/src/process/dhcpv4/base.c b/src/process/dhcpv4/base.c
index f0418f34259..b5857afe03f 100644
--- a/src/process/dhcpv4/base.c
+++ b/src/process/dhcpv4/base.c
@@ -131,10 +131,12 @@ typedef struct {
 	process_dhcpv4_sections_t sections;
 } process_dhcpv4_t;
 
+#define FR_DHCP_PROCESS_CODE_VALID(_x) (FR_DHCP_PACKET_CODE_VALID(_x) || (_x == FR_DHCP_DO_NOT_RESPOND))
+
 #define PROCESS_PACKET_TYPE		fr_dhcpv4_packet_code_t
 #define PROCESS_CODE_MAX		FR_DHCP_CODE_MAX
 #define PROCESS_CODE_DO_NOT_RESPOND	FR_DHCP_DO_NOT_RESPOND
-#define PROCESS_PACKET_CODE_VALID	FR_DHCP_PACKET_CODE_VALID
+#define PROCESS_PACKET_CODE_VALID	FR_DHCP_PROCESS_CODE_VALID
 #define PROCESS_INST			process_dhcpv4_t
 #include <freeradius-devel/server/process.h>
 
diff --git a/src/process/dhcpv6/base.c b/src/process/dhcpv6/base.c
index a1dbcb9cb64..bdc0c282d48 100644
--- a/src/process/dhcpv6/base.c
+++ b/src/process/dhcpv6/base.c
@@ -164,10 +164,12 @@ fr_dict_enum_autoload_t process_dhcpv6_dict_enum[] = {
 	{ NULL }
 };
 
+#define FR_DHCPV6_PROCESS_CODE_VALID(_x) (FR_DHCPV6_PACKET_CODE_VALID(_x) || (_x == FR_DHCPV6_DO_NOT_RESPOND))
+
 #define PROCESS_PACKET_TYPE		fr_dhcpv6_packet_code_t
 #define PROCESS_CODE_MAX		FR_DHCPV6_CODE_MAX
 #define PROCESS_CODE_DO_NOT_RESPOND	FR_DHCPV6_DO_NOT_RESPOND
-#define PROCESS_PACKET_CODE_VALID	FR_DHCPV6_PACKET_CODE_VALID
+#define PROCESS_PACKET_CODE_VALID	FR_DHCPV6_PROCESS_CODE_VALID
 #define PROCESS_INST			process_dhcpv6_t
 
 /*