From: Tomek Mrugalski Date: Mon, 23 Jul 2018 14:04:30 +0000 (+0200) Subject: [github88] Removed remaining instances of getLeases6(DUID) X-Git-Tag: ha_phase2~44 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5db1f8ff5fa58b28f43f5a332d837fbcc4b71eed;p=thirdparty%2Fkea.git [github88] Removed remaining instances of getLeases6(DUID) --- diff --git a/src/lib/dhcpsrv/lease_mgr.h b/src/lib/dhcpsrv/lease_mgr.h index dbdab27048..852e5b2da8 100644 --- a/src/lib/dhcpsrv/lease_mgr.h +++ b/src/lib/dhcpsrv/lease_mgr.h @@ -499,7 +499,7 @@ public: virtual Lease6Collection getLeases6(const asiolink::IOAddress& lower_bound_address, const LeasePageSize& page_size) const = 0; - + /// @brief Returns a collection of expired DHCPv4 leases. /// /// This method returns at most @c max_leases expired leases. The leases diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc index c1c84b8aea..a4b4a1114c 100644 --- a/src/lib/dhcpsrv/memfile_lease_mgr.cc +++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc @@ -1048,19 +1048,6 @@ Memfile_LeaseMgr::getLeases6(const asiolink::IOAddress& lower_bound_address, 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 Memfile_LeaseMgr::getExpiredLeases4(Lease4Collection& expired_leases, const size_t max_leases) const { diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.h b/src/lib/dhcpsrv/memfile_lease_mgr.h index 10f7d55829..66dedccb0d 100644 --- a/src/lib/dhcpsrv/memfile_lease_mgr.h +++ b/src/lib/dhcpsrv/memfile_lease_mgr.h @@ -340,11 +340,6 @@ public: getLeases6(const asiolink::IOAddress& lower_bound_address, 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. /// /// This method returns at most @c max_leases expired leases. The leases diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc index 83a2710ca5..16c3327ce4 100644 --- a/src/lib/dhcpsrv/mysql_lease_mgr.cc +++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc @@ -2266,23 +2266,6 @@ MySqlLeaseMgr::getLeases6(const asiolink::IOAddress& lower_bound_address, 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 MySqlLeaseMgr::getExpiredLeases4(Lease4Collection& expired_leases, const size_t max_leases) const { diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.h b/src/lib/dhcpsrv/mysql_lease_mgr.h index bfafa55e2d..64fe4710a3 100644 --- a/src/lib/dhcpsrv/mysql_lease_mgr.h +++ b/src/lib/dhcpsrv/mysql_lease_mgr.h @@ -337,11 +337,6 @@ public: getLeases6(const asiolink::IOAddress& lower_bound_address, 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. /// /// This method returns at most @c max_leases expired leases. The leases diff --git a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc index 40e262741a..d32379fe8d 100644 --- a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc +++ b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc @@ -208,14 +208,6 @@ public: 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. /// /// @param subnet_id subnet identifier.