mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 21:45:37 +00:00
Code Issues Releases Wiki Activity

[#490,!284] Addressed review comments.

Browse Source
This commit is contained in:
Marcin Siodelski
2019-03-27 19:31:17 +01:00
parent aa61dcb0f8
commit 92e514ebd7
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/bin/dhcp4/json_config_parser.cc
View File

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

3
src/bin/dhcp6/json_config_parser.cc
View File

@@ -451,9 +451,6 @@ configureDhcp6Server(Dhcpv6Srv& server, isc::data::ConstElementPtr config_set,
// Get the staging configuration. // Get the staging configuration.
srv_config = CfgMgr::instance().getStagingCfg(); 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. // Set all default values if not specified by the user.
SimpleParser6::setAllDefaults(mutable_cfg); SimpleParser6::setAllDefaults(mutable_cfg);

6
src/lib/dhcpsrv/network.h
View File

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

4
src/lib/dhcpsrv/shared_network.h
View File

@@ -39,8 +39,8 @@ struct SharedNetworkModificationTimeIndexTag { };
/// @brief Shared network holding IPv4 subnets. /// @brief Shared network holding IPv4 subnets.
/// ///
/// Specialization of the @ref Network4 class for IPv4 shared networks. /// Specialization of the @ref Network4 class for IPv4 shared networks.
class SharedNetwork4 : public virtual Network4, class SharedNetwork4 : public virtual Network4,
public boost::enable_shared_from_this<SharedNetwork4> { public boost::enable_shared_from_this<SharedNetwork4> {
public: public:
/// @brief Constructor. /// @brief Constructor.