[#899] fixed hook point arguments

diff --git a/src/bin/dhcp4/dhcp4_srv.cc b/src/bin/dhcp4/dhcp4_srv.cc
index 2038d2941a458797c37445afec3dc411f5e7c429..ff7bdb54e751115937a167e3dd7da0e1fe741f83 100644 (file)
--- a/src/bin/dhcp4/dhcp4_srv.cc
+++ b/src/bin/dhcp4/dhcp4_srv.cc
@@ -3330,10 +3330,12 @@ Dhcpv4Srv::declineLease(const Lease4Ptr& lease, const Pkt4Ptr& decline,
         // Enable copying options from the packet within hook library.
         ScopedEnableOptionsCopy<Pkt4> query4_options_copy(decline);
 
-        // Pass incoming Decline and the lease to be declined.
-        callout_handle->setArgument("lease4", lease);
+        // Pass the original packet
         callout_handle->setArgument("query4", decline);
 
+        // Pass the lease to be updated
+        callout_handle->setArgument("lease4", lease);
+
         // Call callouts
         HooksManager::callCallouts(Hooks.hook_index_lease4_decline_,
                                    *callout_handle);

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 3f0de015c4f40be3947beb5f4fec6678902b5363..d18e316b83e99c69c26e652f7ceb5f4ad8d596d6 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -3587,8 +3587,10 @@ Dhcpv6Srv::declineLease(const Pkt6Ptr& decline, const Lease6Ptr lease,
         // Enable copying options from the packet within hook library.
         ScopedEnableOptionsCopy<Pkt6> query6_options_copy(decline);
 
-        // Pass incoming packet as argument
+        // Pass the original packet
         callout_handle->setArgument("query6", decline);
+
+        // Pass the lease to be updated
         callout_handle->setArgument("lease6", lease);
 
         // Call callouts

diff --git a/src/hooks/dhcp/run_script/run_script_callouts.cc b/src/hooks/dhcp/run_script/run_script_callouts.cc
index f17410a0ee6d6c19aaf8cab33bd2dcb7dd284ebf..05e6e3bc2526650a0561738115c916c3c035b691 100644 (file)
--- a/src/hooks/dhcp/run_script/run_script_callouts.cc
+++ b/src/hooks/dhcp/run_script/run_script_callouts.cc
@@ -146,9 +146,9 @@ int leases4_committed(CalloutHandle& handle) {
     Pkt4Ptr pkt4;
     handle.getArgument("query4", pkt4);
     RunScriptImpl::extractPkt4(vars, pkt4);
-    Lease4Ptr lease4;
-    handle.getArgument("lease4", lease4);
-    RunScriptImpl::extractLease4(vars, lease4);
+    Lease4CollectionPtr leases4;
+    handle.getArgument("leases4", leases4);
+    RunScriptImpl::extractLeases4(vars, leases4);
     Lease4CollectionPtr deleted_leases4;
     handle.getArgument("deleted_leases4", deleted_leases4);
     RunScriptImpl::extractLeases4(vars, deleted_leases4);
@@ -307,9 +307,9 @@ int leases6_committed(CalloutHandle& handle) {
     Pkt6Ptr pkt6;
     handle.getArgument("query6", pkt6);
     RunScriptImpl::extractPkt6(vars, pkt6);
-    Lease6Ptr lease6;
-    handle.getArgument("lease6", lease6);
-    RunScriptImpl::extractLease6(vars, lease6);
+    Lease6CollectionPtr leases6;
+    handle.getArgument("leases6", leases6);
+    RunScriptImpl::extractLeases6(vars, leases6);
     Lease6CollectionPtr deleted_leases6;
     handle.getArgument("deleted_leases6", deleted_leases6);
     RunScriptImpl::extractLeases6(vars, deleted_leases6);