From: Tomek Mrugalski Date: Wed, 25 Jul 2018 22:33:14 +0000 (+0200) Subject: [5682] Removed const from addLease for other lease backends. X-Git-Tag: ha_phase2~18 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e550a2fa6bac2349ea5189301b7a1e9a715d23d8;p=thirdparty%2Fkea.git [5682] Removed const from addLease for other lease backends. --- diff --git a/src/lib/dhcpsrv/cql_lease_mgr.cc b/src/lib/dhcpsrv/cql_lease_mgr.cc index 7085ff436c..01e18af705 100644 --- a/src/lib/dhcpsrv/cql_lease_mgr.cc +++ b/src/lib/dhcpsrv/cql_lease_mgr.cc @@ -2013,7 +2013,7 @@ CqlLeaseMgr::getDBVersion() { } bool -CqlLeaseMgr::addLease(const Lease4Ptr &lease) { +CqlLeaseMgr::addLease(Lease4Ptr &lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_CQL_ADD_ADDR4) .arg(lease->addr_.toText()); @@ -2032,7 +2032,7 @@ CqlLeaseMgr::addLease(const Lease4Ptr &lease) { } bool -CqlLeaseMgr::addLease(const Lease6Ptr &lease) { +CqlLeaseMgr::addLease(Lease6Ptr &lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_CQL_ADD_ADDR6) .arg(lease->addr_.toText()); diff --git a/src/lib/dhcpsrv/cql_lease_mgr.h b/src/lib/dhcpsrv/cql_lease_mgr.h index 39382b2f4e..653e487abe 100644 --- a/src/lib/dhcpsrv/cql_lease_mgr.h +++ b/src/lib/dhcpsrv/cql_lease_mgr.h @@ -87,7 +87,7 @@ public: /// /// @throw isc::dhcp::DbOperationError An operation on the open database has /// failed. - virtual bool addLease(const Lease4Ptr& lease) override; + virtual bool addLease(Lease4Ptr& lease) override; /// @brief Adds an IPv6 lease /// @@ -98,7 +98,7 @@ public: /// /// @throw isc::dhcp::DbOperationError An operation on the open database has /// failed. - virtual bool addLease(const Lease6Ptr& lease) override; + virtual bool addLease(Lease6Ptr& lease) override; /// @brief Basic lease access methods. Obtain leases from the database using /// various criteria. diff --git a/src/lib/dhcpsrv/lease_mgr.h b/src/lib/dhcpsrv/lease_mgr.h index 5b3e98d4b8..099754875e 100644 --- a/src/lib/dhcpsrv/lease_mgr.h +++ b/src/lib/dhcpsrv/lease_mgr.h @@ -34,30 +34,6 @@ /// They are essential components of the interface to any database backend. /// Each concrete database backend (e.g. MySQL) will define a class derived /// from LeaseMgr class. -/// -/// Failover considerations: -/// There are no intermediate plans to implement DHCPv4 failover -/// (draft-ietf-dhc-failover-12.txt). Currently (Oct. 2012) the DHCPv6 failover -/// is being defined in DHC WG in IETF (draft-ietf-dhcpv6-failover-requirements, -/// draft-ietf-dhcpv6-failover-design), but the work is not advanced enough -/// for implementation plans yet. v4 failover requires additional parameters -/// to be kept with a lease. It is likely that v6 failover will require similar -/// fields. Such implementation will require database schema extension. -/// We have designed a way to expand/upgrade schemas during upgrades: a database -/// schema is versioned and sanity checks about required version will be done -/// upon start and/or upgrade. With this mechanism in place, we can add new -/// fields to the database. In particular we can use that capability to -/// introduce failover related fields. -/// -/// However, there is another approach that can be reliably used to provide -/// failover, even without the actual failover protocol implemented. As the -/// first backend will use MySQL, we will be able to use Multi-Master capability -/// offered by MySQL and use two separate Kea instances connecting to the -/// same database. -/// -/// Nevertheless, we hope to have failover protocol eventually implemented in -/// the Kea. - namespace isc { namespace dhcp { diff --git a/src/lib/dhcpsrv/memfile_lease_mgr.cc b/src/lib/dhcpsrv/memfile_lease_mgr.cc index f21dcc1103..3de81f6b05 100644 --- a/src/lib/dhcpsrv/memfile_lease_mgr.cc +++ b/src/lib/dhcpsrv/memfile_lease_mgr.cc @@ -702,7 +702,7 @@ Memfile_LeaseMgr::addLease(Lease4Ptr& lease) { // Run the lease through a checker. static SanityChecker checker; - checker.checkLease(lease); + checker.checkLease(lease, true); if (!lease) { return (false); } @@ -730,7 +730,7 @@ Memfile_LeaseMgr::addLease(Lease6Ptr& lease) { // Run the lease through a checker. static SanityChecker checker; - checker.checkLease(lease); + checker.checkLease(lease, true); if (!lease) { return (false); } diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.cc b/src/lib/dhcpsrv/mysql_lease_mgr.cc index 16c3327ce4..377ef8c2ed 100644 --- a/src/lib/dhcpsrv/mysql_lease_mgr.cc +++ b/src/lib/dhcpsrv/mysql_lease_mgr.cc @@ -1699,7 +1699,7 @@ MySqlLeaseMgr::addLeaseCommon(StatementIndex stindex, } bool -MySqlLeaseMgr::addLease(const Lease4Ptr& lease) { +MySqlLeaseMgr::addLease(Lease4Ptr& lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_ADD_ADDR4).arg(lease->addr_.toText()); @@ -1711,7 +1711,7 @@ MySqlLeaseMgr::addLease(const Lease4Ptr& lease) { } bool -MySqlLeaseMgr::addLease(const Lease6Ptr& lease) { +MySqlLeaseMgr::addLease(Lease6Ptr& lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_MYSQL_ADD_ADDR6).arg(lease->addr_.toText()) .arg(lease->type_); diff --git a/src/lib/dhcpsrv/mysql_lease_mgr.h b/src/lib/dhcpsrv/mysql_lease_mgr.h index 64fe4710a3..3a777c1b8c 100644 --- a/src/lib/dhcpsrv/mysql_lease_mgr.h +++ b/src/lib/dhcpsrv/mysql_lease_mgr.h @@ -74,7 +74,7 @@ public: /// /// @throw isc::dhcp::DbOperationError An operation on the open database has /// failed. - virtual bool addLease(const Lease4Ptr& lease); + virtual bool addLease(Lease4Ptr& lease); /// @brief Adds an IPv6 lease /// @@ -85,7 +85,7 @@ public: /// /// @throw isc::dhcp::DbOperationError An operation on the open database has /// failed. - virtual bool addLease(const Lease6Ptr& lease); + virtual bool addLease(Lease6Ptr& lease); /// @brief Returns an IPv4 lease for specified IPv4 address /// diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.cc b/src/lib/dhcpsrv/pgsql_lease_mgr.cc index fc3bc0dfd0..c187e3aa40 100644 --- a/src/lib/dhcpsrv/pgsql_lease_mgr.cc +++ b/src/lib/dhcpsrv/pgsql_lease_mgr.cc @@ -1135,7 +1135,7 @@ PgSqlLeaseMgr::addLeaseCommon(StatementIndex stindex, } bool -PgSqlLeaseMgr::addLease(const Lease4Ptr& lease) { +PgSqlLeaseMgr::addLease(Lease4Ptr& lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_ADD_ADDR4).arg(lease->addr_.toText()); @@ -1145,7 +1145,7 @@ PgSqlLeaseMgr::addLease(const Lease4Ptr& lease) { } bool -PgSqlLeaseMgr::addLease(const Lease6Ptr& lease) { +PgSqlLeaseMgr::addLease(Lease6Ptr& lease) { LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_TRACE_DETAIL, DHCPSRV_PGSQL_ADD_ADDR6).arg(lease->addr_.toText()); PsqlBindArray bind_array; diff --git a/src/lib/dhcpsrv/pgsql_lease_mgr.h b/src/lib/dhcpsrv/pgsql_lease_mgr.h index 8b69c46b97..549827dad8 100644 --- a/src/lib/dhcpsrv/pgsql_lease_mgr.h +++ b/src/lib/dhcpsrv/pgsql_lease_mgr.h @@ -71,7 +71,7 @@ public: /// /// @throw isc::dhcp::DbOperationError An operation on the open database has /// failed. - virtual bool addLease(const Lease4Ptr& lease); + virtual bool addLease(Lease4Ptr& lease); /// @brief Adds an IPv6 lease /// @@ -82,7 +82,7 @@ public: /// /// @throw isc::dhcp::DbOperationError An operation on the open database has /// failed. - virtual bool addLease(const Lease6Ptr& lease); + virtual bool addLease(Lease6Ptr& lease); /// @brief Returns an IPv4 lease for specified IPv4 address ///