commit 57f0f311f2d511846f5479007ee94f96ab468087
author Junxiao Shi <git@mail1.yoursunny.com> Sun Mar 16 11:52:20 2014 -0700
committer Alex Afanasyev <alexander.afanasyev@ucla.edu> Sun Mar 16 17:19:28 2014 -0700
tree 243d3c90441768e0312008d55c5ffd48cb5f5a76
parent 141eaae99e17d186068e63484c9a0fb844a041a3

fw: make strategies understand scope

refs #1253

Change-Id: I57f7a6008e6f08c9817e58f480020eb9219a4aec

daemon/fw/broadcast-strategy.cpp

diff --git a/daemon/fw/broadcast-strategy.cpp b/daemon/fw/broadcast-strategy.cpp
index 3e8c2bf..7f5b248 100644
--- a/daemon/fw/broadcast-strategy.cpp
+++ b/daemon/fw/broadcast-strategy.cpp
@@ -28,16 +28,14 @@
 {
   const fib::NextHopList& nexthops = fibEntry->getNextHops();
 
-  bool isPropagated = false;
   for (fib::NextHopList::const_iterator it = nexthops.begin(); it != nexthops.end(); ++it) {
     shared_ptr<Face> outFace = it->getFace();
-    if (outFace->getId() != inFace.getId()) {
+    if (pitEntry->canForwardTo(*outFace)) {
       this->sendInterest(pitEntry, outFace);
-      isPropagated = true;
     }
   }
 
-  if (!isPropagated) {
+  if (!pitEntry->hasUnexpiredOutRecords()) {
     this->rejectPendingInterest(pitEntry);
   }
 }