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

[github88] Removed remaining instances of getLeases6(DUID)

Browse Source
This commit is contained in:
Tomek Mrugalski 2018-07-23 16:04:30 +02:00
parent 61267ca824
commit 5db1f8ff5f
6 changed files with 1 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/dhcpsrv/lease_mgr.h
View File

@ -499,7 +499,7 @@ public:
virtual Lease6Collection virtual Lease6Collection
getLeases6(const asiolink::IOAddress& lower_bound_address, getLeases6(const asiolink::IOAddress& lower_bound_address,
const LeasePageSize& page_size) const = 0; const LeasePageSize& page_size) const = 0;
/// @brief Returns a collection of expired DHCPv4 leases. /// @brief Returns a collection of expired DHCPv4 leases.
/// ///
/// This method returns at most @c max_leases expired leases. The leases /// This method returns at most @c max_leases expired leases. The leases

13
src/lib/dhcpsrv/memfile_lease_mgr.cc
View File

@ -1048,19 +1048,6 @@ Memfile_LeaseMgr::getLeases6(const asiolink::IOAddress& lower_bound_address,
return (collection); return (collection);
} }
Lease6Collection
Memfile_LeaseMgr::getLeases6(const DUID& duid) const {
LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MEMFILE_GET6);
Lease6Collection collection;
for (auto lease = storage6_.begin(); lease != storage6_.end(); ++lease ) {
if ( (**lease).duid_->getDuid() == duid.getDuid() )
collection.push_back(Lease6Ptr(new Lease6(**lease)));
}
return (collection);
}
void void
Memfile_LeaseMgr::getExpiredLeases4(Lease4Collection& expired_leases, Memfile_LeaseMgr::getExpiredLeases4(Lease4Collection& expired_leases,
const size_t max_leases) const { const size_t max_leases) const {

5
src/lib/dhcpsrv/memfile_lease_mgr.h
View File

@ -340,11 +340,6 @@ public:
getLeases6(const asiolink::IOAddress& lower_bound_address, getLeases6(const asiolink::IOAddress& lower_bound_address,
const LeasePageSize& page_size) const; const LeasePageSize& page_size) const;
/// @brief Returns all IPv6 leases.
///
/// @return Lease collection (may be empty if no IPv6 lease found).
virtual Lease6Collection getLeases6(const DUID& duid) const;
/// @brief Returns a collection of expired DHCPv4 leases. /// @brief Returns a collection of expired DHCPv4 leases.
/// ///
/// This method returns at most @c max_leases expired leases. The leases /// This method returns at most @c max_leases expired leases. The leases

17
src/lib/dhcpsrv/mysql_lease_mgr.cc
View File

@ -2266,23 +2266,6 @@ MySqlLeaseMgr::getLeases6(const asiolink::IOAddress& lower_bound_address,
return (result); return (result);
} }
Lease6Collection
MySqlLeaseMgr::getLeases6(const DUID& duid) const {
LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_GET_DUID);
Lease6Collection result = getLeases6();
//erase the ones not containing the matching DUID
for (auto iter = result.begin(); iter != result.end();
iter++) {
if ((*iter)->duid_->getDuid() != duid.getDuid()) {
result.erase(iter);
}
}
return (result);
}
void void
MySqlLeaseMgr::getExpiredLeases4(Lease4Collection& expired_leases, MySqlLeaseMgr::getExpiredLeases4(Lease4Collection& expired_leases,
const size_t max_leases) const { const size_t max_leases) const {

5
src/lib/dhcpsrv/mysql_lease_mgr.h
View File

@ -337,11 +337,6 @@ public:
getLeases6(const asiolink::IOAddress& lower_bound_address, getLeases6(const asiolink::IOAddress& lower_bound_address,
const LeasePageSize& page_size) const; const LeasePageSize& page_size) const;
/// @brief Returns all IPv6 leases.
///
/// @return Lease collection (may be empty if no IPv6 lease found).
virtual Lease6Collection getLeases6(const DUID& duid) const;
/// @brief Returns a collection of expired DHCPv4 leases. /// @brief Returns a collection of expired DHCPv4 leases.
/// ///
/// This method returns at most @c max_leases expired leases. The leases /// This method returns at most @c max_leases expired leases. The leases

8
src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
View File

@ -208,14 +208,6 @@ public:
return (leases6_); return (leases6_);
} }
/// @brief Returns collection of lease for matching DUID
///
/// @param duid ignored
/// @return whatever is set in leases6_ field
virtual Lease6Collection getLeases6(const DUID& duid) const {
return (leases6_);
}
/// @brief Returns all IPv6 leases for the particular subnet identifier. /// @brief Returns all IPv6 leases for the particular subnet identifier.
/// ///
/// @param subnet_id subnet identifier. /// @param subnet_id subnet identifier.