commit d938a6bb89851c41b8d4c4f62dfb895006280ffc
author Junxiao Shi <git@mail1.yoursunny.com> Sun May 11 23:40:29 2014 -0700
committer Junxiao Shi <git@mail1.yoursunny.com> Thu May 15 11:37:53 2014 -0700
tree d01845fe6b27e98bee800cee63a5e238afbe18dc
parent f6980284e6110a73f9b370411487f75a069f84a8

fw: Strategy::sendInterest allows changing Nonce

This commit also includes some tweaks in forwarding pipelines.

refs #1596

Change-Id: I65a4129be24089357b28fa9d35a3451e0d9ae258

tests/daemon/fw/strategy-tester.hpp

diff --git a/tests/daemon/fw/strategy-tester.hpp b/tests/daemon/fw/strategy-tester.hpp
index e3debef..261c1a9 100644
--- a/tests/daemon/fw/strategy-tester.hpp
+++ b/tests/daemon/fw/strategy-tester.hpp
@@ -51,7 +51,9 @@
 
 protected:
   virtual void
-  sendInterest(shared_ptr<pit::Entry> pitEntry,shared_ptr<Face> outFace);
+  sendInterest(shared_ptr<pit::Entry> pitEntry,
+               shared_ptr<Face> outFace,
+               bool wantNewNonce = false);
 
   virtual void
   rejectPendingInterest(shared_ptr<pit::Entry> pitEntry);
@@ -68,7 +70,8 @@
 template<typename S>
 inline void
 StrategyTester<S>::sendInterest(shared_ptr<pit::Entry> pitEntry,
-                                shared_ptr<Face> outFace)
+                                shared_ptr<Face> outFace,
+                                bool wantNewNonce)
 {
   m_sendInterestHistory.push_back(SendInterestArgs(pitEntry, outFace));
   pitEntry->insertOrUpdateOutRecord(outFace, pitEntry->getInterest());