commit 4f5cdcf4211e63f575febd2fc7cca31e152dae9d
author Teng Liang <philoliang2011@gmail.com> Thu Mar 16 15:33:31 2017 -0700
committer Teng Liang <philoliang2011@gmail.com> Thu Mar 16 15:54:03 2017 -0700
tree 297a6f9e8ee309847f353d7b51cc56a62125f4fe
parent d396b61ba14a84b34d3ae65db4530062f7d43301

fw: avoid breaking logic after LINK_TYPE_AD_HOC is introduced

Change-Id: I4f17a3a92c6ec44f1cb3ee619600c07e2ec39a16
Refs: #3967

daemon/fw/forwarder.cpp

diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index 7a36042..052258a 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -188,8 +188,8 @@
 void
 Forwarder::onInterestLoop(Face& inFace, const Interest& interest)
 {
-  // if multi-access face, drop
-  if (inFace.getLinkType() == ndn::nfd::LINK_TYPE_MULTI_ACCESS) {
+  // if multi-access or ad hoc face, drop
+  if (inFace.getLinkType() != ndn::nfd::LINK_TYPE_POINT_TO_POINT) {
     NFD_LOG_DEBUG("onInterestLoop face=" << inFace.getId() <<
                   " interest=" << interest.getName() <<
                   " drop");
@@ -431,8 +431,8 @@
   nack.setTag(make_shared<lp::IncomingFaceIdTag>(inFace.getId()));
   ++m_counters.nInNacks;
 
-  // if multi-access face, drop
-  if (inFace.getLinkType() == ndn::nfd::LINK_TYPE_MULTI_ACCESS) {
+  // if multi-access or ad hoc face, drop
+  if (inFace.getLinkType() != ndn::nfd::LINK_TYPE_POINT_TO_POINT) {
     NFD_LOG_DEBUG("onIncomingNack face=" << inFace.getId() <<
                   " nack=" << nack.getInterest().getName() <<
                   "~" << nack.getReason() << " face-is-multi-access");
@@ -502,8 +502,8 @@
     return;
   }
 
-  // if multi-access face, drop
-  if (outFace.getLinkType() == ndn::nfd::LINK_TYPE_MULTI_ACCESS) {
+  // if multi-access or ad hoc face, drop
+  if (outFace.getLinkType() != ndn::nfd::LINK_TYPE_POINT_TO_POINT) {
     NFD_LOG_DEBUG("onOutgoingNack face=" << outFace.getId() <<
                   " nack=" << pitEntry->getInterest().getName() <<
                   "~" << nack.getReason() << " face-is-multi-access");