fw: make strategies understand scope
refs #1253
Change-Id: I57f7a6008e6f08c9817e58f480020eb9219a4aec
diff --git a/daemon/fw/best-route-strategy.cpp b/daemon/fw/best-route-strategy.cpp
index 8f87270..ac865d0 100644
--- a/daemon/fw/best-route-strategy.cpp
+++ b/daemon/fw/best-route-strategy.cpp
@@ -20,19 +20,34 @@
{
}
+static inline bool
+predicate_PitEntry_canForwardTo_NextHop(shared_ptr<pit::Entry> pitEntry,
+ const fib::NextHop& nexthop)
+{
+ return pitEntry->canForwardTo(*nexthop.getFace());
+}
+
void
BestRouteStrategy::afterReceiveInterest(const Face& inFace,
const Interest& interest,
shared_ptr<fib::Entry> fibEntry,
shared_ptr<pit::Entry> pitEntry)
{
+ if (pitEntry->hasUnexpiredOutRecords()) {
+ // not a new Interest, don't forward
+ return;
+ }
+
const fib::NextHopList& nexthops = fibEntry->getNextHops();
- if (nexthops.size() == 0) {
+ fib::NextHopList::const_iterator it = std::find_if(nexthops.begin(), nexthops.end(),
+ bind(&predicate_PitEntry_canForwardTo_NextHop, pitEntry, _1));
+
+ if (it == nexthops.end()) {
this->rejectPendingInterest(pitEntry);
return;
}
-
- shared_ptr<Face> outFace = nexthops.begin()->getFace();
+
+ shared_ptr<Face> outFace = it->getFace();
this->sendInterest(pitEntry, outFace);
}
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);
}
}
diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index a723a17..4ab852e 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -13,9 +13,7 @@
using fw::Strategy;
-const ndn::Milliseconds Forwarder::DEFAULT_INTEREST_LIFETIME(static_cast<ndn::Milliseconds>(4000));
const Name Forwarder::LOCALHOST_NAME("ndn:/localhost");
-const Name Forwarder::LOCALHOP_NAME("ndn:/localhop");
Forwarder::Forwarder()
: m_faceTable(*this)
@@ -35,9 +33,6 @@
NFD_LOG_DEBUG("onIncomingInterest face=" << inFace.getId() <<
" interest=" << interest.getName());
const_cast<Interest&>(interest).setIncomingFaceId(inFace.getId());
- if (interest.getInterestLifetime() < 0) {
- const_cast<Interest&>(interest).setInterestLifetime(DEFAULT_INTEREST_LIFETIME);
- }
m_counters.getInInterest() ++;
// /localhost scope control
@@ -132,22 +127,10 @@
NFD_LOG_DEBUG("onOutgoingInterest face=" << outFace.getId() <<
" interest=" << pitEntry->getName());
- // /localhost scope control
- bool isViolatingLocalhost = !outFace.isLocal() &&
- LOCALHOST_NAME.isPrefixOf(pitEntry->getName());
- if (isViolatingLocalhost) {
+ // scope control
+ if (pitEntry->violatesScope(outFace)) {
NFD_LOG_DEBUG("onOutgoingInterest face=" << outFace.getId() <<
- " interest=" << pitEntry->getName() << " violates /localhost");
- return;
- }
-
- // /localhop scope control
- bool isViolatingLocalhop = !outFace.isLocal() &&
- LOCALHOP_NAME.isPrefixOf(pitEntry->getName()) &&
- !pitEntry->hasLocalInRecord();
- if (isViolatingLocalhop) {
- NFD_LOG_DEBUG("onOutgoingInterest face=" << outFace.getId() <<
- " interest=" << pitEntry->getName() << " violates /localhop");
+ " interest=" << pitEntry->getName() << " violates scope");
return;
}
@@ -323,6 +306,12 @@
void
Forwarder::setStragglerTimer(shared_ptr<pit::Entry> pitEntry)
{
+ if (pitEntry->hasUnexpiredOutRecords()) {
+ NFD_LOG_DEBUG("setStragglerTimer " << pitEntry->getName() <<
+ " cannot set StragglerTimer when an OutRecord is pending");
+ return;
+ }
+
time::Duration stragglerTime = time::milliseconds(100);
pitEntry->m_stragglerTimer = scheduler::schedule(stragglerTime,
diff --git a/daemon/fw/forwarder.hpp b/daemon/fw/forwarder.hpp
index e229dcf..2d4d325 100644
--- a/daemon/fw/forwarder.hpp
+++ b/daemon/fw/forwarder.hpp
@@ -157,9 +157,7 @@
Measurements m_measurements;
StrategyChoice m_strategyChoice;
- static const ndn::Milliseconds DEFAULT_INTEREST_LIFETIME;
static const Name LOCALHOST_NAME;
- static const Name LOCALHOP_NAME;
// allow Strategy (base class) to enter pipelines
friend class fw::Strategy;
diff --git a/daemon/fw/ncc-strategy.cpp b/daemon/fw/ncc-strategy.cpp
index d8928f5..79d8b1a 100644
--- a/daemon/fw/ncc-strategy.cpp
+++ b/daemon/fw/ncc-strategy.cpp
@@ -53,7 +53,7 @@
shared_ptr<Face> bestFace = measurementsEntryInfo->getBestFace();
if (static_cast<bool>(bestFace) && fibEntry->hasNextHop(bestFace) &&
- pitEntry->canForwardTo(bestFace)) {
+ pitEntry->canForwardTo(*bestFace)) {
// TODO Should we use `randlow = 100 + nrand48(h->seed) % 4096U;` ?
deferFirst = measurementsEntryInfo->m_prediction;
deferRange = static_cast<time::Duration>((deferFirst + time::microseconds(1)) / 2);
@@ -71,7 +71,7 @@
shared_ptr<Face> previousFace = measurementsEntryInfo->m_previousFace.lock();
if (static_cast<bool>(previousFace) && fibEntry->hasNextHop(previousFace) &&
- pitEntry->canForwardTo(previousFace)) {
+ pitEntry->canForwardTo(*previousFace)) {
--nUpstreams;
}
@@ -103,7 +103,7 @@
shared_ptr<Face> previousFace = measurementsEntryInfo->m_previousFace.lock();
if (static_cast<bool>(previousFace) && fibEntry->hasNextHop(previousFace) &&
- pitEntry->canForwardTo(previousFace)) {
+ pitEntry->canForwardTo(*previousFace)) {
this->sendInterest(pitEntry, previousFace);
}
@@ -111,7 +111,7 @@
bool isForwarded = false;
for (fib::NextHopList::const_iterator it = nexthops.begin(); it != nexthops.end(); ++it) {
shared_ptr<Face> face = it->getFace();
- if (pitEntry->canForwardTo(face)) {
+ if (pitEntry->canForwardTo(*face)) {
isForwarded = true;
this->sendInterest(pitEntry, face);
break;
diff --git a/daemon/table/pit-entry.cpp b/daemon/table/pit-entry.cpp
index 7523504..86596df 100644
--- a/daemon/table/pit-entry.cpp
+++ b/daemon/table/pit-entry.cpp
@@ -10,6 +10,9 @@
namespace nfd {
namespace pit {
+const Name Entry::LOCALHOST_NAME("ndn:/localhost");
+const Name Entry::LOCALHOP_NAME("ndn:/localhop");
+
Entry::Entry(const Interest& interest)
: m_interest(interest)
{
@@ -48,24 +51,24 @@
}
static inline bool
-predicate_FaceRecord_Face(const FaceRecord& faceRecord, shared_ptr<Face> face)
+predicate_FaceRecord_Face(const FaceRecord& faceRecord, const Face* face)
{
- return faceRecord.getFace() == face;
+ return faceRecord.getFace().get() == face;
}
static inline bool
predicate_FaceRecord_ne_Face_and_unexpired(const FaceRecord& faceRecord,
- shared_ptr<Face> face, time::Point now)
+ const Face* face, time::Point now)
{
- return faceRecord.getFace() != face && faceRecord.getExpiry() >= now;
+ return faceRecord.getFace().get() != face && faceRecord.getExpiry() >= now;
}
bool
-Entry::canForwardTo(shared_ptr<Face> face) const
+Entry::canForwardTo(const Face& face) const
{
OutRecordCollection::const_iterator outIt = std::find_if(
m_outRecords.begin(), m_outRecords.end(),
- bind(&predicate_FaceRecord_Face, _1, face));
+ bind(&predicate_FaceRecord_Face, _1, &face));
bool hasUnexpiredOutRecord = outIt != m_outRecords.end() &&
outIt->getExpiry() >= time::now();
if (hasUnexpiredOutRecord) {
@@ -74,9 +77,34 @@
InRecordCollection::const_iterator inIt = std::find_if(
m_inRecords.begin(), m_inRecords.end(),
- bind(&predicate_FaceRecord_ne_Face_and_unexpired, _1, face, time::now()));
+ bind(&predicate_FaceRecord_ne_Face_and_unexpired, _1, &face, time::now()));
bool hasUnexpiredOtherInRecord = inIt != m_inRecords.end();
- return hasUnexpiredOtherInRecord;
+ if (!hasUnexpiredOtherInRecord) {
+ return false;
+ }
+
+ return !this->violatesScope(face);
+}
+
+bool
+Entry::violatesScope(const Face& face) const
+{
+ // /localhost scope
+ bool isViolatingLocalhost = !face.isLocal() &&
+ LOCALHOST_NAME.isPrefixOf(this->getName());
+ if (isViolatingLocalhost) {
+ return true;
+ }
+
+ // /localhop scope
+ bool isViolatingLocalhop = !face.isLocal() &&
+ LOCALHOP_NAME.isPrefixOf(this->getName()) &&
+ !this->hasLocalInRecord();
+ if (isViolatingLocalhop) {
+ return true;
+ }
+
+ return false;
}
bool
@@ -92,7 +120,7 @@
Entry::insertOrUpdateInRecord(shared_ptr<Face> face, const Interest& interest)
{
InRecordCollection::iterator it = std::find_if(m_inRecords.begin(),
- m_inRecords.end(), bind(&predicate_FaceRecord_Face, _1, face));
+ m_inRecords.end(), bind(&predicate_FaceRecord_Face, _1, face.get()));
if (it == m_inRecords.end()) {
m_inRecords.push_front(InRecord(face));
it = m_inRecords.begin();
@@ -112,7 +140,7 @@
Entry::insertOrUpdateOutRecord(shared_ptr<Face> face, const Interest& interest)
{
OutRecordCollection::iterator it = std::find_if(m_outRecords.begin(),
- m_outRecords.end(), bind(&predicate_FaceRecord_Face, _1, face));
+ m_outRecords.end(), bind(&predicate_FaceRecord_Face, _1, face.get()));
if (it == m_outRecords.end()) {
m_outRecords.push_front(OutRecord(face));
it = m_outRecords.begin();
@@ -127,12 +155,25 @@
Entry::deleteOutRecord(shared_ptr<Face> face)
{
OutRecordCollection::iterator it = std::find_if(m_outRecords.begin(),
- m_outRecords.end(), bind(&predicate_FaceRecord_Face, _1, face));
+ m_outRecords.end(), bind(&predicate_FaceRecord_Face, _1, face.get()));
if (it != m_outRecords.end()) {
m_outRecords.erase(it);
}
}
+static inline bool
+predicate_FaceRecord_unexpired(const FaceRecord& faceRecord, time::Point now)
+{
+ return faceRecord.getExpiry() >= now;
+}
+
+bool
+Entry::hasUnexpiredOutRecords() const
+{
+ OutRecordCollection::const_iterator it = std::find_if(m_outRecords.begin(),
+ m_outRecords.end(), bind(&predicate_FaceRecord_unexpired, _1, time::now()));
+ return it != m_outRecords.end();
+}
} // namespace pit
} // namespace nfd
diff --git a/daemon/table/pit-entry.hpp b/daemon/table/pit-entry.hpp
index 1e342e2..e72365b 100644
--- a/daemon/table/pit-entry.hpp
+++ b/daemon/table/pit-entry.hpp
@@ -64,10 +64,23 @@
/** \brief decides whether Interest can be forwarded to face
*
* \return true if OutRecord of this face does not exist or has expired,
- * and there is an InRecord not of this face
+ * and there is an InRecord not of this face,
+ * and scope is not violated
*/
bool
- canForwardTo(shared_ptr<Face> face) const;
+ canForwardTo(const Face& face) const;
+
+ /** \brief decides whether forwarding Interest to face would violate scope
+ *
+ * \return true if scope control would be violated
+ * \note canForwardTo has more comprehensive checks (including scope control)
+ * and should be used by most strategies. Outgoing Interest pipeline
+ * should only check scope because some strategy (eg. vehicular) needs
+ * to retransmit sooner than OutRecord expiry, or forward Interest
+ * back to incoming face
+ */
+ bool
+ violatesScope(const Face& face) const;
/** \brief records a nonce
*
@@ -101,6 +114,11 @@
void
deleteOutRecord(shared_ptr<Face> face);
+ /** \return true if there is one or more unexpired OutRecords
+ */
+ bool
+ hasUnexpiredOutRecords() const;
+
public:
EventId m_unsatisfyTimer;
EventId m_stragglerTimer;
@@ -110,6 +128,10 @@
const Interest m_interest;
InRecordCollection m_inRecords;
OutRecordCollection m_outRecords;
+
+ static const Name LOCALHOST_NAME;
+ static const Name LOCALHOP_NAME;
+
shared_ptr<name_tree::Entry> m_nameTreeEntry;
friend class nfd::NameTree;
diff --git a/daemon/table/pit-face-record.cpp b/daemon/table/pit-face-record.cpp
index cbcd3b1..5663dce 100644
--- a/daemon/table/pit-face-record.cpp
+++ b/daemon/table/pit-face-record.cpp
@@ -30,7 +30,13 @@
{
m_lastNonce = interest.getNonce();
m_lastRenewed = time::now();
- m_expiry = m_lastRenewed + time::milliseconds(interest.getInterestLifetime());
+
+ const ndn::Milliseconds DEFAULT_INTEREST_LIFETIME = static_cast<ndn::Milliseconds>(4000);
+ ndn::Milliseconds lifetime = interest.getInterestLifetime();
+ if (lifetime < 0) {
+ lifetime = DEFAULT_INTEREST_LIFETIME;
+ }
+ m_expiry = m_lastRenewed + time::milliseconds(lifetime);
}