diff options
author | Thomas Markwalder <tmark@isc.org> | 2023-02-08 15:41:57 +0100 |
---|---|---|
committer | Thomas Markwalder <tmark@isc.org> | 2023-02-10 19:59:00 +0100 |
commit | 7c41640ad923e69fa0bab7d3c952704f7e132e7f (patch) | |
tree | 5084bb4cd69bf21e0135bcb619a89fdc18455244 /src/lib/dhcpsrv/subnet.h | |
parent | [#2702] remove link dependencies to fix ODR (diff) | |
download | kea-7c41640ad923e69fa0bab7d3c952704f7e132e7f.tar.xz kea-7c41640ad923e69fa0bab7d3c952704f7e132e7f.zip |
[#2677] Ignore invalid renew-timer values
src/lib/dhcpsrv/dhcpsrv_messages.*
DHCPSRV_CFGMGR_RENEW_GTR_REBIND - new message
src/lib/dhcpsrv/network.h
Added Network::getLabel()
src/lib/dhcpsrv/parsers/base_network_parser.cc
BaseNetworkParser::parseCommon() - log renew > rebind
rather than throw
src/lib/dhcpsrv/parsers/dhcp_parsers.cc
Subnet4ConfigParser::initSubnet() - removed duplicate timer check
Subnet6ConfigParser::initSubnet() - removed duplicate timer check
src/lib/dhcpsrv/shared_network.h
Added SharedNetwork4::getLabel()
Added SharedNetwork6::getLabel()
src/lib/dhcpsrv/subnet.h
Added Subnet::getLabel()
src/lib/dhcpsrv/tests/cfg_subnets4_unittest.cc
TEST_F(Subnet4ParserTest, parseWithInvalidRenewRebind) - new test
src/lib/dhcpsrv/tests/cfg_subnets6_unittest.cc
TEST_F(Subnet4ParserTest, parseWithInvalidRenewRebind) - new test
src/lib/dhcpsrv/tests/shared_network_parser_unittest.cc
Updated tests
Diffstat (limited to 'src/lib/dhcpsrv/subnet.h')
-rw-r--r-- | src/lib/dhcpsrv/subnet.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/lib/dhcpsrv/subnet.h b/src/lib/dhcpsrv/subnet.h index 0521a5fbee..3e0291a4d5 100644 --- a/src/lib/dhcpsrv/subnet.h +++ b/src/lib/dhcpsrv/subnet.h @@ -422,6 +422,12 @@ protected: /// @return A pointer to unparsed subnet configuration. virtual data::ElementPtr toElement() const; + virtual std::string getLabel() const { + std::stringstream ss; + ss << "subnet-id " << id_; + return (ss.str()); + } + /// @brief Converts subnet prefix to a pair of prefix/length pair. /// /// IPv4 and IPv6 specific conversion functions should apply extra checks |