From: Marcin Siodelski <marcin@isc.org>
Date: Wed, 9 Dec 2020 14:30:30 +0000 (+0100)
Subject: [#652] Addressed review comments
X-Git-Tag: Kea-1.9.3~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=033a0e1d679589ec6e76ecf136c5542833a5755d;p=thirdparty%2Fkea.git

[#652] Addressed review comments

Fixed a typo and small impl change in network.
---

diff --git a/src/lib/dhcpsrv/network.cc b/src/lib/dhcpsrv/network.cc
index 8aeb6d58a8..5fc4f86c66 100644
--- a/src/lib/dhcpsrv/network.cc
+++ b/src/lib/dhcpsrv/network.cc
@@ -363,9 +363,8 @@ Network6::toElement() const {
     }
 
     // Set interface-id
-    const OptionPtr& ifaceid = getInterfaceId(Network::Inheritance::NONE);
-    if (ifaceid) {
-        std::vector<uint8_t> bin = ifaceid->getData();
+    if (interface_id_) {
+        std::vector<uint8_t> bin = interface_id_->getData();
         std::string ifid;
         ifid.resize(bin.size());
         if (!bin.empty()) {
diff --git a/src/lib/dhcpsrv/tests/shared_network_unittest.cc b/src/lib/dhcpsrv/tests/shared_network_unittest.cc
index 1bf24e78e1..0f407a226d 100644
--- a/src/lib/dhcpsrv/tests/shared_network_unittest.cc
+++ b/src/lib/dhcpsrv/tests/shared_network_unittest.cc
@@ -1346,7 +1346,7 @@ TEST(SharedNetwork6Test, unparse) {
     subnet2->addRelayAddress(IOAddress("2001:db8:1::8"));
 
     // Set subnet specific interface-id for subnet2. This is to ensure that
-    // the subnet specific value is not overriden by shared network specific
+    // the subnet specific value is not overridden by shared network specific
     // value.
     std::string subnet_interface_id_value = "vlan222";
     OptionBuffer subnet_iface_id_buffer(subnet_interface_id_value.begin(),