mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-29 21:18:02 +00:00
Code Issues Releases Wiki Activity

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

Browse Source 
This reverts commit 7f62f7f11eefb7486fd5a2abede7ffdd287cb68a.
This is already covered in #5145.
This commit is contained in:
Tomek Mrugalski 2017-02-24 11:41:05 +01:00
parent 7f62f7f11e
commit 886fa301d7
3 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/bin/dhcp4/json_config_parser.cc
View File

@ -515,11 +515,6 @@ configureDhcp4Server(Dhcpv4Srv&, isc::data::ConstElementPtr config_set) {
if (config_pair.first == "hooks-libraries") { if (config_pair.first == "hooks-libraries") {
hooks_parser.parse(config_pair.second); hooks_parser.parse(config_pair.second);
hooks_parser.verifyLibraries(); hooks_parser.verifyLibraries();
// We need to store hooks information in the configuration.
hooks::HookLibsCollection libs;
hooks_parser.getLibraries(libs);
srv_cfg->setLibraries(libs);
continue; continue;
} }

5
src/bin/dhcp6/json_config_parser.cc
View File

@ -737,11 +737,6 @@ configureDhcp6Server(Dhcpv6Srv&, isc::data::ConstElementPtr config_set) {
if (config_pair.first == "hooks-libraries") { if (config_pair.first == "hooks-libraries") {
hooks_parser.parse(config_pair.second); hooks_parser.parse(config_pair.second);
hooks_parser.verifyLibraries(); hooks_parser.verifyLibraries();
// We need to store hooks information in the configuration.
hooks::HookLibsCollection libs;
hooks_parser.getLibraries(libs);
srv_config->setLibraries(libs);
continue; continue;
} }

17
src/lib/dhcpsrv/srv_config.h
View File

@ -22,7 +22,6 @@
#include <dhcpsrv/client_class_def.h> #include <dhcpsrv/client_class_def.h>
#include <dhcpsrv/d2_client_cfg.h> #include <dhcpsrv/d2_client_cfg.h>
#include <dhcpsrv/logging_info.h> #include <dhcpsrv/logging_info.h>
#include <hooks/libinfo.h>
#include <cc/data.h> #include <cc/data.h>
#include <boost/shared_ptr.hpp> #include <boost/shared_ptr.hpp>
#include <vector> #include <vector>
@ -522,19 +521,6 @@ public:
d2_client_config_ = d2_client_config; 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: private:
/// @brief Sequence number identifying the configuration. /// @brief Sequence number identifying the configuration.
@ -623,9 +609,6 @@ private:
uint32_t dhcp4o6_port_; uint32_t dhcp4o6_port_;
D2ClientConfigPtr d2_client_config_; D2ClientConfigPtr d2_client_config_;
/// List of hook libraries.
hooks::HookLibsCollection libraries_;
}; };
/// @name Pointers to the @c SrvConfig object. /// @name Pointers to the @c SrvConfig object.