fw: move Forwarder::lookupFib to Strategy::lookupFib
refs #3664
Change-Id: Ib4dd2354d853f7d6455bf08bb6b863b5f77076c1
diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index 7fad250..502a071 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -527,66 +527,6 @@
++m_counters.nOutNacks;
}
-const fib::Entry&
-Forwarder::lookupFib(const pit::Entry& pitEntry) const
-{
- const Interest& interest = pitEntry.getInterest();
- // has Link object?
- if (!interest.hasLink()) {
- // FIB lookup with Interest name
- const fib::Entry& fibEntry = m_fib.findLongestPrefixMatch(pitEntry);
- NFD_LOG_TRACE("lookupFib noLinkObject found=" << fibEntry.getPrefix());
- return fibEntry;
- }
-
- const Link& link = interest.getLink();
-
- // in producer region?
- if (m_networkRegionTable.isInProducerRegion(link)) {
- // FIB lookup with Interest name
- const fib::Entry& fibEntry = m_fib.findLongestPrefixMatch(pitEntry);
- NFD_LOG_TRACE("lookupFib inProducerRegion found=" << fibEntry.getPrefix());
- return fibEntry;
- }
-
- // has SelectedDelegation?
- if (interest.hasSelectedDelegation()) {
- // FIB lookup with SelectedDelegation
- Name selectedDelegation = interest.getSelectedDelegation();
- const fib::Entry& fibEntry = m_fib.findLongestPrefixMatch(selectedDelegation);
- NFD_LOG_TRACE("lookupFib hasSelectedDelegation=" << selectedDelegation << " found=" << fibEntry.getPrefix());
- return fibEntry;
- }
-
- // FIB lookup with first delegation Name
- const fib::Entry& fibEntry0 = m_fib.findLongestPrefixMatch(link.getDelegations().begin()->second);
- // in default-free zone?
- bool isDefaultFreeZone = !(fibEntry0.getPrefix().size() == 0 && fibEntry0.hasNextHops());
- if (!isDefaultFreeZone) {
- NFD_LOG_TRACE("onContentStoreMiss inConsumerRegion found=" << fibEntry0.getPrefix());
- return fibEntry0;
- }
-
- // choose and set SelectedDelegation
- for (const std::pair<uint32_t, Name>& delegation : link.getDelegations()) {
- const Name& delegationName = delegation.second;
- const fib::Entry& fibEntry = m_fib.findLongestPrefixMatch(delegationName);
- if (fibEntry.hasNextHops()) {
- /// \todo Don't modify in-record Interests.
- /// Set SelectedDelegation in outgoing Interest pipeline.
- std::for_each(pitEntry.in_begin(), pitEntry.in_end(),
- [&delegationName] (const pit::InRecord& inR) {
- const_cast<Interest&>(inR.getInterest()).setSelectedDelegation(delegationName);
- });
- NFD_LOG_TRACE("onContentStoreMiss enterDefaultFreeZone"
- << " setSelectedDelegation=" << delegationName);
- return fibEntry;
- }
- }
- BOOST_ASSERT(false);
- return fibEntry0;
-}
-
static inline bool
compare_InRecord_expiry(const pit::InRecord& a, const pit::InRecord& b)
{
diff --git a/daemon/fw/forwarder.hpp b/daemon/fw/forwarder.hpp
index 00645ba..44e8eb1 100644
--- a/daemon/fw/forwarder.hpp
+++ b/daemon/fw/forwarder.hpp
@@ -173,11 +173,6 @@
return m_networkRegionTable;
}
- /** \brief performs a FIB lookup, considering Link object if present
- */
- const fib::Entry&
- lookupFib(const pit::Entry& pitEntry) const;
-
PUBLIC_WITH_TESTS_ELSE_PRIVATE: // pipelines
/** \brief incoming Interest pipeline
*/
diff --git a/daemon/fw/strategy.cpp b/daemon/fw/strategy.cpp
index 7e668b6..efe1fac 100644
--- a/daemon/fw/strategy.cpp
+++ b/daemon/fw/strategy.cpp
@@ -87,5 +87,67 @@
// warning: don't loop on pitEntry->getInRecords(), because in-record is deleted when sending Nack
}
+const fib::Entry&
+Strategy::lookupFib(const pit::Entry& pitEntry) const
+{
+ const Fib& fib = m_forwarder.getFib();
+ const NetworkRegionTable& nrt = m_forwarder.getNetworkRegionTable();
+
+ const Interest& interest = pitEntry.getInterest();
+ // has Link object?
+ if (!interest.hasLink()) {
+ // FIB lookup with Interest name
+ const fib::Entry& fibEntry = fib.findLongestPrefixMatch(pitEntry);
+ NFD_LOG_TRACE("lookupFib noLinkObject found=" << fibEntry.getPrefix());
+ return fibEntry;
+ }
+
+ const Link& link = interest.getLink();
+
+ // in producer region?
+ if (nrt.isInProducerRegion(link)) {
+ // FIB lookup with Interest name
+ const fib::Entry& fibEntry = fib.findLongestPrefixMatch(pitEntry);
+ NFD_LOG_TRACE("lookupFib inProducerRegion found=" << fibEntry.getPrefix());
+ return fibEntry;
+ }
+
+ // has SelectedDelegation?
+ if (interest.hasSelectedDelegation()) {
+ // FIB lookup with SelectedDelegation
+ Name selectedDelegation = interest.getSelectedDelegation();
+ const fib::Entry& fibEntry = fib.findLongestPrefixMatch(selectedDelegation);
+ NFD_LOG_TRACE("lookupFib hasSelectedDelegation=" << selectedDelegation << " found=" << fibEntry.getPrefix());
+ return fibEntry;
+ }
+
+ // FIB lookup with first delegation Name
+ const fib::Entry& fibEntry0 = fib.findLongestPrefixMatch(link.getDelegations().begin()->second);
+ // in default-free zone?
+ bool isDefaultFreeZone = !(fibEntry0.getPrefix().size() == 0 && fibEntry0.hasNextHops());
+ if (!isDefaultFreeZone) {
+ NFD_LOG_TRACE("lookupFib inConsumerRegion found=" << fibEntry0.getPrefix());
+ return fibEntry0;
+ }
+
+ // choose and set SelectedDelegation
+ for (const std::pair<uint32_t, Name>& delegation : link.getDelegations()) {
+ const Name& delegationName = delegation.second;
+ const fib::Entry& fibEntry = fib.findLongestPrefixMatch(delegationName);
+ if (fibEntry.hasNextHops()) {
+ /// \todo Don't modify in-record Interests.
+ /// Set SelectedDelegation in outgoing Interest pipeline.
+ std::for_each(pitEntry.in_begin(), pitEntry.in_end(),
+ [&delegationName] (const pit::InRecord& inR) {
+ const_cast<Interest&>(inR.getInterest()).setSelectedDelegation(delegationName);
+ });
+ NFD_LOG_TRACE("lookupFib enterDefaultFreeZone setSelectedDelegation=" << delegationName);
+ return fibEntry;
+ }
+ }
+ BOOST_ASSERT(false);
+ return fibEntry0;
+}
+
} // namespace fw
} // namespace nfd
diff --git a/daemon/fw/strategy.hpp b/daemon/fw/strategy.hpp
index 5cea6a6..5b3cb2b 100644
--- a/daemon/fw/strategy.hpp
+++ b/daemon/fw/strategy.hpp
@@ -179,11 +179,10 @@
std::initializer_list<const Face*> exceptFaces = std::initializer_list<const Face*>());
protected: // accessors
+ /** \brief performs a FIB lookup, considering Link object if present
+ */
const fib::Entry&
- lookupFib(const pit::Entry& pitEntry)
- {
- return m_forwarder.lookupFib(pitEntry);
- }
+ lookupFib(const pit::Entry& pitEntry) const;
MeasurementsAccessor&
getMeasurements()