[#490,!284] Addressed review comments.

diff --git a/src/bin/dhcp4/json_config_parser.cc b/src/bin/dhcp4/json_config_parser.cc
index f3f32e04544119f906717e9acf455db9af641930..05f10d1cbd4b21c5a4741dba8446ccd33fed0aa0 100644 (file)
--- a/src/bin/dhcp4/json_config_parser.cc
+++ b/src/bin/dhcp4/json_config_parser.cc
@@ -343,9 +343,6 @@ configureDhcp4Server(Dhcpv4Srv& server, isc::data::ConstElementPtr config_set,
         // Get the staging configuration
         srv_cfg = CfgMgr::instance().getStagingCfg();
 
-        // Preserve all scalar global parameters
-        srv_cfg->extractConfiguredGlobals(config_set);
-
         // This is a way to convert ConstElementPtr to ElementPtr.
         // We need a config that can be edited, because we will insert
         // default values and will insert derived values as well.

diff --git a/src/bin/dhcp6/json_config_parser.cc b/src/bin/dhcp6/json_config_parser.cc
index 2f9a07c9609b193f0cae5618433c2535fed4919b..c3b1562e0f699e50bd23b2f5b254cfd8c4fa79d1 100644 (file)
--- a/src/bin/dhcp6/json_config_parser.cc
+++ b/src/bin/dhcp6/json_config_parser.cc
@@ -451,9 +451,6 @@ configureDhcp6Server(Dhcpv6Srv& server, isc::data::ConstElementPtr config_set,
         // Get the staging configuration.
         srv_config = CfgMgr::instance().getStagingCfg();
 
-        // Preserve all scalar global parameters
-        srv_config->extractConfiguredGlobals(config_set);
-
         // Set all default values if not specified by the user.
         SimpleParser6::setAllDefaults(mutable_cfg);
 

diff --git a/src/lib/dhcpsrv/network.h b/src/lib/dhcpsrv/network.h
index 39646c8929347cd78c76e9facae4fdbafa0e4bb9..9a0f8701be9281ad6eb32f511cdfd78934493a55 100644 (file)
--- a/src/lib/dhcpsrv/network.h
+++ b/src/lib/dhcpsrv/network.h
@@ -106,8 +106,10 @@ typedef std::function<data::ConstElementPtr()> FetchNetworkGlobalsFn;
 /// change the existing server logic.
 ///
 /// The @c Network object now holds the pointer to the "parent" @c Network
-/// object. The parent network is a shared network. The object having
-/// a parent is a subnet. The subnet may or may not have a parent.
+/// object. Thus subnets which belong to a shared network will have
+/// that shared network as its parent. Stand-alone subnets, will have
+/// no parent.
+///
 /// The general idea is that the accessor functions of the network
 /// will first check if the accessed value is specified or not (that
 /// is handled by @c util::Optional object). If the value is specified

diff --git a/src/lib/dhcpsrv/shared_network.h b/src/lib/dhcpsrv/shared_network.h
index 185c27f01e8a8cf90e2653bcc82def2ff6a2d6c8..c73588ec2a23303b6edfe6cf7ba3c0270489f41d 100644 (file)
--- a/src/lib/dhcpsrv/shared_network.h
+++ b/src/lib/dhcpsrv/shared_network.h
@@ -39,8 +39,8 @@ struct SharedNetworkModificationTimeIndexTag { };
 /// @brief Shared network holding IPv4 subnets.
 ///
 /// Specialization of the @ref Network4 class for IPv4 shared networks.
-    class SharedNetwork4 : public virtual Network4,
-                           public boost::enable_shared_from_this<SharedNetwork4> {
+class SharedNetwork4 : public virtual Network4,
+                       public boost::enable_shared_from_this<SharedNetwork4> {
 public:
 
     /// @brief Constructor.