commit 13b76f09370b9d072fdac835a9199044880a635c
author Davide Pesavento <davide.pesavento@lip6.fr> Thu Feb 26 03:59:54 2015 +0100
committer Davide Pesavento <davide.pesavento@lip6.fr> Thu Feb 26 18:45:19 2015 +0100
tree 6287cbce095dcf7cdc93ddec038447e84a479b25
parent be40fb1e568bb02b2307736c0ec3cb39bb6c7d70

face: copy also the link type in copyStatusTo

Change-Id: I3787210328f326fd788e7f0f3e23493e4dfa9ddd
Refs: #2563

daemon/face/udp-face.cpp

diff --git a/daemon/face/udp-face.cpp b/daemon/face/udp-face.cpp
index 8962f0d..27c78b3 100644
--- a/daemon/face/udp-face.cpp
+++ b/daemon/face/udp-face.cpp
@@ -81,20 +81,19 @@
 ndn::nfd::FaceStatus
 UdpFace::getFaceStatus() const
 {
-  auto status = Face::getFaceStatus();
+  auto status = DatagramFace::getFaceStatus();
 
   if (isOnDemand()) {
-    time::milliseconds left = m_idleTimeout - time::duration_cast<time::milliseconds>(
-      time::steady_clock::now() - m_lastIdleCheck);
+    time::milliseconds left = m_idleTimeout;
+    left -= time::duration_cast<time::milliseconds>(time::steady_clock::now() - m_lastIdleCheck);
+
     if (left < time::milliseconds::zero())
       left = time::milliseconds::zero();
 
-    if (hasBeenUsedRecently()) {
-      status.setExpirationPeriod(left + m_idleTimeout);
-    }
-    else {
-      status.setExpirationPeriod(left);
-    }
+    if (hasBeenUsedRecently())
+      left += m_idleTimeout;
+
+    status.setExpirationPeriod(left);
   }
 
   return status;