commit 2fe3af057730719784d5b4c0f5804102c44e6db5
author Junxiao Shi <git@mail1.yoursunny.com> Sat Mar 04 17:24:19 2017 +0000
committer Junxiao Shi <git@mail1.yoursunny.com> Sat Mar 04 17:24:19 2017 +0000
tree c8843d02ecd68f145ffcc8dafdedc6b4b3363c41
parent ecdbe5f2a69da69a4558bc6da26f453955eb4b5b

fw: duplicate Nonce from same face is not loop

refs #3888

Change-Id: I973f58281dca32b5f807d7be82a49d04314cbfb1

daemon/fw/forwarder.cpp

diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index 1e01e02..7a36042 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -159,8 +159,12 @@
   shared_ptr<pit::Entry> pitEntry = m_pit.insert(interest).first;
 
   // detect duplicate Nonce in PIT entry
-  bool hasDuplicateNonceInPit = fw::findDuplicateNonce(*pitEntry, interest.getNonce(), inFace) !=
-                                fw::DUPLICATE_NONCE_NONE;
+  int dnw = fw::findDuplicateNonce(*pitEntry, interest.getNonce(), inFace);
+  bool hasDuplicateNonceInPit = dnw != fw::DUPLICATE_NONCE_NONE;
+  if (inFace.getLinkType() == ndn::nfd::LINK_TYPE_POINT_TO_POINT) {
+    // for p2p face: duplicate Nonce from same incoming face is not loop
+    hasDuplicateNonceInPit = hasDuplicateNonceInPit && !(dnw & fw::DUPLICATE_NONCE_IN_SAME);
+  }
   if (hasDuplicateNonceInPit) {
     // goto Interest loop pipeline
     this->onInterestLoop(inFace, interest);