From: Marcin Siodelski <marcin@isc.org>
Date: Thu, 30 Jul 2015 13:38:26 +0000 (+0200)
Subject: [3947] Removed spurious config parameter from the Subnet6.
X-Git-Tag: trac3238_base~6^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cec8b02288ceb4247123d6c7ce5786f7812e10ea;p=thirdparty%2Fkea.git

[3947] Removed spurious config parameter from the Subnet6.
---

diff --git a/src/lib/dhcpsrv/subnet.cc b/src/lib/dhcpsrv/subnet.cc
index 3b13d7e03c..f4d5c3ec9d 100644
--- a/src/lib/dhcpsrv/subnet.cc
+++ b/src/lib/dhcpsrv/subnet.cc
@@ -330,8 +330,7 @@ Subnet6::Subnet6(const isc::asiolink::IOAddress& prefix, uint8_t length,
                  const Triplet<uint32_t>& valid_lifetime,
                  const SubnetID id)
     :Subnet(prefix, length, t1, t2, valid_lifetime, RelayInfo(IOAddress("::")), id),
-     preferred_(preferred_lifetime), rapid_commit_(false),
-     alloc_leases_on_renew_(true) {
+     preferred_(preferred_lifetime), rapid_commit_(false) {
     if (!prefix.isV6()) {
         isc_throw(BadValue, "Non IPv6 prefix " << prefix
                   << " specified in subnet6");
diff --git a/src/lib/dhcpsrv/subnet.h b/src/lib/dhcpsrv/subnet.h
index 730ed7d0bd..55e4ddd716 100644
--- a/src/lib/dhcpsrv/subnet.h
+++ b/src/lib/dhcpsrv/subnet.h
@@ -655,21 +655,6 @@ public:
         return (rapid_commit_);
     }
 
-    /// @brief Enables or disables the allocation of the new leases for the
-    /// Renew and Rebind case.
-    ///
-    /// @param alloc_leases_on_renew A boolean value indicating if the server
-    /// can allocate new leases for the Renew and Rebind case.
-    void setAllocLeasesOnRenew(const bool alloc_leases_on_renew) {
-        alloc_leases_on_renew_ = alloc_leases_on_renew;
-    }
-
-    /// @brief Returns boolean value indicating if the new leases are allocated
-    /// by the server as a result of processing Renew and/or Rebind.
-    bool getAllocLeasesOnRenew() const {
-        return (alloc_leases_on_renew_);
-    }
-
 private:
 
     /// @brief Returns default address for pool selection
@@ -699,17 +684,6 @@ private:
     /// Commit is disabled for the subnet.
     bool rapid_commit_;
 
-    /// @brief A flag indicating if the server may allocate new leases
-    /// for the client sending a Renew or Rebind message.
-    ///
-    /// This flag indicates that the client may request allocation of the
-    /// new leases (of any type) when it renews existing leases. This
-    /// facilitates the use cases described in RFC7550. If the server is
-    /// configured to allocate new leases for the Renew and Rebind case
-    /// but it can't allocate them (e.g. because of the pool exhaustion)
-    /// it will send the NoAddrsAvail or the NoPrefixAvail status code
-    /// in the IA, depending on the IA type.
-    bool alloc_leases_on_renew_;
 };
 
 /// @brief A pointer to a Subnet6 object
diff --git a/src/lib/dhcpsrv/tests/subnet_unittest.cc b/src/lib/dhcpsrv/tests/subnet_unittest.cc
index aa75f155aa..8a5ad8af72 100644
--- a/src/lib/dhcpsrv/tests/subnet_unittest.cc
+++ b/src/lib/dhcpsrv/tests/subnet_unittest.cc
@@ -1059,24 +1059,6 @@ TEST(Subnet6Test, rapidCommit) {
     EXPECT_FALSE(subnet.getRapidCommit());
 }
 
-// This test checks that the flag which indicates if the new leases are
-// allocated as a result of processing the Renew and Rebind message can
-// be set to "enable" or "disable".
-TEST(Subnet6Test, allocNewLeasesOnRenew) {
-    Subnet6 subnet(IOAddress("2001:db8:1::"), 56, 1, 2, 3, 4);
-
-    // By default, the flag should be enabled.
-    EXPECT_TRUE(subnet.getAllocLeasesOnRenew());
-
-    // Disable it.
-    subnet.setAllocLeasesOnRenew(false);
-    EXPECT_FALSE(subnet.getAllocLeasesOnRenew());
-
-    // Enable again.
-    subnet.setAllocLeasesOnRenew(true);
-    EXPECT_TRUE(subnet.getAllocLeasesOnRenew());
-}
-
 // Checks if last allocated address/prefix is stored/retrieved properly
 TEST(Subnet6Test, lastAllocated) {
     IOAddress ia("2001:db8:1::1");