fw: localhop scope restriction in best-route v1, multicast, ncc strategies
canForwardToLegacy function no longer checks scope. Strategies using this
function shall use wouldViolateScope separately.
refs #3841, #1756
Change-Id: Ib1bd3f9fe19e4cadfa27e86dcc730d16cfd4b0db
diff --git a/daemon/fw/multicast-strategy.cpp b/daemon/fw/multicast-strategy.cpp
index 2821d71..3d6e8b2 100644
--- a/daemon/fw/multicast-strategy.cpp
+++ b/daemon/fw/multicast-strategy.cpp
@@ -46,8 +46,9 @@
for (fib::NextHopList::const_iterator it = nexthops.begin(); it != nexthops.end(); ++it) {
Face& outFace = it->getFace();
- if (canForwardToLegacy(*pitEntry, outFace)) {
- this->sendInterest(pitEntry, outFace);
+ if (!wouldViolateScope(inFace, interest, outFace) &&
+ canForwardToLegacy(*pitEntry, outFace)) {
+ this->sendInterest(pitEntry, outFace, interest);
}
}