commit 2a73f35ce69627540132ad5775bceff925f7f090
author Ashlesh Gawande <agawande@memphis.edu> Thu Dec 01 15:37:03 2016 +0000
committer Ashlesh Gawande <agawande@memphis.edu> Thu Dec 01 17:27:02 2016 -0600
tree b629de30b8c044b37e76ab923f14ee50d36e5bae
parent aaa58a6c10e0527f771b329a47dba5824e1aa8d4

fw: localhop scope restriction in ASF strategy

refs: #3841, #1756

Change-Id: Ic82e7055ace9d3f8eca8f9bad94603692ff321d5

daemon/fw/asf-probing-module.cpp

diff --git a/daemon/fw/asf-probing-module.cpp b/daemon/fw/asf-probing-module.cpp
index 485a3e9..f29d0e7 100644
--- a/daemon/fw/asf-probing-module.cpp
+++ b/daemon/fw/asf-probing-module.cpp
@@ -25,6 +25,7 @@
 
 #include "asf-probing-module.hpp"
 #include "core/random.hpp"
+#include "algorithm.hpp"
 
 namespace nfd {
 namespace fw {
@@ -84,8 +85,9 @@
     Face& hopFace = hop.getFace();
 
     // Don't send probe Interest back to the incoming face or use the same face
-    // as the forwarded Interest
-    if (hopFace.getId() == inFace.getId() || hopFace.getId() == faceUsed.getId()) {
+    // as the forwarded Interest or use a face that violates scope
+    if (hopFace.getId() == inFace.getId() || hopFace.getId() == faceUsed.getId() ||
+        wouldViolateScope(inFace, interest, hopFace)) {
       continue;
     }