fw: delete deprecated Strategy::sendInterest overload and violatesScope

refs #1756, #3841

Change-Id: Idd5fb5692435c864a0a9b140992e615b280243a3
This commit is contained in:
Junxiao Shi committed 2016-12-01 23:43:01 +00:00
1 parent 2a73f35ce6
commit 57cda13f7b
5 files changed
-135

No files matched your search

-23
View File
@@ -55,29 +55,6 @@ wouldViolateScope(const Face& inFace, const Interest& interest, const Face& outF
return false;
}
bool
violatesScope(const pit::Entry& pitEntry, const Face& outFace)
{
if (outFace.getScope() == ndn::nfd::FACE_SCOPE_LOCAL) {
return false;
}
BOOST_ASSERT(outFace.getScope() == ndn::nfd::FACE_SCOPE_NON_LOCAL);
if (scope_prefix::LOCALHOST.isPrefixOf(pitEntry.getName())) {
// face is non-local, violates localhost scope
return true;
}
if (scope_prefix::LOCALHOP.isPrefixOf(pitEntry.getName())) {
// face is non-local, violates localhop scope unless PIT entry has local in-record
return std::none_of(pitEntry.in_begin(), pitEntry.in_end(),
[] (const pit::InRecord& inRecord) { return inRecord.getFace().getScope() == ndn::nfd::FACE_SCOPE_LOCAL; });
}
// Name is not subject to scope control
return false;
}
bool
canForwardToLegacy(const pit::Entry& pitEntry, const Face& face)
{