[#4466] Minor cleanups

modified:   src/hooks/dhcp/pgsql/pgsql_lease_mgr.cc
modified:   src/lib/asiolink/addr_utilities.h
modified:   src/lib/dhcpsrv/lease_mgr.h
modified:   src/lib/dhcpsrv/sflq_allocation_state.h
modified:   src/lib/dhcpsrv/sflq_allocator.h
modified:   src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
modified:   src/lib/dhcpsrv/testutils/sflqtest_lease_mgr.h

diff --git a/src/hooks/dhcp/pgsql/pgsql_lease_mgr.cc b/src/hooks/dhcp/pgsql/pgsql_lease_mgr.cc
index 68beaa7a0531555f2f40caca92ede49bb3f48268..75c55d1941aa03aeed8b1fdb183e1365728bc1c5 100644 (file)
--- a/src/hooks/dhcp/pgsql/pgsql_lease_mgr.cc
+++ b/src/hooks/dhcp/pgsql/pgsql_lease_mgr.cc
@@ -720,7 +720,7 @@ PgSqlTaggedStatement tagged_statements[] = {
             OID_BOOL, OID_BOOL, OID_VARCHAR, OID_INT8, OID_TEXT, OID_BYTEA,
             OID_BYTEA, OID_INT8, OID_INT8, OID_TIMESTAMP },
 
-      "slfqUpdateLease4",
+      "sflqUpdateLease4",
       "SELECT sflqUpdateLease4($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16)" },
 
     // SLQ_DELETE_LEASE4
@@ -742,7 +742,7 @@ PgSqlTaggedStatement tagged_statements[] = {
             OID_INT2, OID_INT4, OID_INT2, OID_BOOL, OID_BOOL, OID_VARCHAR,
             OID_BYTEA, OID_INT2, OID_INT2,
             OID_INT8, OID_TEXT, OID_INT8, OID_TEXT, OID_TIMESTAMP },
-      "slfqUpdateLease6",
+      "sflqUpdateLease6",
       "SELECT sflqUpdateLease6(cast($1 as inet), $2, $3, $4, $5, $6, $7, $8, $9, "
                               "$10, $11, $12, $13, $14, $15, $16, $17, $18, "
                               "cast($19 as inet), $20)" },

diff --git a/src/lib/asiolink/addr_utilities.h b/src/lib/asiolink/addr_utilities.h
index 673b95da0df71c65257fc0679d6d2854adbcc867..4cb0f51e2488236ea039c320d220e23c87c55467 100644 (file)
--- a/src/lib/asiolink/addr_utilities.h
+++ b/src/lib/asiolink/addr_utilities.h
@@ -95,16 +95,16 @@ IOAddress offsetAddress(const IOAddress& addr, isc::util::uint128_t offset);
 
 /// @brief Ensures address pair are both v4 and start <= end
 ///
-/// @param addr input address
-/// @param addr input address
+/// @param start input start address
+/// @param end input end address
 ///
 /// @throw BadValue if either address is not v4 or start > end
 void validateV4Range(const IOAddress& start, const IOAddress& end);
 
 /// @brief Ensures address pair are both v6 and start <= end
 ///
-/// @param addr input address
-/// @param addr input address
+/// @param start input start address
+/// @param end input end address
 ///
 /// @throw BadValue if either address is not v6 or start > end
 void validateV6Range(const IOAddress& start, const IOAddress& end);

diff --git a/src/lib/dhcpsrv/lease_mgr.h b/src/lib/dhcpsrv/lease_mgr.h
index b473b0228b44ff1160ba200db110e70aab20e175..999c14222d23734333dacdefd15e01ac73a43334 100644 (file)
--- a/src/lib/dhcpsrv/lease_mgr.h
+++ b/src/lib/dhcpsrv/lease_mgr.h
@@ -1125,7 +1125,7 @@ public:
     /// and (re)populates the pool.
     ///
     /// @param start_address first address in the pool.
-    /// @param last_address last address in the pool.
+    /// @param end_address last address in the pool.
     /// @param subnet_id id of the subnet to which the pool belongs.
     /// @param recreate when true, the pool is recreated if it already exits.
     ///
@@ -1143,7 +1143,7 @@ public:
     /// conflicts.
     ///
     /// @param start_address first address in the pool.
-    /// @param last_address last address in the pool.
+    /// @param end_address last address in the pool.
     ///
     /// @return A free V4 address or IOAddress::IPV4_ZERO_ADDRESS().
     virtual asiolink::IOAddress sflqPickFreeLease4(asiolink::IOAddress start_address,
@@ -1152,7 +1152,7 @@ public:
     /// @brief Calls stored procedure to create an SFLQ pool for v6.
     ///
     /// @param start_address first address/prefix in the pool.
-    /// @param last_address last address/prefix in the pool.
+    /// @param end_address last address/prefix in the pool.
     /// @param lease_type TYPE_NA or TYPE_PD.
     /// @param delegated_len bit length of the address/prefix to be leases. For
     /// TYPE_NA this parameter should be 128.
@@ -1173,7 +1173,7 @@ public:
     /// Note the returned address/prefix must still be checked for HR conflicts.
     ///
     /// @param start_address first address in the pool.
-    /// @param last_address last address in the pool.
+    /// @param end_address last address in the pool.
     ///
     /// @return A free V6 address/prefix or IOAddress::IPV6_ZERO_ADDRESS().
     virtual asiolink::IOAddress sflqPickFreeLease6(asiolink::IOAddress start_address,
@@ -1268,7 +1268,7 @@ public:
     ///
     /// @param lease v4 lease to test
     ///
-    /// @return true if SLFQ is in use in this config and the lease's subnet uses
+    /// @return true if SFLQ is in use in this config and the lease's subnet uses
     /// SFLQ allocation
     static bool useSharedFlqStatement(Lease4Ptr lease);
 
@@ -1277,7 +1277,7 @@ public:
     ///
     /// @param lease v6 lease to test
     ///
-    /// @return true if SLFQ is in use in this config and the lease's subnet uses
+    /// @return true if SFLQ is in use in this config and the lease's subnet uses
     /// SFLQ allocation for the lease's lease type.
     static bool useSharedFlqStatement(Lease6Ptr lease);
 

diff --git a/src/lib/dhcpsrv/sflq_allocation_state.h b/src/lib/dhcpsrv/sflq_allocation_state.h
index 5db5aa6edf16c5f20496dc52309be160034961ab..de6cbd9abb1f33f3dc45e70ab93d5479824306e5 100644 (file)
--- a/src/lib/dhcpsrv/sflq_allocation_state.h
+++ b/src/lib/dhcpsrv/sflq_allocation_state.h
@@ -4,8 +4,8 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-#ifndef SFQL_ALLOCATION_STATE_H
-#define SFQL_ALLOCATION_STATE_H
+#ifndef SFLQ_ALLOCATION_STATE_H
+#define SFLQ_ALLOCATION_STATE_H
 
 #include <asiolink/io_address.h>
 #include <dhcpsrv/allocation_state.h>
@@ -50,4 +50,4 @@ public:
 } // end of namespace isc::dhcp
 } // end of namespace isc
 
-#endif // SFQL_ALLOCATION_STATE_H
+#endif // SFLQ_ALLOCATION_STATE_H

diff --git a/src/lib/dhcpsrv/sflq_allocator.h b/src/lib/dhcpsrv/sflq_allocator.h
index a948c0b04dbe07a1271bb5dc5e2f9a56196e4207..faff8a8e8abda56c65c979ace36c2fbae82b30b1 100644 (file)
--- a/src/lib/dhcpsrv/sflq_allocator.h
+++ b/src/lib/dhcpsrv/sflq_allocator.h
@@ -32,7 +32,7 @@ namespace dhcp {
 /// pool rather than one query * the total number of addresses in the
 /// pools.
 ///
-/// The SLFQ data tracks the last address picked for each SFLQ pool such
+/// The SFLQ data tracks the last address picked for each SFLQ pool such
 /// that consecutive queries for the same pool will return a different
 /// free address.  This should minimize conflicts with other servers until
 /// the number of free addresses approaches zero.
@@ -56,7 +56,7 @@ public:
 
     /// @brief Returns the allocator type string.
     ///
-    /// @return flq string.
+    /// @return shared-flq string.
     virtual std::string getType() const {
         return ("shared-flq");
     }

diff --git a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
index 9a438ad6d206ab60f50d1dcce9d38d8cf4988d37..c921437ad19be7b6eb9d50007b49e37199c793e0 100644 (file)
--- a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
@@ -1046,7 +1046,7 @@ TEST(Lease6ExtendedInfoTest, twoSetExtendedInfoTablesEnabled) {
     EXPECT_EQ(exp_remote_id, remote_id);
 }
 
-// Verifies SfqlPoolInfo::toElement() function.
+// Verifies SflqPoolInfo::toElement() function.
 TEST(SflqPoolInfo, toElement) {
     SflqPoolInfo info;
     info.lease_type_ = Lease::TYPE_V4;

diff --git a/src/lib/dhcpsrv/testutils/sflqtest_lease_mgr.h b/src/lib/dhcpsrv/testutils/sflqtest_lease_mgr.h
index 32f88cdc9ea3f5564c68d6b71a067584bfb323f3..22a4259b7b7c6daa57918eadf3ca22e2b34d2435 100644 (file)
--- a/src/lib/dhcpsrv/testutils/sflqtest_lease_mgr.h
+++ b/src/lib/dhcpsrv/testutils/sflqtest_lease_mgr.h
@@ -98,7 +98,7 @@ public:
     /// @brief Destructor
     virtual ~SflqTestLeaseMgr();
 
-    /// @brief Factory for creating a SlfqTestLeaseMgr.
+    /// @brief Factory for creating a SflqTestLeaseMgr.
     ///
     /// The only required parameters are "type=sflqtest" adn "universe=4"
     /// or "universe=6".