commit c64d30aeff3c9ddd6685bd89ba015257d029f826
author Eric Newberry <enewberry@email.arizona.edu> Sat Dec 26 11:07:27 2015 -0700
committer Alex Afanasyev <aa@cs.ucla.edu> Tue Dec 29 13:11:47 2015 -0800
tree 6456393b6a4319e04b0b60bf524ae266b034ffc8
parent 5c47597be9cbcbff920a5f780cbf94bb649e8d4f

mgmt: re-added expiration time to FaceStatus

refs #3381

Change-Id: I57d3166fc6ed52a54c442a80faffe7a7f4051e1d

daemon/mgmt/face-manager.hpp

diff --git a/daemon/mgmt/face-manager.hpp b/daemon/mgmt/face-manager.hpp
index c2f43bb..fda4fbe 100644
--- a/daemon/mgmt/face-manager.hpp
+++ b/daemon/mgmt/face-manager.hpp
@@ -107,6 +107,11 @@
   bool
   doesMatchFilter(const ndn::nfd::FaceQueryFilter& filter, shared_ptr<Face> face);
 
+  /** \brief get status of face, including properties and counters
+   */
+  static ndn::nfd::FaceStatus
+  collectFaceStatus(const Face& face, const time::steady_clock::TimePoint& now);
+
   /** \brief copy face properties into traits
    *  \tparam FaceTraits either FaceStatus or FaceEventNotification
    */
@@ -114,11 +119,6 @@
   static void
   collectFaceProperties(const Face& face, FaceTraits& traits);
 
-  /** \brief copy face counters into FaceStatus
-   */
-  static void
-  collectFaceCounters(const Face& face, ndn::nfd::FaceStatus& status);
-
 private: // NotificationStream
   void
   afterFaceAdded(shared_ptr<Face> face,