[3590] Revert "[3590] Hook libraries information is now stored in SrvConfig"

This reverts commit 7f62f7f11eefb7486fd5a2abede7ffdd287cb68a.
This is already covered in #5145.

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index d213c83cccd78601b9b065dcb965781b3d9ec2de..865f86a17989ccd4d6b1ad41eb05d31925eff893 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -515,11 +515,6 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
             if (config_pair.first == "hooks-libraries") {
                 hooks_parser.parse(config_pair.second);
                 hooks_parser.verifyLibraries();
-
-                // We need to store hooks information in the configuration.
-                hooks::HookLibsCollection libs;
-                hooks_parser.getLibraries(libs);
-                srv_cfg->setLibraries(libs);
                 continue;
             }
 

diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index ce195e6ee7dcbf50cdd213b332cf233e6f8af5b0..d34260ce9552ade56cf23b3906d77ae32cdafee3 100644 (file)
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -737,11 +737,6 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) {
             if (config_pair.first == "hooks-libraries") {
                 hooks_parser.parse(config_pair.second);
                 hooks_parser.verifyLibraries();
-
-                // We need to store hooks information in the configuration.
-                hooks::HookLibsCollection libs;
-                hooks_parser.getLibraries(libs);
-                srv_config->setLibraries(libs);
                 continue;
             }
 

diff --git a/src/lib/dhcpsrv/srv_config.h b/src/lib/dhcpsrv/srv_config.h
index e3c3d888185e9b71da9ed7c37f0e8729fb15b626..4bfa4ccae311cba3bc578de8ad77035b151aebc3 100644 (file)
--- a/src/lib/dhcpsrv/srv_config.h
+++ b/src/lib/dhcpsrv/srv_config.h
@@ -22,7 +22,6 @@
 #include <dhcpsrv/client_class_def.h>
 #include <dhcpsrv/d2_client_cfg.h>
 #include <dhcpsrv/logging_info.h>
-#include <hooks/libinfo.h>
 #include <cc/data.h>
 #include <boost/shared_ptr.hpp>
 #include <vector>
@@ -522,19 +521,6 @@ public:
         d2_client_config_ = d2_client_config;
     }
 
-    /// @brief Returns a list of hook libraries
-    /// @return a list of hook libraries
-    const hooks::HookLibsCollection& getLibraries() const {
-        return (libraries_);
-    }
-
-    /// @brief Sets the list of hook libraries
-    ///
-    /// @params libs a coolection of libraries to remember.
-    void setLibraries(const hooks::HookLibsCollection& libs) {
-        libraries_ = libs;
-    }
-
 private:
 
     /// @brief Sequence number identifying the configuration.
@@ -623,9 +609,6 @@ private:
     uint32_t dhcp4o6_port_;
 
     D2ClientConfigPtr d2_client_config_;
-
-    /// List of hook libraries.
-    hooks::HookLibsCollection libraries_;
 };
 
 /// @name Pointers to the @c SrvConfig object.