commit a57f8b41942183b76ff0394c3c9e85a995e8fd4a
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jul 10 20:11:32 2014 -0700
committer Junxiao Shi <sunnylandh@gmail.com> Mon Jul 14 19:59:44 2014 -0700
tree fc63058f1b264110834b66f0fe8b486ec72a4239
parent 28d586a16b115d0324f76acce138ec1d46fdc64b

fw: set unsatisfy timer in incoming Interest pipeline

Change-Id: I478de1482f79f96f81162ab5e6e8df490061b852
Refs: #1754

daemon/fw/forwarder.cpp

diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index 6c4163f..0e2f0d2 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -103,6 +103,9 @@
   // insert InRecord
   pitEntry->insertOrUpdateInRecord(inFace.shared_from_this(), interest);
 
+  // set PIT unsatisfy timer
+  this->setUnsatisfyTimer(pitEntry);
+
   // FIB lookup
   shared_ptr<fib::Entry> fibEntry = m_fib.findLongestPrefixMatch(*pitEntry);
 
@@ -182,9 +185,6 @@
   // insert OutRecord
   pitEntry->insertOrUpdateOutRecord(outFace.shared_from_this(), *interest);
 
-  // set PIT unsatisfy timer
-  this->setUnsatisfyTimer(pitEntry);
-
   // send Interest
   outFace.sendInterest(*interest);
   m_counters.getNOutInterests() ++;
@@ -200,6 +200,9 @@
   }
   NFD_LOG_DEBUG("onInterestReject interest=" << pitEntry->getName());
 
+  // cancel unsatisfy & straggler timer
+  this->cancelUnsatisfyAndStragglerTimer(pitEntry);
+
   // set PIT straggler timer
   this->setStragglerTimer(pitEntry);
 }