mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-05 00:15:17 +00:00
Code Issues Releases Wiki Activity

[3682_rebase] Merge branch 'trac3682' into trac3682_rebase

Browse Source 
# Conflicts:
#	src/lib/dhcpsrv/mysql_lease_mgr.cc
#	src/lib/dhcpsrv/mysql_lease_mgr.h
This commit is contained in:
Tomek Mrugalski
2015-11-30 21:26:25 +01:00
parent 0d4a712074
commit 65efc0da7f
27 changed files with 3439 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -21,19 +21,13 @@
#include <boost/scoped_ptr.hpp>
#include <boost/utility.hpp>
#include <mysql.h>
#include <mysql/mysql.h>
#include <time.h>
namespace isc {
namespace dhcp {
// Define the current database schema values
const uint32_t CURRENT_VERSION_VERSION = 3;
const uint32_t CURRENT_VERSION_MINOR = 0;
// Forward declaration of the Lease exchange objects. These classes are defined
// in the .cc file.
class MySqlLease4Exchange;
@@ -401,67 +395,6 @@ public:
/// @throw DbOperationError If the rollback failed.
virtual void rollback();
///@{
/// The following methods are used to convert between times and time
/// intervals stored in the Lease object, and the times stored in the
/// database. The reason for the difference is because in the DHCP server,
/// the cltt (Client Time Since Last Transmission) is the natural data; in
/// the lease file - which may be read by the user - it is the expiry time
/// of the lease.
/// @brief Convert time_t value to database time.
///
/// @param input_time A time_t value representing time.
/// @param output_time Reference to MYSQL_TIME object where converted time
/// will be put.
static
void convertToDatabaseTime(const time_t input_time, MYSQL_TIME& output_time);
/// @brief Convert Lease Time to Database Times
///
/// Within the DHCP servers, times are stored as client last transmit time
/// and valid lifetime. In the database, the information is stored as
/// valid lifetime and "expire" (time of expiry of the lease). They are
/// related by the equation:
///
/// - expire = client last transmit time + valid lifetime
///
/// This method converts from the times in the lease object into times
/// able to be added to the database.
///
/// @param cltt Client last transmit time
/// @param valid_lifetime Valid lifetime
/// @param expire Reference to MYSQL_TIME object where the expiry time of
/// the lease will be put.
///
/// @throw isc::BadValue if the sum of the calculated expiration time is
/// greater than the value of @c LeaseMgr::MAX_DB_TIME.
static
void convertToDatabaseTime(const time_t cltt, const uint32_t valid_lifetime,
MYSQL_TIME& expire);
/// @brief Convert Database Time to Lease Times
///
/// Within the database, time is stored as "expire" (time of expiry of the
/// lease) and valid lifetime. In the DHCP server, the information is
/// stored client last transmit time and valid lifetime. These are related
/// by the equation:
///
/// - client last transmit time = expire - valid_lifetime
///
/// This method converts from the times in the database into times
/// able to be inserted into the lease object.
///
/// @param expire Reference to MYSQL_TIME object from where the expiry
/// time of the lease is taken.
/// @param valid_lifetime lifetime of the lease.
/// @param cltt Reference to location where client last transmit time
/// is put.
static
void convertFromDatabaseTime(const MYSQL_TIME& expire,
uint32_t valid_lifetime, time_t& cltt);
///@}
/// @brief Statement Tags
///
/// The contents of the enum are indexes into the list of SQL statements