commit 3494f7366a4483036352275a92c57f017dfa06eb
author Ashlesh Gawande <agawande@memphis.edu> Tue Nov 06 16:04:03 2018 -0600
committer Ashlesh Gawande <agawande@memphis.edu> Tue Nov 06 17:30:40 2018 -0600
tree d6acb81d2becc9ca99e5b0eb89edda9e8b4f8594
parent 05cb728c6321f07c8d56f6a57daad9c007d59f9a

src: disallow interest loopbacks

refs: #4768

Change-Id: If5ec53fc9869b65e318c3eaf950708cfa36e658a

src/nlsr.cpp

diff --git a/src/nlsr.cpp b/src/nlsr.cpp
index 2823a74..00f4d8e 100644
--- a/src/nlsr.cpp
+++ b/src/nlsr.cpp
@@ -102,7 +102,7 @@
 
   NLSR_LOG_DEBUG("Setting interest filter for Hello interest: " << name);
 
-  m_nlsrFace.setInterestFilter(name,
+  m_nlsrFace.setInterestFilter(ndn::InterestFilter(name).allowLoopback(false),
                                std::bind(&HelloProtocol::processInterest,
                                          &m_helloProtocol, _1, _2),
                                std::bind(&Nlsr::onRegistrationSuccess, this, _1),
@@ -118,7 +118,7 @@
 
   NLSR_LOG_DEBUG("Setting interest filter for LsaPrefix: " << name);
 
-  m_nlsrFace.setInterestFilter(name,
+  m_nlsrFace.setInterestFilter(ndn::InterestFilter(name).allowLoopback(false),
                                std::bind(&Lsdb::processInterest,
                                          &m_nlsrLsdb, _1, _2),
                                std::bind(&Nlsr::onRegistrationSuccess, this, _1),
@@ -228,9 +228,9 @@
   if (cert != nullptr) {
     m_certStore.insert(*cert);
     NLSR_LOG_TRACE(*cert);
-    NLSR_LOG_TRACE("Setting interest filter for: "
-                   << ndn::security::v2::extractKeyNameFromCertName(cert->getName()));
-    m_nlsrFace.setInterestFilter(ndn::security::v2::extractKeyNameFromCertName(cert->getName()),
+    ndn::Name certName = ndn::security::v2::extractKeyNameFromCertName(cert->getName());
+    NLSR_LOG_TRACE("Setting interest filter for: " << certName);
+    m_nlsrFace.setInterestFilter(ndn::InterestFilter(certName).allowLoopback(false),
                                  std::bind(&Nlsr::onKeyInterest,
                                            this, _1, _2),
                                  std::bind(&Nlsr::onKeyPrefixRegSuccess, this, _1),
@@ -382,7 +382,7 @@
   nlsrKeyPrefix.append("nlsr");
   nlsrKeyPrefix.append("KEY");
 
-  m_nlsrFace.setInterestFilter(nlsrKeyPrefix,
+  m_nlsrFace.setInterestFilter(ndn::InterestFilter(nlsrKeyPrefix).allowLoopback(false),
                                std::bind(&Nlsr::onKeyInterest,
                                          this, _1, _2),
                                std::bind(&Nlsr::onKeyPrefixRegSuccess, this, _1),
@@ -394,7 +394,7 @@
   ndn::Name routerKeyPrefix = getConfParameter().getRouterPrefix();
   routerKeyPrefix.append("KEY");
 
-  m_nlsrFace.setInterestFilter(routerKeyPrefix,
+  m_nlsrFace.setInterestFilter(ndn::InterestFilter(routerKeyPrefix).allowLoopback(false),
                                  std::bind(&Nlsr::onKeyInterest,
                                            this, _1, _2),
                                  std::bind(&Nlsr::onKeyPrefixRegSuccess, this, _1),
@@ -407,7 +407,7 @@
   operatorKeyPrefix.append(getConfParameter().getSiteName());
   operatorKeyPrefix.append(std::string("%C1.Operator"));
 
-  m_nlsrFace.setInterestFilter(operatorKeyPrefix,
+  m_nlsrFace.setInterestFilter(ndn::InterestFilter(operatorKeyPrefix).allowLoopback(false),
                                std::bind(&Nlsr::onKeyInterest,
                                          this, _1, _2),
                                std::bind(&Nlsr::onKeyPrefixRegSuccess, this, _1),
@@ -420,7 +420,7 @@
   siteKeyPrefix.append(getConfParameter().getSiteName());
   siteKeyPrefix.append("KEY");
 
-  m_nlsrFace.setInterestFilter(siteKeyPrefix,
+  m_nlsrFace.setInterestFilter(ndn::InterestFilter(siteKeyPrefix).allowLoopback(false),
                                std::bind(&Nlsr::onKeyInterest,
                                           this, _1, _2),
                                std::bind(&Nlsr::onKeyPrefixRegSuccess, this, _1),