[master] Merge branch 'trac3988' (lease{4,6}_recover hooks)

# Conflicts:
#	src/lib/dhcpsrv/alloc_engine.cc
#	src/lib/dhcpsrv/tests/alloc_engine_expiration_unittest.cc

1 files changed, 8 insertions, 4 deletions

diff --git a/src/lib/dhcpsrv/alloc_engine.h b/src/lib/dhcpsrv/alloc_engine.h
index b119078934..303a890529 100644
--- a/src/lib/dhcpsrv/alloc_engine.h
+++ b/src/lib/dhcpsrv/alloc_engine.h
@@ -881,20 +881,24 @@ private:
     /// These are the additional steps required when recoving a declined lease:
     /// - bump decline recovered stat
     /// - log lease recovery
-    /// - call hook (@todo)
+    /// - call lease4_recover hook
     ///
     /// @param lease Lease to be reclaimed from Declined state
-    void reclaimDeclined(const Lease4Ptr& lease);
+    /// @return true if it's ok to remove the lease (false = hooks status says
+    ///         to keep it)
+    bool reclaimDeclined(const Lease4Ptr& lease);
 
     /// @brief Conducts steps necessary for reclaiming declined IPv6 lease.
     ///
     /// These are the additional steps required when recoving a declined lease:
     /// - bump decline recovered stat
     /// - log lease recovery
-    /// - call hook (@todo)
+    /// - call lease6_recover hook
     ///
     /// @param lease Lease to be reclaimed from Declined state
-    void reclaimDeclined(const Lease6Ptr& lease);
+    /// @return true if it's ok to remove the lease (false = hooks status says
+    ///         to keep it)
+    bool reclaimDeclined(const Lease6Ptr& lease);
 
 public: