[#2584] Removed v4 code

diff --git a/src/lib/dhcpsrv/lease.cc b/src/lib/dhcpsrv/lease.cc
index fd77922e76e4c9ae4714ffbe1ba9beae53dc4e48..d14c53b273dc60bfa70105f98f365cfe891712b6 100644 (file)
--- a/src/lib/dhcpsrv/lease.cc
+++ b/src/lib/dhcpsrv/lease.cc
@@ -333,7 +333,7 @@ Lease4::Lease4(const isc::asiolink::IOAddress& address,
 
     : Lease(address, valid_lifetime, subnet_id, cltt, fqdn_fwd,
             fqdn_rev, hostname, hw_address),
-      client_id_(client_id), remote_id_(), relay_id_() {
+      client_id_(client_id) {
 }
 
 std::string

diff --git a/src/lib/dhcpsrv/lease.h b/src/lib/dhcpsrv/lease.h
index a0b3010b97c04b817516be6c747e43d4401a5109..0c2c7919038c4d276a2b10deb07683fbd9c5d00a 100644 (file)
--- a/src/lib/dhcpsrv/lease.h
+++ b/src/lib/dhcpsrv/lease.h
@@ -492,12 +492,6 @@ struct Lease4 : public Lease {
     static Lease4Ptr fromElement(const data::ConstElementPtr& element);
 
     /// @todo: Add DHCPv4 failover related fields here
-
-    /// @brief Remote identifier for Bulk Lease Query
-    std::vector<uint8_t> remote_id_;
-
-    /// @brief Relay identifier for Bulk Lease Query
-    std::vector<uint8_t> relay_id_;
 };
 
 /// @brief A collection of IPv4 leases.

diff --git a/src/lib/dhcpsrv/memfile_lease_storage.h b/src/lib/dhcpsrv/memfile_lease_storage.h
index 8aa5f1e783307a29902bc3e716db51e2cbb9d077..6828018424bdad2edf533d30eb5f95c4414832a5 100644 (file)
--- a/src/lib/dhcpsrv/memfile_lease_storage.h
+++ b/src/lib/dhcpsrv/memfile_lease_storage.h
@@ -48,12 +48,6 @@ struct DuidIndexTag { };
 /// @brief Tag for index using hostname.
 struct HostnameIndexTag { };
 
-/// @brief Tag for index using remote-id.
-struct RemoteIdIndexTag { };
-
-/// @brief Tag for index using relay-id.
-struct RelayIdIndexTag { };
-
 /// @name Multi index containers holding DHCPv4 and DHCPv6 leases.
 ///
 //@{
@@ -65,8 +59,6 @@ struct RelayIdIndexTag { };
 /// - using a composite index: DUID, IAID and lease type.
 /// - using a composite index: boolean flag indicating if the state is
 ///   "expired-reclaimed" and expiration time.
-/// - using subnet ID.
-/// - using hostname.
 ///
 /// Indexes can be accessed using the index number (from 0 to 5) or a
 /// name tag. It is recommended to use the tags to access indexes as
@@ -148,15 +140,11 @@ typedef boost::multi_index_container<
 /// @brief A multi index container holding DHCPv4 leases.
 ///
 /// The leases in the container may be accessed using different indexes:
-/// - IPv4 address,
-/// - composite index: hardware address and subnet id,
+/// - IPv6 address,
+/// - composite index: HW address and subnet id,
 /// - composite index: client id and subnet id,
 /// - using a composite index: boolean flag indicating if the state is
 ///   "expired-reclaimed" and expiration time.
-/// - using subnet id.
-/// - using hostname.
-/// - using remote id.
-/// - using a composite index:
 ///
 /// Indexes can be accessed using the index number (from 0 to 5) or a
 /// name tag. It is recommended to use the tags to access indexes as
@@ -238,39 +226,11 @@ typedef boost::multi_index_container<
             boost::multi_index::member<Lease, isc::dhcp::SubnetID, &Lease::subnet_id_>
         >,
 
-        // Specification of the sixth index starts here.
+        // Specification of the seventh index starts here
         // This index is used to retrieve leases for matching hostname.
         boost::multi_index::ordered_non_unique<
             boost::multi_index::tag<HostnameIndexTag>,
             boost::multi_index::member<Lease, std::string, &Lease::hostname_>
-        >,
-
-        // Specification of the seventh index starts here.
-        // This index is used to retrieve leases for matching remote id
-        // for Bulk Lease Query.
-        boost::multi_index::hashed_non_unique<
-            boost::multi_index::tag<RemoteIdIndexTag>,
-            boost::multi_index::member<Lease4,
-                                       std::vector<uint8_t>,
-                                       &Lease4::remote_id_>
-        >,
-
-        // Specification of the eighth index starts here.
-        // This index is used to retrieve leases for matching relay id
-        // for Bulk Lease Query.
-        boost::multi_index::ordered_non_unique<
-            boost::multi_index::tag<RelayIdIndexTag>,
-            boost::multi_index::composite_key<
-                Lease4,
-                // Relay id.
-                boost::multi_index::member<Lease4,
-                                           std::vector<uint8_t>,
-                                           &Lease4::relay_id_>,
-                // Address.
-                boost::multi_index::member<Lease,
-                                           isc::asiolink::IOAddress,
-                                           &Lease::addr_>
-            >
         >
     >
 > Lease4Storage; // Specify the type name for this container.
@@ -319,12 +279,6 @@ typedef Lease4Storage::index<SubnetIdIndexTag>::type Lease4StorageSubnetIdIndex;
 /// @brief DHCPv4 lease storage index by hostname.
 typedef Lease4Storage::index<HostnameIndexTag>::type Lease4StorageHostnameIndex;
 
-/// @brief DHCPv4 lease storage index by remote identifier.
-typedef Lease4Storage::index<RemoteIdIndexTag>::type Lease4StorageRemoteIdIndex;
-
-/// @brief DHCPv4 lease storage index by relay identifier.
-typedef Lease4Storage::index<RelayIdIndexTag>::type Lease4StorageRelayIdIndex;
-
 //@}
 
 /// @name Multi index containers holding DHCPv6 lease extended informations