From: Marcin Siodelski <marcin@isc.org>
Date: Fri, 26 Jun 2015 16:33:29 +0000 (+0200)
Subject: [3913] Addressed review comments.
X-Git-Tag: trac3911_base~3^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65b25d4e1cf7a9364500dd9cedd69215a91a1ed2;p=thirdparty%2Fkea.git

[3913] Addressed review comments.

Moved the function from the anon namespace to the AllocEngine class.
---

diff --git a/src/lib/dhcpsrv/alloc_engine.cc b/src/lib/dhcpsrv/alloc_engine.cc
index 34633aa622..1bbf0ca699 100644
--- a/src/lib/dhcpsrv/alloc_engine.cc
+++ b/src/lib/dhcpsrv/alloc_engine.cc
@@ -289,45 +289,10 @@ AllocEngine::AllocatorPtr AllocEngine::getAllocator(Lease::Type type) {
     return (alloc->second);
 }
 
-} // end of isc::dhcp namespace
-} // end of isc namespace
-
-namespace {
-
-/// @brief Extends the lease lifetime.
-///
-/// This function is called to conditionally extend the lifetime of
-/// the DHCPv4 or DHCPv6 lease. It is envisaged that this function will
-/// make a decision if the lease lifetime should be extended, using
-/// a preconfigured threshold, which would indicate how many percent
-/// of the valid lifetime should have passed for the lease lifetime
-/// to be extended. The lease lifetime would not be extended if
-/// the threshold hasn't been reached.
-///
-/// @todo Currently this function always extends the lease lifetime.
-/// In the future, it will take the threshold value into account,
-/// once the threshold is configurable.
-///
-/// @param [out] lease A lease for which the lifetime should be
-/// extended.
-///
-/// @return true if the lease lifetime has been extended, false
-/// otherwise.
-bool
-conditionalExtendLifetime(Lease& lease) {
-    lease.cltt_ = time(NULL);
-    return (true);
-}
-
-} // end of anonymous namespace
-
 // ##########################################################################
 // #    DHCPv6 lease allocation code starts here.
 // ##########################################################################
 
-namespace isc {
-namespace dhcp {
-
 AllocEngine::ClientContext6::ClientContext6()
     : subnet_(), duid_(), iaid_(0), type_(Lease::TYPE_NA), hwaddr_(),
       hints_(), fwd_dns_update_(false), rev_dns_update_(false), hostname_(""),
@@ -2077,5 +2042,11 @@ AllocEngine::updateLease4Information(const Lease4Ptr& lease,
     lease->hostname_ = ctx.hostname_;
 }
 
+bool
+AllocEngine::conditionalExtendLifetime(Lease& lease) const {
+    lease.cltt_ = time(NULL);
+    return (true);
+}
+
 }; // end of isc::dhcp namespace
 }; // end of isc namespace
diff --git a/src/lib/dhcpsrv/alloc_engine.h b/src/lib/dhcpsrv/alloc_engine.h
index 2c2335dbe3..408e4dc91e 100644
--- a/src/lib/dhcpsrv/alloc_engine.h
+++ b/src/lib/dhcpsrv/alloc_engine.h
@@ -1091,6 +1091,28 @@ private:
     /// client and its message.
     void updateLease4Information(const Lease4Ptr& lease,
                                  ClientContext4& ctx) const;
+
+    /// @brief Extends the lease lifetime.
+    ///
+    /// This function is called to conditionally extend the lifetime of
+    /// the DHCPv4 or DHCPv6 lease. It is envisaged that this function will
+    /// make a decision if the lease lifetime should be extended, using
+    /// a preconfigured threshold, which would indicate how many percent
+    /// of the valid lifetime should have passed for the lease lifetime
+    /// to be extended. The lease lifetime would not be extended if
+    /// the threshold hasn't been reached.
+    ///
+    /// @todo Currently this function always extends the lease lifetime.
+    /// In the future, it will take the threshold value into account,
+    /// once the threshold is configurable.
+    ///
+    /// @param [in,out] lease A lease for which the lifetime should be
+    /// extended.
+    ///
+    /// @return true if the lease lifetime has been extended, false
+    /// otherwise.
+    bool conditionalExtendLifetime(Lease& lease) const;
+
 };
 
 /// @brief A pointer to the @c AllocEngine object.