From: Francis Dupont <fdupont@isc.org>
Date: Sat, 16 Dec 2017 23:09:10 +0000 (+0100)
Subject: [5443] Updated DHCPv4-over-DHCPv6 services
X-Git-Tag: trac5457_base~2^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18c393c843af52c9edbda0df44ab65214ff2477d;p=thirdparty%2Fkea.git

[5443] Updated DHCPv4-over-DHCPv6 services
---

diff --git a/src/bin/dhcp4/dhcp4to6_ipc.cc b/src/bin/dhcp4/dhcp4to6_ipc.cc
index b219207265..e1222a1bb8 100644
--- a/src/bin/dhcp4/dhcp4to6_ipc.cc
+++ b/src/bin/dhcp4/dhcp4to6_ipc.cc
@@ -133,15 +133,14 @@ void Dhcp4to6Ipc::handler() {
             // Callouts decided to skip the next processing step. The next
             // processing step would to parse the packet, so skip at this
             // stage means drop.
-            if (callout_handle->getStatus() == CalloutHandle::NEXT_STEP_SKIP) {
+            if ((callout_handle->getStatus() == CalloutHandle::NEXT_STEP_SKIP) ||
+                (callout_handle->getStatus() == CalloutHandle::NEXT_STEP_DROP)) {
                 LOG_DEBUG(hooks_logger, DBG_DHCP4_HOOKS,
                           DHCP4_HOOK_BUFFER_SEND_SKIP)
                     .arg(rsp->getLabel());
                 return;
             }
 
-            /// @todo: Add support for DROP status.
-
             callout_handle->getArgument("response4", rsp);
         }
 
diff --git a/src/bin/dhcp6/dhcp6to4_ipc.cc b/src/bin/dhcp6/dhcp6to4_ipc.cc
index 7ec9397973..0e8356516c 100644
--- a/src/bin/dhcp6/dhcp6to4_ipc.cc
+++ b/src/bin/dhcp6/dhcp6to4_ipc.cc
@@ -119,14 +119,13 @@ void Dhcp6to4Ipc::handler() {
             // Callouts decided to skip the next processing step. The next
             // processing step would to parse the packet, so skip at this
             // stage means drop.
-            if (callout_handle->getStatus() == CalloutHandle::NEXT_STEP_SKIP) {
+            if ((callout_handle->getStatus() == CalloutHandle::NEXT_STEP_SKIP) ||
+                (callout_handle->getStatus() == CalloutHandle::NEXT_STEP_DROP)) {
                 LOG_DEBUG(hooks_logger, DBG_DHCP6_HOOKS, DHCP6_HOOK_BUFFER_SEND_SKIP)
                     .arg(pkt->getLabel());
                 return;
             }
 
-            /// @todo: Add support for DROP status
-
             callout_handle->getArgument("response6", pkt);
         }