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

[#2266] addressed review comments

Browse Source
This commit is contained in:
Razvan Becheriu 2022-06-23 19:15:05 +03:00
parent 74ee158d36
commit bcd7c48a62
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/sphinx/arm/hooks-subnet-cmds.rst
View File

@ -572,8 +572,8 @@ A successful response may look like this:
The ``subnet4-delta-add`` Command
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This command is used to update by adding or overwriting parts of a single subnet
in the existing server configuration. This operation has no impact on other
This command is used to update a subnet by adding or overwriting its parts in
the existing server configuration. This operation has no impact on other
subnets. The subnet identifier is used to identify the subnet to update; it must
be specified and must be unique among all subnets. The subnet prefix should not
be updated.
@ -649,8 +649,8 @@ level option 4 ("time-servers").
The ``subnet6-delta-add`` Command
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This command is used to update by adding or overwriting parts of a single subnet
in the existing server configuration. This operation has no impact on other
This command is used to update a subnet by adding or overwriting its parts in
the existing server configuration. This operation has no impact on other
subnets. The subnet identifier is used to identify the subnet to update; it must
be specified and must be unique among all subnets. The subnet prefix should not
be updated.
@ -745,8 +745,8 @@ level option 22 ("sip-server-addr").
The ``subnet4-delta-del`` Command
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This command is used to update by removing parts of a single subnet in the
existing server configuration. This operation has no impact on other subnets.
This command is used to update a subnet by removing its parts in the existing
server configuration. This operation has no impact on other subnets.
The subnet identifier is used to identify the subnet to update; it must be
specified and must be unique among all subnets. The subnet prefix should not be
updated.
@ -818,8 +818,8 @@ lifetime, removing the subnet level option 3 ("routers"), by removing the pool
The ``subnet6-delta-del`` Command
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
This command is used to update by removing parts of a single subnet in the
existing server configuration. This operation has no impact on other subnets.
This command is used to update a subnet by removing its parts in the existing
server configuration. This operation has no impact on other subnets.
The subnet identifier is used to identify the subnet to update; it must be
specified and must be unique among all subnets. The subnet prefix should not be
updated.

2
src/lib/cc/data.cc
View File

@ -1218,6 +1218,7 @@ mergeDiffDel(ElementPtr& element, ElementPtr& other,
if (element->getType() == Element::list) {
for (auto const& value : other->listValue()) {
ElementPtr mutable_right = boost::const_pointer_cast<Element>(value);
for (uint32_t iter = 0; iter < element->listValue().size();) {
bool removed = false;
// Check if we have any description of the key in the
@ -1225,7 +1226,6 @@ mergeDiffDel(ElementPtr& element, ElementPtr& other,
auto f = hierarchy[idx].find(key);
if (f != hierarchy[idx].end()) {
ElementPtr mutable_left = boost::const_pointer_cast<Element>(element->listValue().at(iter));
ElementPtr mutable_right = boost::const_pointer_cast<Element>(value);
// Check if the elements refer to the same configuration
// entity.
if (f->second.match_(mutable_left, mutable_right)) {