[#3074] adding UTs for option 121

diff --git a/doc/examples/kea4/all-options.json b/doc/examples/kea4/all-options.json
index 78aade714d7a2ddf133f3e43ec7d216d2e4e1d14..e0fac77b96a4b412a6a40ec980b84d209ad9d21e 100644 (file)
--- a/doc/examples/kea4/all-options.json
+++ b/doc/examples/kea4/all-options.json
@@ -1295,6 +1295,8 @@
         "name": "domain-search"
       },
 
+      // Option code 120 is not defined in Kea.
+
       /*
         Code Len Destination 1    Router 1
       +-----+---+----+-----+----+----+----+----+----+
@@ -1324,7 +1326,7 @@
         "name": "classless-static-route"
       },
 
-      // Option codes 120-123 are not defined in Kea.
+      // Option codes 122-123 are not defined in Kea.
 
       /*
                            1 1 1 1 1 1

diff --git a/src/lib/dhcp/option_classless_static_route.cc b/src/lib/dhcp/option_classless_static_route.cc
index b149b5d7c0c62e3c271c7981468522187cb60e32..75d13707ecc33b6ed1c52cd9adbe8f0e1fc4d380 100644 (file)
--- a/src/lib/dhcp/option_classless_static_route.cc
+++ b/src/lib/dhcp/option_classless_static_route.cc
@@ -55,12 +55,12 @@ OptionClasslessStaticRoute::unpack(OptionBufferConstIter begin, OptionBufferCons
         begin += V4ADDRESS_LEN;
 
         // Subnet mask e.g. 255.255.255.128
-        uint32_t subnet_mask = readUint32(ptr, distance(begin, end));
+        uint32_t subnet_mask = readUint32(ptr + V4ADDRESS_LEN, distance(begin, end));
         uint8_t mask_width = calcMaskWidth(subnet_mask);
         begin += V4ADDRESS_LEN;
 
         // Router IP address
-        auto router_addr = IOAddress(readUint32(ptr, distance(begin, end)));
+        auto router_addr = IOAddress(readUint32(ptr + (2 * V4ADDRESS_LEN), distance(begin, end)));
         begin += V4ADDRESS_LEN;
 
         StaticRouteTuple route = std::make_tuple(subnet_nr, mask_width, router_addr);
@@ -80,7 +80,7 @@ OptionClasslessStaticRoute::toText(int indent) const {
     for (const auto& route : static_routes_) {
         stream << ", Route " << ++i
                << " (subnet " << get<0>(route).toText() << "/"
-               << get<1>(route) << ", router IP "
+               << static_cast<int>(get<1>(route)) << ", router IP "
                << get<2>(route) << ")";
     }
 

diff --git a/src/lib/dhcp/tests/Makefile.am b/src/lib/dhcp/tests/Makefile.am
index 87416b823636386eaec70dc58fdbafb74858467d..8bcc1af637757135805d26c77d16d6f903416752 100644 (file)
--- a/src/lib/dhcp/tests/Makefile.am
+++ b/src/lib/dhcp/tests/Makefile.am
@@ -43,6 +43,7 @@ libdhcp___unittests_SOURCES += option_int_unittest.cc
 libdhcp___unittests_SOURCES += option_int_array_unittest.cc
 libdhcp___unittests_SOURCES += option_data_types_unittest.cc
 libdhcp___unittests_SOURCES += option_definition_unittest.cc
+libdhcp___unittests_SOURCES += option_classless_static_route_unittest.cc
 libdhcp___unittests_SOURCES += option_copy_unittest.cc
 libdhcp___unittests_SOURCES += option_custom_unittest.cc
 libdhcp___unittests_SOURCES += option_opaque_data_tuples_unittest.cc

diff --git a/src/lib/dhcp/tests/option_classless_static_route_unittest.cc b/src/lib/dhcp/tests/option_classless_static_route_unittest.cc
new file mode 100644 (file)
index 0000000..32a28eb
--- /dev/null
+++ b/src/lib/dhcp/tests/option_classless_static_route_unittest.cc
@@ -0,0 +1,81 @@
+// Copyright (C) 2023 Internet Systems Consortium, Inc. ("ISC")
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#include <config.h>
+
+#include <dhcp/option_classless_static_route.h>
+
+#include <gtest/gtest.h>
+
+using namespace isc::dhcp;
+using namespace isc::asiolink;
+
+namespace {
+
+// This test verifies constructor of the empty OptionClasslessStaticRoute class.
+TEST(OptionClasslessStaticRouteTest, emptyCtor) {
+    // Create option instance. Check that constructor doesn't throw.
+    OptionClasslessStaticRoutePtr option;
+    EXPECT_NO_THROW(option.reset(new OptionClasslessStaticRoute()));
+    ASSERT_TRUE(option);
+
+    // Check if member variables were correctly set by ctor.
+    EXPECT_EQ(Option::V4, option->getUniverse());
+    EXPECT_EQ(DHO_CLASSLESS_STATIC_ROUTE, option->getType());
+}
+
+TEST(OptionClasslessStaticRouteTest, emptyCtorAddOneRoute) {
+    // Create option instance. Check that constructor doesn't throw.
+    OptionClasslessStaticRoutePtr option;
+    EXPECT_NO_THROW(option.reset(new OptionClasslessStaticRoute()));
+    ASSERT_TRUE(option);
+
+    // Add one static route.
+    StaticRouteTuple route = std::make_tuple(IOAddress("0.0.0.0"), 0, IOAddress("10.198.122.1"));
+    option->addRoute(route);
+
+    // Expected len: 2 (option code + option len headers) + 5 (1 dest descriptor + 4 router addr).
+    EXPECT_EQ(7, option->len());
+
+    // Verify toText() is working fine.
+    EXPECT_EQ("type=121(CLASSLESS_STATIC_ROUTE), len=5, Route 1 (subnet 0.0.0.0/0,"
+              " router IP 10.198.122.1)",
+              option->toText());
+
+    // Check if member variables were correctly set by ctor.
+    EXPECT_EQ(Option::V4, option->getUniverse());
+    EXPECT_EQ(DHO_CLASSLESS_STATIC_ROUTE, option->getType());
+}
+
+TEST(OptionClasslessStaticRouteTest, bufferCtorWithOneRoute) {
+    // Prepare data to decode - one route with 0 mask width
+    const uint8_t buf_data[] = {
+        10, 0, 0, 0,    // subnet nr
+        255, 0, 0, 0,   // mask
+        10, 198, 122, 1 // router IP
+    };
+
+    OptionBuffer buf(buf_data, buf_data + sizeof(buf_data));
+
+    // Create option instance. Check that constructor doesn't throw.
+    OptionClasslessStaticRoutePtr option;
+    EXPECT_NO_THROW(option.reset(new OptionClasslessStaticRoute(buf.begin(), buf.end())));
+    ASSERT_TRUE(option);
+
+    // Expected len: 2 (option code + option len headers) + 6 (2 dest descriptor + 4 router addr).
+    EXPECT_EQ(8, option->len());
+
+    // Verify toText() is working fine.
+    EXPECT_EQ("type=121(CLASSLESS_STATIC_ROUTE), len=6, Route 1 (subnet 10.0.0.0/8,"
+              " router IP 10.198.122.1)",
+              option->toText());
+
+    // Check if member variables were correctly set by ctor.
+    EXPECT_EQ(Option::V4, option->getUniverse());
+    EXPECT_EQ(DHO_CLASSLESS_STATIC_ROUTE, option->getType());
+}
+
+}
\ No newline at end of file