BIND 10 trac3146, updated. 346892cca6784b947e11efb446f53676b143e4d6 [3146] ChangeLog updated
BIND 10 source code commits
bind10-changes at lists.isc.org
Fri Sep 6 17:31:09 UTC 2013
The branch, trac3146 has been updated
via 346892cca6784b947e11efb446f53676b143e4d6 (commit)
via 0b0bb4a2785056f705dd7de8e5e9e30bc0eff80a (commit)
from abd29c04e21cac8115834506c2d9e44f69a4d716 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 346892cca6784b947e11efb446f53676b143e4d6
Author: Tomek Mrugalski <tomasz at isc.org>
Date: Fri Sep 6 19:30:45 2013 +0200
[3146] ChangeLog updated
commit 0b0bb4a2785056f705dd7de8e5e9e30bc0eff80a
Author: Tomek Mrugalski <tomasz at isc.org>
Date: Fri Sep 6 19:30:35 2013 +0200
[3146] getLease6() renamed to getLeases6()
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
src/lib/dhcpsrv/lease_mgr.h | 4 ++--
src/lib/dhcpsrv/memfile_lease_mgr.cc | 4 +++-
src/lib/dhcpsrv/memfile_lease_mgr.h | 4 ++--
src/lib/dhcpsrv/mysql_lease_mgr.cc | 4 ++--
src/lib/dhcpsrv/mysql_lease_mgr.h | 4 ++--
src/lib/dhcpsrv/tests/lease_mgr_unittest.cc | 4 ++--
src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc | 18 +++++++++---------
8 files changed, 27 insertions(+), 20 deletions(-)
-----------------------------------------------------------------------
diff --git a/ChangeLog b/ChangeLog
index 58e12a0..334c707 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+6XX. [func] tomek
+ Preparatory work for prefix delegation in LeaseMgr. getLease6()
+ renamed to getLeases6(). It now can return more than one lease.
+ (Trac #3146, git ABCD)
+
671. [func] dclink,tomek
memfile backend now supports getLease4(hwaddr) and getLease4(client-id)
methods. Thanks to David Carlier for contributing a patch.
diff --git a/src/lib/dhcpsrv/lease_mgr.h b/src/lib/dhcpsrv/lease_mgr.h
index 8e9bb21..edff4c6 100644
--- a/src/lib/dhcpsrv/lease_mgr.h
+++ b/src/lib/dhcpsrv/lease_mgr.h
@@ -552,8 +552,8 @@ public:
/// @param iaid IA identifier
///
/// @return Lease collection (may be empty if no lease is found)
- virtual Lease6Collection getLease6(Lease6::LeaseType type, const DUID& duid,
- uint32_t iaid) const = 0;
+ virtual Lease6Collection getLeases6(Lease6::LeaseType type, const DUID& duid,
+ uint32_t iaid) const = 0;
/// @brief Returns existing IPv6 lease for a given DUID+IA combination
///
diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc
index f8c5c42..d84bab6 100644
--- a/src/lib/dhcpsrv/memfile_lease_mgr.cc
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc
@@ -200,11 +200,13 @@ Memfile_LeaseMgr::getLease6(Lease6::LeaseType /* not used yet */,
}
Lease6Collection
-Memfile_LeaseMgr::getLease6(Lease6::LeaseType /* not used yet */,
+Memfile_LeaseMgr::getLeases6(Lease6::LeaseType /* not used yet */,
const DUID& duid, uint32_t iaid) const {
LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL,
DHCPSRV_MEMFILE_GET_IAID_DUID).arg(iaid).arg(duid.toText());
+ /// @todo Not implemented.
+
return (Lease6Collection());
}
diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.h b/src/lib/dhcpsrv/memfile_lease_mgr.h
index cf98a82..d88250f 100644
--- a/src/lib/dhcpsrv/memfile_lease_mgr.h
+++ b/src/lib/dhcpsrv/memfile_lease_mgr.h
@@ -156,8 +156,8 @@ public:
/// @param iaid IA identifier
///
/// @return collection of IPv6 leases
- virtual Lease6Collection getLease6(Lease6::LeaseType type,
- const DUID& duid, uint32_t iaid) const;
+ virtual Lease6Collection getLeases6(Lease6::LeaseType type,
+ const DUID& duid, uint32_t iaid) const;
/// @brief Returns existing IPv6 lease for a given DUID/IA/subnet-id tuple
///
diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc
index 97514f4..18e37b4 100644
--- a/src/lib/dhcpsrv/mysql_lease_mgr.cc
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc
@@ -1678,8 +1678,8 @@ MySqlLeaseMgr::getLease6(Lease6::LeaseType /* type - not used yet */,
Lease6Collection
-MySqlLeaseMgr::getLease6(Lease6::LeaseType /* type - not used yet */,
- const DUID& duid, uint32_t iaid) const {
+MySqlLeaseMgr::getLeases6(Lease6::LeaseType /* type - not used yet */,
+ const DUID& duid, uint32_t iaid) const {
LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL,
DHCPSRV_MYSQL_GET_IAID_DUID).arg(iaid).arg(duid.toText());
diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.h b/src/lib/dhcpsrv/mysql_lease_mgr.h
index f89c2e3..1009037 100644
--- a/src/lib/dhcpsrv/mysql_lease_mgr.h
+++ b/src/lib/dhcpsrv/mysql_lease_mgr.h
@@ -279,8 +279,8 @@ public:
/// programming error.
/// @throw isc::dhcp::DbOperationError An operation on the open database has
/// failed.
- virtual Lease6Collection getLease6(Lease6::LeaseType type, const DUID& duid,
- uint32_t iaid) const;
+ virtual Lease6Collection getLeases6(Lease6::LeaseType type, const DUID& duid,
+ uint32_t iaid) const;
/// @brief Returns existing IPv6 lease for a given DUID+IA combination
///
diff --git a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
index 79d5253..6cc1a3c 100644
--- a/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/lease_mgr_unittest.cc
@@ -142,8 +142,8 @@ public:
/// @param iaid ignored
///
/// @return whatever is set in leases6_ field
- virtual Lease6Collection getLease6(Lease6::LeaseType /* not used yet */,
- const DUID&, uint32_t) const {
+ virtual Lease6Collection getLeases6(Lease6::LeaseType /* not used yet */,
+ const DUID&, uint32_t) const {
return (leases6_);
}
diff --git a/src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc b/src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc
index aeca310..25bf1c8 100644
--- a/src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc
+++ b/src/lib/dhcpsrv/tests/mysql_lease_mgr_unittest.cc
@@ -835,9 +835,9 @@ TEST_F(MySqlLeaseMgrTest, getLease6DuidIaid) {
}
// Get the leases matching the DUID and IAID of lease[1].
- Lease6Collection returned = lmptr_->getLease6(leasetype6_[1],
- *leases[1]->duid_,
- leases[1]->iaid_);
+ Lease6Collection returned = lmptr_->getLeases6(leasetype6_[1],
+ *leases[1]->duid_,
+ leases[1]->iaid_);
// Should be three leases, matching leases[1], [4] and [5].
ASSERT_EQ(3, returned.size());
@@ -855,15 +855,15 @@ TEST_F(MySqlLeaseMgrTest, getLease6DuidIaid) {
// Check that nothing is returned when either the IAID or DUID match
// nothing.
- returned = lmptr_->getLease6(leasetype6_[1], *leases[1]->duid_,
- leases[1]->iaid_ + 1);
+ returned = lmptr_->getLeases6(leasetype6_[1], *leases[1]->duid_,
+ leases[1]->iaid_ + 1);
EXPECT_EQ(0, returned.size());
// Alter the leases[1] DUID to match nothing in the database.
vector<uint8_t> duid_vector = leases[1]->duid_->getDuid();
++duid_vector[0];
DUID new_duid(duid_vector);
- returned = lmptr_->getLease6(leasetype6_[1], new_duid, leases[1]->iaid_);
+ returned = lmptr_->getLeases6(leasetype6_[1], new_duid, leases[1]->iaid_);
EXPECT_EQ(0, returned.size());
}
@@ -887,9 +887,9 @@ TEST_F(MySqlLeaseMgrTest, getLease6DuidIaidSize) {
vector<uint8_t> duid_vec(i, i);
leases[1]->duid_.reset(new DUID(duid_vec));
EXPECT_TRUE(lmptr_->addLease(leases[1]));
- Lease6Collection returned = lmptr_->getLease6(leasetype6_[1],
- *leases[1]->duid_,
- leases[1]->iaid_);
+ Lease6Collection returned = lmptr_->getLeases6(leasetype6_[1],
+ *leases[1]->duid_,
+ leases[1]->iaid_);
ASSERT_EQ(1, returned.size());
detailCompareLease(leases[1], *returned.begin());
(void) lmptr_->deleteLease(leases[1]->addr_);
More information about the bind10-changes
mailing list