Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Sebastian Schrader
Kea
Commits
886fa301
Commit
886fa301
authored
Feb 24, 2017
by
Tomek Mrugalski
🛰
Browse files
[3590] Revert "[3590] Hook libraries information is now stored in SrvConfig"
This reverts commit
7f62f7f1
. This is already covered in #5145.
parent
7f62f7f1
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/bin/dhcp4/json_config_parser.cc
View file @
886fa301
...
...
@@ -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
;
}
...
...
src/bin/dhcp6/json_config_parser.cc
View file @
886fa301
...
...
@@ -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
;
}
...
...
src/lib/dhcpsrv/srv_config.h
View file @
886fa301
...
...
@@ -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.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment