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

daemon/fw/strategy.hpp

diff --git a/daemon/fw/strategy.hpp b/daemon/fw/strategy.hpp
index eaeed26..d690b0f 100644
--- a/daemon/fw/strategy.hpp
+++ b/daemon/fw/strategy.hpp
@@ -113,7 +113,8 @@
   /// send Interest to outFace
   VIRTUAL_WITH_TESTS void
   sendInterest(shared_ptr<pit::Entry> pitEntry,
-               shared_ptr<Face> outFace);
+               shared_ptr<Face> outFace,
+               bool wantNewNonce = false);
 
   /** \brief decide that a pending Interest cannot be forwarded
    *
@@ -150,9 +151,10 @@
 
 inline void
 Strategy::sendInterest(shared_ptr<pit::Entry> pitEntry,
-                       shared_ptr<Face> outFace)
+                       shared_ptr<Face> outFace,
+                       bool wantNewNonce)
 {
-  m_forwarder.onOutgoingInterest(pitEntry, *outFace);
+  m_forwarder.onOutgoingInterest(pitEntry, *outFace, wantNewNonce);
 }
 
 inline void