[#3268] Updated hooks

diff --git a/src/hooks/dhcp/perfmon/perfmon_callouts.cc b/src/hooks/dhcp/perfmon/perfmon_callouts.cc
index b995fe47c08991065203e172279652476fed37da..4a7b4db40720b6590fc735da628218cc144bebde 100644 (file)
--- a/src/hooks/dhcp/perfmon/perfmon_callouts.cc
+++ b/src/hooks/dhcp/perfmon/perfmon_callouts.cc
@@ -69,7 +69,7 @@ int pkt4_send(CalloutHandle& handle) {
     Pkt4Ptr response;
     handle.getArgument("response4", response);
 
-    Subnet4Ptr subnet;
+    ConstSubnet4Ptr subnet;
     handle.getArgument("subnet4", subnet);
 
     try {
@@ -101,7 +101,7 @@ int pkt6_send(CalloutHandle& handle) {
     Pkt6Ptr response;
     handle.getArgument("response6", response);
 
-    Subnet6Ptr subnet;
+    ConstSubnet6Ptr subnet;
     handle.getArgument("subnet6", subnet);
 
     try {

diff --git a/src/hooks/dhcp/perfmon/perfmon_mgr.cc b/src/hooks/dhcp/perfmon/perfmon_mgr.cc
index cc3c0238dbe1495cbbbce3587a4306f53ddfed15..dcd044fcacac83368678f7cf46858b2bae2513b1 100644 (file)
--- a/src/hooks/dhcp/perfmon/perfmon_mgr.cc
+++ b/src/hooks/dhcp/perfmon/perfmon_mgr.cc
@@ -68,7 +68,8 @@ PerfMonMgr::configure(const ConstElementPtr& params) {
 }
 
 void
-PerfMonMgr::processPktEventStack(PktPtr query, PktPtr response, SubnetPtr subnet) {
+PerfMonMgr::processPktEventStack(PktPtr query, PktPtr response,
+                                ConstSubnetPtr subnet) {
     if (!query) {
         isc_throw(Unexpected, "PerfMonMgr::processPktEventStack - query is empty!");
     }

diff --git a/src/hooks/dhcp/perfmon/perfmon_mgr.h b/src/hooks/dhcp/perfmon/perfmon_mgr.h
index e9b59ad14e7232487397f8b317eaac0dfdf2591c..13afce1a728c933cde6fe100338fedf29cb5ca09 100644 (file)
--- a/src/hooks/dhcp/perfmon/perfmon_mgr.h
+++ b/src/hooks/dhcp/perfmon/perfmon_mgr.h
@@ -64,7 +64,7 @@ public:
     /// subnet id.
     void processPktEventStack(isc::dhcp::PktPtr query,
                               isc::dhcp::PktPtr response,
-                              const isc::dhcp::SubnetPtr subnet);
+                              const isc::dhcp::ConstSubnetPtr subnet);
 
     /// @brief Adds a duration sample to a MonitoredDuration.
     ///

diff --git a/src/hooks/dhcp/run_script/run_script.cc b/src/hooks/dhcp/run_script/run_script.cc
index 6aecc7ab7b90c12371ebad5ebbdeae134a259a72..cc82dc2737ef56ed015854521c10d46ba83a13f9 100644 (file)
--- a/src/hooks/dhcp/run_script/run_script.cc
+++ b/src/hooks/dhcp/run_script/run_script.cc
@@ -175,7 +175,7 @@ RunScriptImpl::extractOptionIA(ProcessEnvVars& vars,
 
 void
 RunScriptImpl::extractSubnet4(ProcessEnvVars& vars,
-                              const Subnet4Ptr subnet4,
+                              const ConstSubnet4Ptr subnet4,
                               const string& prefix,
                               const string& suffix) {
     if (subnet4) {
@@ -198,7 +198,7 @@ RunScriptImpl::extractSubnet4(ProcessEnvVars& vars,
 
 void
 RunScriptImpl::extractSubnet6(ProcessEnvVars& vars,
-                              const Subnet6Ptr subnet6,
+                              const ConstSubnet6Ptr subnet6,
                               const string& prefix,
                               const string& suffix) {
     if (subnet6) {

diff --git a/src/hooks/dhcp/run_script/run_script.h b/src/hooks/dhcp/run_script/run_script.h
index 31fd2454d38e9dd52af2347876896049fa5a1d15..5ab6d2ab3f20379c4df368c70b4f0dd295b53929 100644 (file)
--- a/src/hooks/dhcp/run_script/run_script.h
+++ b/src/hooks/dhcp/run_script/run_script.h
@@ -131,7 +131,7 @@ public:
     /// @param prefix The prefix for the name of the environment variable.
     /// @param suffix The suffix for the name of the environment variable.
     static void extractSubnet4(isc::asiolink::ProcessEnvVars& vars,
-                               const isc::dhcp::Subnet4Ptr subnet4,
+                               const isc::dhcp::ConstSubnet4Ptr subnet4,
                                const std::string& prefix = "",
                                const std::string& suffix = "");
 
@@ -141,7 +141,7 @@ public:
     /// @param prefix The prefix for the name of the environment variable.
     /// @param suffix The suffix for the name of the environment variable.
     static void extractSubnet6(isc::asiolink::ProcessEnvVars& vars,
-                               const isc::dhcp::Subnet6Ptr subnet6,
+                               const isc::dhcp::ConstSubnet6Ptr subnet6,
                                const std::string& prefix = "",
                                const std::string& suffix = "");
 

diff --git a/src/hooks/dhcp/run_script/run_script_callouts.cc b/src/hooks/dhcp/run_script/run_script_callouts.cc
index 22b4a54fd3e8390b3ed6f1738af72364533225f1..fc365f214026f64f91bcb8990d8da3563fdf48a2 100644 (file)
--- a/src/hooks/dhcp/run_script/run_script_callouts.cc
+++ b/src/hooks/dhcp/run_script/run_script_callouts.cc
@@ -100,7 +100,7 @@ int lease4_renew(CalloutHandle& handle) {
     Pkt4Ptr pkt4;
     handle.getArgument("query4", pkt4);
     RunScriptImpl::extractPkt4(vars, pkt4, "QUERY4");
-    Subnet4Ptr subnet4;
+    ConstSubnet4Ptr subnet4;
     handle.getArgument("subnet4", subnet4);
     RunScriptImpl::extractSubnet4(vars, subnet4, "SUBNET4");
     ClientIdPtr clientid;

diff --git a/src/hooks/dhcp/run_script/tests/run_script_unittests.cc b/src/hooks/dhcp/run_script/tests/run_script_unittests.cc
index 1ada762b60b7eb7559e7c1f3790b1b3651956538..468d0bb33ddb482edbd2e431364126e544e87070 100644 (file)
--- a/src/hooks/dhcp/run_script/tests/run_script_unittests.cc
+++ b/src/hooks/dhcp/run_script/tests/run_script_unittests.cc
@@ -877,7 +877,7 @@ TEST_F(RunScriptTest, lease4Renew) {
     CalloutHandle handle(getCalloutManager());
     Pkt4Ptr pkt4 = generatePkt4();
     handle.setArgument("query4", pkt4);
-    Subnet4Ptr subnet4 = generateSubnet4();
+    ConstSubnet4Ptr subnet4 = generateSubnet4();
     handle.setArgument("subnet4", subnet4);
     ClientIdPtr clientid = generateClientId();
     handle.setArgument("clientid", clientid);