mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-05 00:15:17 +00:00
Code Issues Releases Wiki Activity

[#32,!23] - Added server-tag global to SrvConfig and kea-dhcp4/6

Browse Source 
src/bin/dhcp4/dhcp4_lexer.ll
src/bin/dhcp4/dhcp4_parser.yy
src/bin/dhcp4/json_config_parser.cc
    added server-tag

src/bin/dhcp4/tests/config_parser_unittest.cc
    TEST_F(Dhcp4ParserTest, serverTag) - new test

src/bin/dhcp6/dhcp6_lexer.ll
src/bin/dhcp6/dhcp6_parser.yy
src/bin/dhcp6/json_config_parser.cc
    added server-tag

src/bin/dhcp6/tests/config_parser_unittest.cc
    TEST_F(Dhcp6ParserTest, serverTag)

src/lib/dhcpsrv/parsers/simple_parser4.cc
src/lib/dhcpsrv/parsers/simple_parser6.cc
    Added server-tag to global defaults

src/lib/dhcpsrv/srv_config.cc
    Added server_tag_ memger to SrvConfig

src/lib/dhcpsrv/tests/srv_config_unittest.cc
    TEST_F(SrvConfigTest, serverTag)
    TEST_F(SrvConfigTest, unparseConfigControlInfo6) - new tests
This commit is contained in:
Thomas Markwalder
2018-10-01 14:17:59 -04:00
parent dbef8eac8e
commit 7fd4a5c044
19 changed files with 6204 additions and 5913 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -99,6 +99,10 @@ public:
if (user_context) {
cfg->setContext(user_context);
}
// Set the server's logical name
std::string server_tag = getString(global, "server-tag");
cfg->setServerTag(server_tag);
}
/// @brief Copies subnets from shared networks to regular subnets container
@@ -518,7 +522,8 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
(config_pair.first == "match-client-id") ||
(config_pair.first == "next-server") ||
(config_pair.first == "server-hostname") ||
(config_pair.first == "boot-file-name")) {
(config_pair.first == "boot-file-name") ||
(config_pair.first == "server-tag")) {
continue;
}