mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 13:37:55 +00:00
Code Issues Releases Wiki Activity

[#1858] addressed comments

Browse Source
This commit is contained in:
Razvan Becheriu
2021-06-11 15:16:42 +03:00
parent 63249ec632
commit d3350a9dae
2 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/lib/dhcp/option_data_types.cc
View File

@@ -522,13 +522,13 @@ OptionDataTypeUtil::readPsid(const std::vector<uint8_t>& buf) {
// We need to check that the PSID value does not exceed the maximum value
// for a specified PSID length. That means that all bits placed further than
// psid_len from the left must be set to 0. So, we create a bit mask by
// shifting a value of 0xFFFF to the right by psid_len. This leaves us with
// psid_len leftmost bits unset and the rest set. Next, we apply the mask on
// the PSID value from the buffer and make sure the result is 0. Otherwise,
// it means that there are some bits set in the PSID which aren't supposed
// to be set.
if ((psid_len > 0) && ((psid & (0xFFFFU >> psid_len)) != 0)) {
// psid_len from the left must be set to 0.
std::vector<uint16_t> mask = { 0x8000, 0xc000, 0xe000,
0xf000, 0xf800, 0xfc00, 0xfe00,
0xff00, 0xff80, 0xffc0, 0xffe0,
0xfff0, 0xfff8, 0xfffc, 0xfffe };
if ((psid_len > 0) && (psid_len < (sizeof(uint16_t) * 8)) &&
((psid & static_cast<uint16_t>(~mask[psid_len - 1])) != 0)) {
isc_throw(BadDataTypeCast, "invalid PSID value " << psid
<< " for a specified PSID length "
<< static_cast<unsigned>(psid_len));

36
src/lib/dhcp/tests/option_custom_unittest.cc
View File

@@ -679,7 +679,7 @@ TEST_F(OptionCustomTest, psidData) {
// The PSID comprises a PSID length and PSID value.
EXPECT_EQ(4, psid.first.asUnsigned());
EXPECT_EQ(0x8, psid.second.asUint16());
EXPECT_EQ(8, psid.second.asUint16());
// Parsed option should have one suboption.
EXPECT_TRUE(hasV6Suboption(option.get()));
@@ -1058,17 +1058,17 @@ TEST_F(OptionCustomTest, psidDataArray) {
ASSERT_NO_THROW(psid1 = option->readPsid(1));
ASSERT_NO_THROW(psid2 = option->readPsid(2));
// PSID value is equal to '1000b' (0x8).
// PSID value is equal to '1000b' (8).
EXPECT_EQ(4, psid0.first.asUnsigned());
EXPECT_EQ(0x8, psid0.second.asUint16());
EXPECT_EQ(8, psid0.second.asUint16());
// PSID value is equal to '110101b' (0x35).
// PSID value is equal to '110101b' (53).
EXPECT_EQ(6, psid1.first.asUnsigned());
EXPECT_EQ(0x35, psid1.second.asUint16());
EXPECT_EQ(53, psid1.second.asUint16());
// PSID value is equal to '1b' (0x1).
// PSID value is equal to '1b' (1).
EXPECT_EQ(1, psid2.first.asUnsigned());
EXPECT_EQ(0x1, psid2.second.asUint16());
EXPECT_EQ(1, psid2.second.asUint16());
}
// The purpose of this test is to verify that the data from a buffer
@@ -1280,7 +1280,7 @@ TEST_F(OptionCustomTest, recordData) {
PSIDTuple value5;
ASSERT_NO_THROW(value5 = option->readPsid(5));
EXPECT_EQ(6, value5.first.asUnsigned());
EXPECT_EQ(0x35, value5.second.asUint16());
EXPECT_EQ(53, value5.second.asUint16());
// Verify value in the field 6.
std::string value6;
@@ -1366,7 +1366,7 @@ TEST_F(OptionCustomTest, recordArrayData) {
PSIDTuple value5;
ASSERT_NO_THROW(value5 = option->readPsid(5));
EXPECT_EQ(6, value5.first.asUnsigned());
EXPECT_EQ(0x35, value5.second.asUint16());
EXPECT_EQ(53, value5.second.asUint16());
// Verify value in the field 6.
uint32_t value6;
@@ -1615,7 +1615,7 @@ TEST_F(OptionCustomTest, setPsidData) {
PSIDTuple psid;
ASSERT_NO_THROW(psid = option->readPsid());
EXPECT_EQ(0, psid.first.asUnsigned());
EXPECT_EQ(0x0, psid.second.asUint16());
EXPECT_EQ(0, psid.second.asUint16());
// Write PSID.
ASSERT_NO_THROW(option->writePsid(PSIDLen(4), PSID(8)));
@@ -1623,7 +1623,7 @@ TEST_F(OptionCustomTest, setPsidData) {
// Read PSID back and make sure it is the one we just set.
ASSERT_NO_THROW(psid = option->readPsid());
EXPECT_EQ(4, psid.first.asUnsigned());
EXPECT_EQ(0x8, psid.second.asUint16());
EXPECT_EQ(8, psid.second.asUint16());
}
// The purpose of this test is to verify that an option comprising
@@ -1861,19 +1861,19 @@ TEST_F(OptionCustomTest, setPSIDPrefixArray) {
ASSERT_NO_THROW({
PSIDTuple psid0 = option->readPsid(0);
EXPECT_EQ(4, psid0.first.asUnsigned());
EXPECT_EQ(0x1, psid0.second.asUint16());
EXPECT_EQ(1, psid0.second.asUint16());
});
ASSERT_NO_THROW({
PSIDTuple psid1 = option->readPsid(1);
EXPECT_EQ(0, psid1.first.asUnsigned());
EXPECT_EQ(0x0, psid1.second.asUint16());
EXPECT_EQ(0, psid1.second.asUint16());
});
ASSERT_NO_THROW({
PSIDTuple psid2 = option->readPsid(2);
EXPECT_EQ(1, psid2.first.asUnsigned());
EXPECT_EQ(0x1, psid2.second.asUint16());
EXPECT_EQ(1, psid2.second.asUint16());
});
}
@@ -2060,7 +2060,7 @@ TEST_F(OptionCustomTest, setRecordData) {
PSIDTuple value5;
ASSERT_NO_THROW(value5 = option->readPsid(5));
EXPECT_EQ(0, value5.first.asUnsigned());
EXPECT_EQ(0x0, value5.second.asUint16());
EXPECT_EQ(0, value5.second.asUint16());
PrefixTuple value6(ZERO_PREFIX_TUPLE);
ASSERT_NO_THROW(value6 = option->readPrefix(6));
EXPECT_EQ(0, value6.first.asUnsigned());
@@ -2097,7 +2097,7 @@ TEST_F(OptionCustomTest, setRecordData) {
EXPECT_EQ("2001:db8:1::100", value4.toText());
ASSERT_NO_THROW(value5 = option->readPsid(5));
EXPECT_EQ(4, value5.first.asUnsigned());
EXPECT_EQ(0x8, value5.second.asUint16());
EXPECT_EQ(8, value5.second.asUint16());
ASSERT_NO_THROW(value6 = option->readPrefix(6));
EXPECT_EQ(48, value6.first.asUnsigned());
EXPECT_EQ("2001:db8:1::", value6.second.toText());
@@ -2151,7 +2151,7 @@ TEST_F(OptionCustomTest, setRecordArrayData) {
PSIDTuple value5;
ASSERT_NO_THROW(value5 = option->readPsid(5));
EXPECT_EQ(0, value5.first.asUnsigned());
EXPECT_EQ(0x0, value5.second.asUint16());
EXPECT_EQ(0, value5.second.asUint16());
PrefixTuple value6(ZERO_PREFIX_TUPLE);
ASSERT_NO_THROW(value6 = option->readPrefix(6));
EXPECT_EQ(0, value6.first.asUnsigned());
@@ -2191,7 +2191,7 @@ TEST_F(OptionCustomTest, setRecordArrayData) {
EXPECT_EQ("2001:db8:1::100", value4.toText());
ASSERT_NO_THROW(value5 = option->readPsid(5));
EXPECT_EQ(4, value5.first.asUnsigned());
EXPECT_EQ(0x8, value5.second.asUint16());
EXPECT_EQ(8, value5.second.asUint16());
ASSERT_NO_THROW(value6 = option->readPrefix(6));
EXPECT_EQ(48, value6.first.asUnsigned());
EXPECT_EQ("2001:db8:1::", value6.second.toText());