mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-31 14:05:33 +00:00
Code Issues Releases Wiki Activity

[#2725] removed strict check

Browse Source
This commit is contained in:
Razvan Becheriu
2023-06-29 19:14:27 +03:00
parent f3706a575e
commit 141d9fca88
4 changed files with 0 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/dhcpsrv/host.cc
View File

@@ -107,16 +107,6 @@ IPv6Resrv::set(const Type& type, const asiolink::IOAddress& prefix,
<< static_cast<int>(prefix_len)
<< "' for reserved IPv6 address, expected 128");
}
/* uncomment if strict prefix and prefix length is required. see #2943
else if ((type == TYPE_PD) && (prefix_len != 128)) {
IOAddress first_address = firstAddrInPrefix(prefix, prefix_len);
if (first_address != prefix) {
isc_throw(BadValue, "Invalid host address boundaries: " << prefix
<< " is not the first address in prefix: " << first_address
<< "/" << static_cast<uint32_t>(prefix_len));
}
}
*/
type_ = type;
prefix_ = prefix;

20
src/lib/dhcpsrv/lease.cc
View File

@@ -462,16 +462,6 @@ Lease6::Lease6(Lease::Type type, const isc::asiolink::IOAddress& addr,
if (type != Lease::TYPE_PD) {
isc_throw(BadValue, "prefixlen must be 128 for non prefix type");
}
/* uncomment if strict prefix and prefix length is required. see #2943
else {
IOAddress first_address = firstAddrInPrefix(addr, prefixlen);
if (first_address != addr) {
isc_throw(BadValue, "Invalid lease address boundaries: " << addr
<< " is not the first address in prefix: " << first_address
<< "/" << static_cast<uint32_t>(prefixlen));
}
}
*/
}
cltt_ = time(NULL);
@@ -497,16 +487,6 @@ Lease6::Lease6(Lease::Type type, const isc::asiolink::IOAddress& addr,
if (type != Lease::TYPE_PD) {
isc_throw(BadValue, "prefixlen must be 128 for non prefix type");
}
/* uncomment if strict prefix and prefix length is required. see #2943
else {
IOAddress first_address = firstAddrInPrefix(addr, prefixlen);
if (first_address != addr) {
isc_throw(BadValue, "Invalid lease address boundaries: " << addr
<< " is not the first address in prefix: " << first_address
<< "/" << static_cast<uint32_t>(prefixlen));
}
}
*/
}
cltt_ = time(NULL);

16
src/lib/dhcpsrv/tests/host_unittest.cc
View File

@@ -86,14 +86,6 @@ TEST(IPv6ResrvTest, constructiorInvalidPrefixLength) {
EXPECT_THROW_MSG(IPv6Resrv(IPv6Resrv::TYPE_NA,
IOAddress("2001:db8:1::"), 64),
isc::BadValue, expected);
/* uncomment if strict prefix and prefix length is required. see #2943
// Check for extra specified bits in prefix.
expected = "Invalid host address boundaries: 2001:db8:1:: is not the first "
"address in prefix: 2001:db8::/32";
EXPECT_THROW_MSG(IPv6Resrv(IPv6Resrv::TYPE_PD,
IOAddress("2001:db8:1::"), 32),
isc::BadValue, expected);
*/
}
// This test verifies that it is possible to modify prefix and its
@@ -124,14 +116,6 @@ TEST(IPv6ResrvTest, setPrefix) {
EXPECT_THROW_MSG(resrv.set(IPv6Resrv::TYPE_PD,
IOAddress("2001:db8:1::"), 129),
isc::BadValue, expected);
/* uncomment if strict prefix and prefix length is required. see #2943
// Check for extra specified bits in prefix.
expected = "Invalid host address boundaries: 2001:db8:1:: is not the first "
"address in prefix: 2001:db8::/32";
EXPECT_THROW_MSG(resrv.set(IPv6Resrv::TYPE_PD,
IOAddress("2001:db8:1::"), 32),
isc::BadValue, expected);
*/
}
// This test checks that the equality operators work fine.

16
src/lib/dhcpsrv/tests/lease_unittest.cc
View File

@@ -657,22 +657,6 @@ TEST(Lease6Test, constructorDefault) {
subnet_id, true, true, "", HWAddrPtr())),
BadValue, "DUID is mandatory for an IPv6 lease");
/* uncomment if strict prefix and prefix length is required. see #2943
// Lease6 must have a valid prefix and prefix length.
addr = IOAddress(ADDRESS[5]);
EXPECT_THROW_MSG(lease2.reset(new Lease6(Lease::TYPE_PD, addr,
duid, iaid, 100, 200,
subnet_id, HWAddrPtr(), 16)),
BadValue, "Invalid lease address boundaries: 8000::1 is not "
"the first address in prefix: 8000::/16");
EXPECT_THROW_MSG(lease2.reset(new Lease6(Lease::TYPE_PD, addr,
duid, iaid, 100, 200,
subnet_id, true, true, "", HWAddrPtr(), 16)),
BadValue, "Invalid lease address boundaries: 8000::1 is not "
"the first address in prefix: 8000::/16");
*/
// Lease6 must have a prefixlen set to 128 for non prefix type.
addr = IOAddress(ADDRESS[4]);
EXPECT_THROW_MSG(lease2.reset(new Lease6(Lease::TYPE_NA, addr,