From: Razvan Becheriu Date: Mon, 14 Mar 2022 18:20:20 +0000 (+0200) Subject: [#2249] addressed comments X-Git-Tag: Kea-2.1.4~36 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bdd4db1ded388ab9ac01247d8baffbe3ddde4592;p=thirdparty%2Fkea.git [#2249] addressed comments --- diff --git a/ChangeLog b/ChangeLog index a02e7a1d46..eafb538213 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,7 +6,7 @@ ``true`` and it defaults to ``false`` if not configured. (Gitlab #2249) -1999. [func] tmark, razvan +1999. [func] tmark, razvan The kea-dhcp6 server fully supports using PostgreSQL for config back end. This should be considered an experimental feature. (Gitlab #2355) diff --git a/doc/examples/kea4/all-keys.json b/doc/examples/kea4/all-keys.json index 808358fbd0..8f404fd3dc 100644 --- a/doc/examples/kea4/all-keys.json +++ b/doc/examples/kea4/all-keys.json @@ -458,9 +458,9 @@ // Boolean parameter which controls whether an early global host // reservations lookup should be performed. This lookup takes place // before subnet selection and when a global reservation is found - // with some client classes triggers a second phase classification. - // It can be used too to drop queries using host reservations as - // a decision table indexed by reservation identifiers. + // with some client classes, it triggers a second phase classification. + // It can also be used to drop queries using host reservations as a + // decision table indexed by reservation identifiers. "early-global-reservations-lookup": true, // Boolean parameter which controls DHCP server's behavior with respect diff --git a/doc/examples/kea6/all-keys.json b/doc/examples/kea6/all-keys.json index 68356bb7b4..f05126e346 100644 --- a/doc/examples/kea6/all-keys.json +++ b/doc/examples/kea6/all-keys.json @@ -401,9 +401,9 @@ // Boolean parameter which controls whether an early global host // reservations lookup should be performed. This lookup takes place // before subnet selection and when a global reservation is found - // with some client classes triggers a second phase classification. - // It can be used too to drop queries using host reservations as - // a decision table indexed by reservation identifiers. + // with some client classes, it triggers a second phase classification. + // It can also be used to drop queries using host reservations as a + // decision table indexed by reservation identifiers. "early-global-reservations-lookup": true, // Boolean parameter which controls DHCP server's behavior with respect diff --git a/src/bin/dhcp4/tests/classify_unittest.cc b/src/bin/dhcp4/tests/classify_unittest.cc index 7c8d2d6a43..2d06a4985e 100644 --- a/src/bin/dhcp4/tests/classify_unittest.cc +++ b/src/bin/dhcp4/tests/classify_unittest.cc @@ -1436,7 +1436,7 @@ TEST_F(ClassifyTest, earlyDrop) { // Send the discover. client2.doDiscover(); - // Not matchine so not dropped. + // Not matching so not dropped. EXPECT_TRUE(client2.getContext().response_); } diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc index 01ce154d94..98f5ce5ebe 100644 --- a/src/bin/dhcp6/dhcp6_srv.cc +++ b/src/bin/dhcp6/dhcp6_srv.cc @@ -3945,7 +3945,7 @@ Dhcpv6Srv::requiredClassify(const Pkt6Ptr& pkt, AllocEngine::ClientContext6& ctx // Followed by the subnet const ClientClasses& to_add = subnet->getRequiredClasses(); for (ClientClasses::const_iterator cclass = to_add.cbegin(); - cclass != to_add.cend(); ++cclass) { + cclass != to_add.cend(); ++cclass) { classes.insert(*cclass); } diff --git a/src/lib/dhcpsrv/alloc_engine.h b/src/lib/dhcpsrv/alloc_engine.h index a2973995ca..fa263f0979 100644 --- a/src/lib/dhcpsrv/alloc_engine.h +++ b/src/lib/dhcpsrv/alloc_engine.h @@ -473,7 +473,7 @@ public: /// update existing lease. bool fake_allocation_; - /// @brief Indicates if early global reservation is looked for. + /// @brief Indicates if early global reservation is enabled. /// /// This caches the early-global-reservations-lookup value. bool early_global_reservations_lookup_; @@ -1378,7 +1378,7 @@ public: /// information to the allocation engine methods is that adding /// new information doesn't modify the API of the allocation engine. struct ClientContext4 : public boost::noncopyable { - /// @brief Indicates if early global reservation is looked for. + /// @brief Indicates if early global reservation is enabled. /// /// This caches the early-global-reservations-lookup value. bool early_global_reservations_lookup_;