[#488,!259] Updated get_config_unittests for v4.

diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc
index 6a10212aee288b84de9898481198862066c75fd5..ca0f38d1a29a4faab924720eddccf9694fbba8c3 100644 (file)
--- a/src/bin/dhcp4/tests/get_config_unittest.cc
+++ b/src/bin/dhcp4/tests/get_config_unittest.cc
@@ -8359,6 +8359,7 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"interface\": \"\",\n"
 "                \"match-client-id\": true,\n"
 "                \"name\": \"foo\",\n"
+"                \"next-server\": \"0.0.0.0\",\n"
 "                \"option-data\": [ ],\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"
@@ -8644,6 +8645,7 @@ const char* UNPARSED_CONFIGS[] = {
 "                \"interface\": \"\",\n"
 "                \"match-client-id\": true,\n"
 "                \"name\": \"foo\",\n"
+"                \"next-server\": \"0.0.0.0\",\n"
 "                \"option-data\": [ ],\n"
 "                \"relay\": {\n"
 "                    \"ip-addresses\": [ ]\n"

diff --git a/src/lib/dhcpsrv/network.cc b/src/lib/dhcpsrv/network.cc
index 8666f63e3e9b03de4f699b27db292d3bf100dda1..55f2ff24c5c3f2061c530b2763f3d121baa37eca 100644 (file)
--- a/src/lib/dhcpsrv/network.cc
+++ b/src/lib/dhcpsrv/network.cc
@@ -214,7 +214,7 @@ Network4::setSiaddr(const Optional<IOAddress>& siaddr) {
     siaddr_ = siaddr;
 }
 
-Optional<IOAddress>
+const Optional<IOAddress>&
 Network4::getSiaddr() const {
     return (siaddr_);
 }

diff --git a/src/lib/dhcpsrv/network.h b/src/lib/dhcpsrv/network.h
index e864509e7ed31675ee0809c2643a745bea0029be..7e68a30dbf3bd6e13f20dacd313135e067f0da42 100644 (file)
--- a/src/lib/dhcpsrv/network.h
+++ b/src/lib/dhcpsrv/network.h
@@ -464,7 +464,7 @@ public:
     /// @brief Returns siaddr for this network.
     ///
     /// @return siaddr value
-    util::Optional<asiolink::IOAddress> getSiaddr() const;
+    const util::Optional<asiolink::IOAddress>& getSiaddr() const;
 
     /// @brief Sets server hostname for the network.
     ///