From d3b33058651036be34200f16d2da230267415056 Mon Sep 17 00:00:00 2001 From: Marcin Siodelski Date: Wed, 6 Mar 2019 17:29:53 +0100 Subject: [PATCH] [#488,!259] Updated get_config_unittests for v4. --- src/bin/dhcp4/tests/get_config_unittest.cc | 2 ++ src/lib/dhcpsrv/network.cc | 2 +- src/lib/dhcpsrv/network.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/bin/dhcp4/tests/get_config_unittest.cc b/src/bin/dhcp4/tests/get_config_unittest.cc index 6a10212aee..ca0f38d1a2 100644 --- 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 8666f63e3e..55f2ff24c5 100644 --- a/src/lib/dhcpsrv/network.cc +++ b/src/lib/dhcpsrv/network.cc @@ -214,7 +214,7 @@ Network4::setSiaddr(const Optional& siaddr) { siaddr_ = siaddr; } -Optional +const Optional& Network4::getSiaddr() const { return (siaddr_); } diff --git a/src/lib/dhcpsrv/network.h b/src/lib/dhcpsrv/network.h index e864509e7e..7e68a30dbf 100644 --- 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 getSiaddr() const; + const util::Optional& getSiaddr() const; /// @brief Sets server hostname for the network. /// -- 2.47.2