mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-03 15:35:17 +00:00
Code Issues Releases Wiki Activity

[2317] Group configured options by their spaces.

Browse Source
This commit is contained in:
Marcin Siodelski
2013-01-10 13:27:52 +01:00
parent b82c412af1
commit beef799a01
1 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/bin/dhcp4/config_parser.cc
View File

@@ -77,10 +77,10 @@ typedef OptionSpaceContainer<OptionDefContainer,
/// no subnet object created yet to store them. /// no subnet object created yet to store them.
typedef std::vector<Pool4Ptr> PoolStorage; typedef std::vector<Pool4Ptr> PoolStorage;
/// @brief Collection of option descriptors. This container allows searching for /// Collection of containers holding option spaces. Each container within
/// options using the option code or persistency flag. This is useful when merging /// a particular option space holds so-called option descriptors.
/// existing options with newly configured options. typedef OptionSpaceContainer<Subnet::OptionContainer,
typedef Subnet::OptionContainer OptionStorage; Subnet::OptionDescriptor> OptionStorage;
/// @brief Global uint32 parameters that will be used as defaults. /// @brief Global uint32 parameters that will be used as defaults.
Uint32Storage uint32_defaults; Uint32Storage uint32_defaults;
@@ -690,7 +690,9 @@ public:
" thus there is nothing to commit. Has build() been called?"); " thus there is nothing to commit. Has build() been called?");
} }
uint16_t opt_type = option_descriptor_.option->getType(); uint16_t opt_type = option_descriptor_.option->getType();
Subnet::OptionContainerTypeIndex& idx = options_->get<1>(); Subnet::OptionContainerPtr options = options_->getItems(option_space_);
assert(options);
Subnet::OptionContainerTypeIndex& idx = options->get<1>();
// Try to find options with the particular option code in the main // Try to find options with the particular option code in the main
// storage. If found, remove these options because they will be // storage. If found, remove these options because they will be
// replaced with new one. // replaced with new one.
@@ -700,7 +702,7 @@ public:
idx.erase(range.first, range.second); idx.erase(range.first, range.second);
} }
// Append new option to the main storage. // Append new option to the main storage.
options_->push_back(option_descriptor_); options_->addItem(option_descriptor_, option_space_);
} }
/// @brief Set storage for the parser. /// @brief Set storage for the parser.
@@ -852,6 +854,8 @@ private:
<< ex.what()); << ex.what());
} }
} }
// All went good, so we can set the option space name.
option_space_ = option_space;
} }
/// Storage for uint32 values (e.g. option code). /// Storage for uint32 values (e.g. option code).
@@ -865,6 +869,8 @@ private:
OptionStorage* options_; OptionStorage* options_;
/// Option descriptor holds newly configured option. /// Option descriptor holds newly configured option.
Subnet::OptionDescriptor option_descriptor_; Subnet::OptionDescriptor option_descriptor_;
/// Option space name where the option belongs to.
std::string option_space_;
}; };
/// @brief Parser for option data values within a subnet. /// @brief Parser for option data values within a subnet.
@@ -1354,14 +1360,21 @@ private:
Subnet::OptionContainerPtr options = subnet_->getOptionDescriptors("dhcp4"); Subnet::OptionContainerPtr options = subnet_->getOptionDescriptors("dhcp4");
const Subnet::OptionContainerTypeIndex& idx = options->get<1>(); const Subnet::OptionContainerTypeIndex& idx = options->get<1>();
// Add subnet specific options. // We have to get all option space names for options we are
BOOST_FOREACH(Subnet::OptionDescriptor desc, options_) { // configuring and iterate over them to add options that belong
Subnet::OptionContainerTypeRange range = idx.equal_range(desc.option->getType()); // to them to the subnet.
if (std::distance(range.first, range.second) > 0) { BOOST_FOREACH(std::string option_space, options_.getOptionSpaceNames()) {
BOOST_FOREACH(Subnet::OptionDescriptor desc, *options_.getItems(option_space)) {
assert(desc.option);
Subnet::OptionDescriptor existing_desc =
subnet_->getOptionDescriptor("option_space",
desc.option->getType());
if (existing_desc.option) {
LOG_WARN(dhcp4_logger, DHCP4_CONFIG_OPTION_DUPLICATE) LOG_WARN(dhcp4_logger, DHCP4_CONFIG_OPTION_DUPLICATE)
.arg(desc.option->getType()).arg(addr.toText()); .arg(desc.option->getType()).arg(addr.toText());
} }
subnet_->addOption(desc.option, false, "dhcp4"); subnet_->addOption(desc.option, false, option_space);
}
} }
// Check all global options and add them to the subnet object if // Check all global options and add them to the subnet object if