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 f0418f342598dbe585260cff6f493aaeb20f6e50..b5857afe03fef2173f5cf59153e456fbfab55e1a 100644 (file)
--- 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 a1dbcb9cb64137f069c8673a28214622f7109325..bdc0c282d48d7205bc075b77e62198391559c2d9 100644 (file)
--- 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
 
 /*