[2342] Changed Lease6 "client_id" field to "duid"

diff --git a/src/lib/dhcp/dhcpdb_create.mysql b/src/lib/dhcp/dhcpdb_create.mysql
index 41bea247fb436db8f452e4bb5d4dbbb69bc5c299..02cc374926e3f0212c87e30f49cc5d0239934c2a 100644 (file)
--- a/src/lib/dhcp/dhcpdb_create.mysql
+++ b/src/lib/dhcp/dhcpdb_create.mysql
@@ -45,7 +45,7 @@ CREATE TABLE lease4 (
 CREATE TABLE lease6 (
     address VARCHAR(40) PRIMARY KEY NOT NULL,   # IPv6 address
     hwaddr VARBINARY(20),                       # Hardware address
-    client_id VARBINARY(128),                   # Client ID
+    duid VARBINARY(128),                        # DUID
     lease_time INT UNSIGNED,                    # Length of the lease (seconds)
     expire TIMESTAMP,                           # Expiration time of the lease
     subnet_id INT UNSIGNED,                     # Subnet identification

diff --git a/src/lib/dhcp/mysql_lease_mgr.cc b/src/lib/dhcp/mysql_lease_mgr.cc
index 1f56ec942d27f1f68dd0eae49746a8ad026d1776..7479bf889539b940539c0c0eea924141ccc95826 100644 (file)
--- a/src/lib/dhcp/mysql_lease_mgr.cc
+++ b/src/lib/dhcp/mysql_lease_mgr.cc
@@ -102,14 +102,14 @@ public:
         bind_[1].buffer_length = hwaddr_length_;
         bind_[1].length = &hwaddr_length_;
 
-        // client_id: varchar(128)
-        clientid_ = lease_->duid_->getDuid();
-        clientid_length_ = clientid_.size();
+        // duid: varchar(128)
+        duid_ = lease_->duid_->getDuid();
+        duid_length_ = duid_.size();
 
         bind_[2].buffer_type = MYSQL_TYPE_BLOB;
-        bind_[2].buffer = reinterpret_cast<char*>(&(clientid_[0]));
-        bind_[2].buffer_length = clientid_length_;
-        bind_[2].length = &clientid_length_;
+        bind_[2].buffer = reinterpret_cast<char*>(&(duid_[0]));
+        bind_[2].buffer_length = duid_length_;
+        bind_[2].length = &duid_length_;
 
         // The lease structure holds the client last transmission time (cltt_)
         // and the valid lifetime (valid_lft_).  For convenience for external
@@ -201,11 +201,11 @@ public:
         bind_[2].error = &error_[1];
 
         // client_id: varbinary(128)
-        clientid_length_ = sizeof(clientid_buffer_);
+        duid_length_ = sizeof(duid_buffer_);
         bind_[2].buffer_type = MYSQL_TYPE_BLOB;
-        bind_[2].buffer = reinterpret_cast<char*>(clientid_buffer_);
-        bind_[2].buffer_length = clientid_length_;
-        bind_[2].length = &clientid_length_;
+        bind_[2].buffer = reinterpret_cast<char*>(duid_buffer_);
+        bind_[2].buffer_length = duid_length_;
+        bind_[2].length = &duid_length_;
         bind_[2].error = &error_[2];
 
         // lease_time: unsigned int
@@ -275,7 +275,7 @@ public:
 
         result->hwaddr_ = vector<uint8_t>(&hwaddr_buffer_[0],
                                           &hwaddr_buffer_[hwaddr_length_]);
-        result->duid_.reset(new DUID(clientid_buffer_, clientid_length_));
+        result->duid_.reset(new DUID(duid_buffer_, duid_length_));
         MySqlLeaseMgr::convertFromDatabaseTime(expire_, lease_time_,
                                                result->cltt_,
                                                result->valid_lft_);
@@ -313,9 +313,9 @@ private:
                                         ///< array form of V6 address
     unsigned long   addr6_length_;      ///< Length of the address
     MYSQL_BIND      bind_[10];          ///< Static array for speed of access
-    std::vector<uint8_t> clientid_;     ///< Client identification
-    uint8_t         clientid_buffer_[DUID_MAX_LEN]; ///< Buffer form of DUID
-    unsigned long   clientid_length_;   ///< Length of client ID
+    std::vector<uint8_t> duid_;         ///< Client identification
+    uint8_t         duid_buffer_[DUID_MAX_LEN]; ///< Buffer form of DUID
+    unsigned long   duid_length_;       ///< Length of the DUID
     my_bool         error_[10];         ///< For error reporting
     MYSQL_TIME      expire_;            ///< Lease expiry time
     const my_bool   false_;             ///< "false" for MySql
@@ -473,14 +473,14 @@ MySqlLeaseMgr::prepareStatements() {
     prepareStatement(DELETE_LEASE6,
                      "DELETE FROM lease6 WHERE address = ?");
     prepareStatement(GET_LEASE6,
-                     "SELECT address, hwaddr, client_id, "
+                     "SELECT address, hwaddr, duid, "
                          "lease_time, expire, subnet_id, pref_lifetime, "
                          "lease_type, iaid, prefix_len "
                          "FROM lease6 WHERE address = ?");
     prepareStatement(GET_VERSION,
                      "SELECT version, minor FROM schema_version");
     prepareStatement(INSERT_LEASE6,
-                     "INSERT INTO lease6(address, hwaddr, client_id, "
+                     "INSERT INTO lease6(address, hwaddr, duid, "
                          "lease_time, expire, subnet_id, pref_lifetime, "
                          "lease_type, iaid, prefix_len) "
                          "VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)");

diff --git a/src/lib/dhcp/mysql_lease_mgr.h b/src/lib/dhcp/mysql_lease_mgr.h
index 4a7ba74942246b7a245f796a7a73b603607a6659..84a6ac7ca330db6570d2ee5b86a82ac26d920ed8 100644 (file)
--- a/src/lib/dhcp/mysql_lease_mgr.h
+++ b/src/lib/dhcp/mysql_lease_mgr.h
@@ -85,7 +85,7 @@ public:
     /// @brief Returns an IPv4 lease for specified IPv4 address
     ///
     /// This method return a lease that is associated with a given address.
-    /// For other query types (by hardware addr, by client-id) there can be
+    /// For other query types (by hardware addr, by DUID) there can be
     /// several leases in different subnets (e.g. for mobile clients that
     /// got address in different subnets). However, for a single address
     /// there can be only one lease, so this method returns a pointer to