From: Thomas Markwalder <tmark@isc.org>
Date: Wed, 21 Sep 2022 18:30:07 +0000 (-0400)
Subject: [#2571] Addressed review comments
X-Git-Tag: Kea-2.3.1~32
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=50d2cc973e758bb3ef9289d259120a9fe7fa3612;p=thirdparty%2Fkea.git

[#2571] Addressed review comments
---

diff --git a/src/lib/dhcpsrv/lease_mgr.cc b/src/lib/dhcpsrv/lease_mgr.cc
index bc54d0e973..56534eac3f 100644
--- a/src/lib/dhcpsrv/lease_mgr.cc
+++ b/src/lib/dhcpsrv/lease_mgr.cc
@@ -358,22 +358,20 @@ LeaseMgr::getDBVersion() {
 
 Lease4Collection
 LeaseMgr::getLeases4ByRelayId(const OptionBuffer& /* relay_id */,
-                              const IOAddress& /* link_addr */,
                               const IOAddress& /* lower_bound_address */,
                               const LeasePageSize& /* page_size */,
                               const time_t& /* qry_start_time = 0 */,
                               const time_t& /* qry_end_time = 0 */) {
-    isc_throw(NotImplemented, __FILE__ << ":" << __LINE__ << " - " << __FUNCTION__);
+    isc_throw(NotImplemented, "LeaseMgr::getLeases4ByRelayId not implemented");
 }
 
 Lease4Collection
 LeaseMgr::getLeases4ByRemoteId(const OptionBuffer& /* remote_id */,
-                               const IOAddress& /* link_addr */,
                                const IOAddress& /* lower_bound_address */,
                                const LeasePageSize& /* page_size */,
                                const time_t& /* qry_start_time = 0 */,
                                const time_t& /* qry_end_time = 0 */) {
-    isc_throw(NotImplemented, __FILE__ << ":" << __LINE__ << " - " << __FUNCTION__);
+    isc_throw(NotImplemented, "LeaseMgr::getLeases4ByRemoteId not implemented");
 }
 
 Lease6Collection
@@ -381,7 +379,7 @@ LeaseMgr::getLeases6ByRelayId(const DUID& /* relay_id */,
                               const IOAddress& /* link_addr */,
                               const IOAddress& /* lower_bound_address */,
                               const LeasePageSize& /* page_size */) {
-    isc_throw(NotImplemented, __FILE__ << ":" << __LINE__ << " - " << __FUNCTION__);
+    isc_throw(NotImplemented, "LeaseMgr::getLeases6ByRelayId not implemented");
 }
 
 Lease6Collection
@@ -389,14 +387,14 @@ LeaseMgr::getLeases6ByRemoteId(const OptionBuffer& /* remote_id */,
                                const IOAddress& /* link_addr */,
                                const IOAddress& /* lower_bound_address */,
                                const LeasePageSize& /* page_size*/) {
-    isc_throw(NotImplemented, __FILE__ << ":" << __LINE__ << " - " << __FUNCTION__);
+    isc_throw(NotImplemented, "LeaseMgr::getLeases6ByRemoteId not implemented");
 }
 
 Lease6Collection
 LeaseMgr::getLeases6ByLink(const IOAddress& /* link_addr */,
                            const IOAddress& /* lower_bound_address */,
                            const LeasePageSize& /* page_size */) {
-    isc_throw(NotImplemented, __FILE__ << ":" << __LINE__ << " - " << __FUNCTION__);
+    isc_throw(NotImplemented, "LeaseMgr::getLeases6ByLink not implemented");
 }
 
 } // namespace isc::dhcp
diff --git a/src/lib/dhcpsrv/lease_mgr.h b/src/lib/dhcpsrv/lease_mgr.h
index bc1b1d57b7..8a7eea7729 100644
--- a/src/lib/dhcpsrv/lease_mgr.h
+++ b/src/lib/dhcpsrv/lease_mgr.h
@@ -819,8 +819,7 @@ public:
 
     /// @brief Returns existing IPv4 leases with a given relay-id
     ///
-    /// @param relay_id DUID for relay_id of interest
-    /// @param link_addr limit results to leases on this link when not ::
+    /// @param relay_id  RAI Relay-ID sub-option value for relay_id of interest
     /// @param lower_bound_address IPv4 address used as lower bound for the
     /// returned range.
     /// @param page_size maximum size of the page returned.
@@ -831,7 +830,6 @@ public:
     ///
     /// @return collection of IPv4 leases
     virtual Lease4Collection getLeases4ByRelayId(const OptionBuffer& relay_id,
-                                                 const asiolink::IOAddress& link_addr,
                                                  const asiolink::IOAddress& lower_bound_address,
                                                  const LeasePageSize& page_size,
                                                  const time_t& qry_start_time = 0,
@@ -839,8 +837,7 @@ public:
 
     /// @brief Returns existing IPv4 leases with a given remote-id
     ///
-    /// @param remote_id remote-id option data of interest
-    /// @param link_addr limit results to leases on this link when not ::
+    /// @param remote_id  RAI Remote-ID sub-option value for remote-id of interest
     /// @param lower_bound_address IPv4 address used as lower bound for the
     /// returned range.
     /// @param page_size maximum size of the page returned.
@@ -851,7 +848,6 @@ public:
     ///
     /// @return collection of IPv4 leases
     virtual Lease4Collection getLeases4ByRemoteId(const OptionBuffer& remote_id,
-                                                  const asiolink::IOAddress& link_addr,
                                                   const asiolink::IOAddress& lower_bound_address,
                                                   const LeasePageSize& page_size,
                                                   const time_t& qry_start_time = 0,