Revert "fib: add EndpointId field in NextHop record"
This reverts commit 3ad49db6eaef0d3f4a0a9bdd3356c6bb9845db57.
refs: #4973
Change-Id: I3216a55a8c4ed52cd9181f790f8ab72e44330a38
diff --git a/daemon/fw/access-strategy.cpp b/daemon/fw/access-strategy.cpp
index 59d99f3..b82ba40 100644
--- a/daemon/fw/access-strategy.cpp
+++ b/daemon/fw/access-strategy.cpp
@@ -129,7 +129,7 @@
}
Face* outFace = this->getFace(mi.lastNexthop);
- if (outFace == nullptr || !fibEntry.hasNextHop(*outFace, 0)) {
+ if (outFace == nullptr || !fibEntry.hasNextHop(*outFace)) {
NFD_LOG_DEBUG(pitEntry->getInterest() << " last-nexthop-gone");
return false;
}
diff --git a/daemon/fw/ncc-strategy.cpp b/daemon/fw/ncc-strategy.cpp
index c427cd1..4969a14 100644
--- a/daemon/fw/ncc-strategy.cpp
+++ b/daemon/fw/ncc-strategy.cpp
@@ -83,7 +83,7 @@
size_t nUpstreams = nexthops.size();
shared_ptr<Face> bestFace = meInfo.getBestFace();
- if (bestFace != nullptr && fibEntry.hasNextHop(*bestFace, 0) &&
+ if (bestFace != nullptr && fibEntry.hasNextHop(*bestFace) &&
!wouldViolateScope(ingress.face, interest, *bestFace) &&
canForwardToLegacy(*pitEntry, *bestFace)) {
// TODO Should we use `randlow = 100 + nrand48(h->seed) % 4096U;` ?
@@ -112,7 +112,7 @@
}
shared_ptr<Face> previousFace = meInfo.previousFace.lock();
- if (previousFace != nullptr && fibEntry.hasNextHop(*previousFace, 0) &&
+ if (previousFace != nullptr && fibEntry.hasNextHop(*previousFace) &&
!wouldViolateScope(ingress.face, interest, *previousFace) &&
canForwardToLegacy(*pitEntry, *previousFace)) {
--nUpstreams;
@@ -158,7 +158,7 @@
MeasurementsEntryInfo& meInfo = this->getMeasurementsEntryInfo(pitEntry);
shared_ptr<Face> previousFace = meInfo.previousFace.lock();
- if (previousFace != nullptr && fibEntry.hasNextHop(*previousFace, 0) &&
+ if (previousFace != nullptr && fibEntry.hasNextHop(*previousFace) &&
!wouldViolateScope(*inFace, interest, *previousFace) &&
canForwardToLegacy(*pitEntry, *previousFace)) {
this->sendInterest(pitEntry, FaceEndpoint(*previousFace, 0), interest);
diff --git a/daemon/mgmt/fib-manager.cpp b/daemon/mgmt/fib-manager.cpp
index 1f0d173..c736869 100644
--- a/daemon/mgmt/fib-manager.cpp
+++ b/daemon/mgmt/fib-manager.cpp
@@ -77,7 +77,7 @@
}
fib::Entry* entry = m_fib.insert(prefix).first;
- entry->addOrUpdateNextHop(*face, 0, cost);
+ entry->addOrUpdateNextHop(*face, cost);
NFD_LOG_TRACE("fib/add-nexthop(" << prefix << ',' << faceId << ',' << cost << "): OK");
return done(ControlResponse(200, "Success").setBody(parameters.wireEncode()));
@@ -106,7 +106,7 @@
return;
}
- entry->removeNextHop(*face, 0);
+ entry->removeNextHop(*face);
if (!entry->hasNextHops()) {
m_fib.erase(*entry);
NFD_LOG_TRACE("fib/remove-nexthop(" << prefix << ',' << faceId << "): OK entry-erased");
diff --git a/daemon/nfd.cpp b/daemon/nfd.cpp
index 633e4f0..7877dea 100644
--- a/daemon/nfd.cpp
+++ b/daemon/nfd.cpp
@@ -170,7 +170,7 @@
// add FIB entry for NFD Management Protocol
Name topPrefix("/localhost/nfd");
- m_forwarder->getFib().insert(topPrefix).first->addOrUpdateNextHop(*m_internalFace, 0, 0);
+ m_forwarder->getFib().insert(topPrefix).first->addOrUpdateNextHop(*m_internalFace, 0);
m_dispatcher->addTopPrefix(topPrefix, false);
}
diff --git a/daemon/table/cleanup.cpp b/daemon/table/cleanup.cpp
index d45b363..a62304b 100644
--- a/daemon/table/cleanup.cpp
+++ b/daemon/table/cleanup.cpp
@@ -36,7 +36,7 @@
for (const name_tree::Entry& nte : nt) {
fib::Entry* fibEntry = nte.getFibEntry();
if (fibEntry != nullptr) {
- fib.removeNextHopByFace(*fibEntry, face);
+ fib.removeNextHop(*fibEntry, face);
}
for (const auto& pitEntry : nte.getPitEntries()) {
diff --git a/daemon/table/fib-entry.cpp b/daemon/table/fib-entry.cpp
index bb49979..ff5c125 100644
--- a/daemon/table/fib-entry.cpp
+++ b/daemon/table/fib-entry.cpp
@@ -34,52 +34,43 @@
}
NextHopList::iterator
-Entry::findNextHop(const Face& face, EndpointId endpointId)
+Entry::findNextHop(const Face& face)
{
return std::find_if(m_nextHops.begin(), m_nextHops.end(),
- [&face, endpointId] (const NextHop& nexthop) {
- return &nexthop.getFace() == &face && nexthop.getEndpointId() == endpointId;
+ [&face] (const NextHop& nexthop) {
+ return &nexthop.getFace() == &face;
});
}
bool
-Entry::hasNextHop(const Face& face, EndpointId endpointId) const
+Entry::hasNextHop(const Face& face) const
{
- return const_cast<Entry*>(this)->findNextHop(face, endpointId) != m_nextHops.end();
+ return const_cast<Entry*>(this)->findNextHop(face) != m_nextHops.end();
}
void
-Entry::addOrUpdateNextHop(Face& face, EndpointId endpointId, uint64_t cost)
+Entry::addOrUpdateNextHop(Face& face, uint64_t cost)
{
- auto it = this->findNextHop(face, endpointId);
+ auto it = this->findNextHop(face);
if (it == m_nextHops.end()) {
- m_nextHops.emplace_back(face, endpointId);
+ m_nextHops.emplace_back(face);
it = std::prev(m_nextHops.end());
}
+
it->setCost(cost);
this->sortNextHops();
}
void
-Entry::removeNextHop(const Face& face, EndpointId endpointId)
+Entry::removeNextHop(const Face& face)
{
- auto it = this->findNextHop(face, endpointId);
+ auto it = this->findNextHop(face);
if (it != m_nextHops.end()) {
m_nextHops.erase(it);
}
}
void
-Entry::removeNextHopByFace(const Face& face)
-{
- auto it = std::remove_if(m_nextHops.begin(), m_nextHops.end(),
- [&face] (const NextHop& nexthop) {
- return &nexthop.getFace() == &face;
- });
- m_nextHops.erase(it, m_nextHops.end());
-}
-
-void
Entry::sortNextHops()
{
std::sort(m_nextHops.begin(), m_nextHops.end(),
diff --git a/daemon/table/fib-entry.hpp b/daemon/table/fib-entry.hpp
index e0edcc0..52dfbd8 100644
--- a/daemon/table/fib-entry.hpp
+++ b/daemon/table/fib-entry.hpp
@@ -74,36 +74,32 @@
return !m_nextHops.empty();
}
- /** \return whether there is a NextHop record for \p face with the given \p endpointId
+ /** \return whether there is a NextHop record for \p face
*/
bool
- hasNextHop(const Face& face, EndpointId endpointId) const;
+ hasNextHop(const Face& face) const;
/** \brief adds a NextHop record
*
- * If a NextHop record for \p face and \p endpointId already exists,
- * its cost is updated.
+ * If a NextHop record for \p face already exists, its cost is updated.
*/
void
- addOrUpdateNextHop(Face& face, EndpointId endpointId, uint64_t cost);
+ addOrUpdateNextHop(Face& face, uint64_t cost);
- /** \brief removes the NextHop record for \p face with the given \p endpointId
+ /** \brief removes a NextHop record
+ *
+ * If no NextHop record for face exists, do nothing.
*/
void
- removeNextHop(const Face& face, EndpointId endpointId);
-
- /** \brief removes all NextHop records on \p face for any \p endpointId
- */
- void
- removeNextHopByFace(const Face& face);
+ removeNextHop(const Face& face);
private:
/** \note This method is non-const because mutable iterators are needed by callers.
*/
NextHopList::iterator
- findNextHop(const Face& face, EndpointId endpointId);
+ findNextHop(const Face& face);
- /** \brief sorts the nexthop list by cost
+ /** \brief sorts the nexthop list
*/
void
sortNextHops();
diff --git a/daemon/table/fib-nexthop.hpp b/daemon/table/fib-nexthop.hpp
index 80609ba..e03efda 100644
--- a/daemon/table/fib-nexthop.hpp
+++ b/daemon/table/fib-nexthop.hpp
@@ -37,9 +37,9 @@
class NextHop
{
public:
- NextHop(Face& face, EndpointId endpointId)
+ explicit
+ NextHop(Face& face)
: m_face(&face)
- , m_endpointId(endpointId)
{
}
@@ -49,12 +49,6 @@
return *m_face;
}
- EndpointId
- getEndpointId() const
- {
- return m_endpointId;
- }
-
uint64_t
getCost() const
{
@@ -69,7 +63,6 @@
private:
Face* m_face; // pointer instead of reference so that NextHop is movable
- EndpointId m_endpointId;
uint64_t m_cost = 0;
};
diff --git a/daemon/table/fib.cpp b/daemon/table/fib.cpp
index 2f3deab..62938e0 100644
--- a/daemon/table/fib.cpp
+++ b/daemon/table/fib.cpp
@@ -133,28 +133,16 @@
}
void
-Fib::eraseIfEmpty(Entry& entry)
+Fib::removeNextHop(Entry& entry, const Face& face)
{
+ entry.removeNextHop(face);
+
if (!entry.hasNextHops()) {
name_tree::Entry* nte = m_nameTree.getEntry(entry);
this->erase(nte, false);
}
}
-void
-Fib::removeNextHop(Entry& entry, const Face& face, EndpointId endpointId)
-{
- entry.removeNextHop(face, endpointId);
- this->eraseIfEmpty(entry);
-}
-
-void
-Fib::removeNextHopByFace(Entry& entry, const Face& face)
-{
- entry.removeNextHopByFace(face);
- this->eraseIfEmpty(entry);
-}
-
Fib::Range
Fib::getRange() const
{
diff --git a/daemon/table/fib.hpp b/daemon/table/fib.hpp
index 462a29b..8543440 100644
--- a/daemon/table/fib.hpp
+++ b/daemon/table/fib.hpp
@@ -103,15 +103,10 @@
void
erase(const Entry& entry);
- /** \brief Remove the NextHop record for the given \p face and \p endpointId
+ /** \brief Remove the NextHop record for \p face
*/
void
- removeNextHop(Entry& entry, const Face& face, EndpointId endpointId);
-
- /** \brief Remove all NextHop records for \p face
- */
- void
- removeNextHopByFace(Entry& entry, const Face& face);
+ removeNextHop(Entry& entry, const Face& face);
public: // enumeration
typedef boost::transformed_range<name_tree::GetTableEntry<Entry>, const name_tree::Range> Range;
@@ -147,11 +142,6 @@
void
erase(name_tree::Entry* nte, bool canDeleteNte = true);
- /** \brief Erase \p entry if it contains no nexthop records
- */
- void
- eraseIfEmpty(Entry& entry);
-
Range
getRange() const;
diff --git a/tests/daemon/fw/best-route-strategy2.t.cpp b/tests/daemon/fw/best-route-strategy2.t.cpp
index e63951c..d8008f7 100644
--- a/tests/daemon/fw/best-route-strategy2.t.cpp
+++ b/tests/daemon/fw/best-route-strategy2.t.cpp
@@ -77,9 +77,9 @@
BOOST_AUTO_TEST_CASE(Forward)
{
fib::Entry& fibEntry = *fib.insert(Name()).first;
- fibEntry.addOrUpdateNextHop(*face1, 0, 10);
- fibEntry.addOrUpdateNextHop(*face2, 0, 20);
- fibEntry.addOrUpdateNextHop(*face3, 0, 30);
+ fibEntry.addOrUpdateNextHop(*face1, 10);
+ fibEntry.addOrUpdateNextHop(*face2, 20);
+ fibEntry.addOrUpdateNextHop(*face3, 30);
shared_ptr<Interest> interest = makeInterest("ndn:/BzgFBchqA");
shared_ptr<pit::Entry> pitEntry = pit.insert(*interest).first;
@@ -128,7 +128,7 @@
BOOST_CHECK_EQUAL(strategy.sendInterestHistory[4].outFaceId, face1->getId());
BOOST_CHECK_EQUAL(strategy.sendInterestHistory[5].outFaceId, face3->getId());
- fibEntry.removeNextHop(*face1, 0);
+ fibEntry.removeNextHop(*face1);
strategy.sendInterestHistory.clear();
for (int i = 0; i < 3; ++i) {
diff --git a/tests/daemon/fw/forwarder.t.cpp b/tests/daemon/fw/forwarder.t.cpp
index a6d562a..4c2d8d0 100644
--- a/tests/daemon/fw/forwarder.t.cpp
+++ b/tests/daemon/fw/forwarder.t.cpp
@@ -50,7 +50,7 @@
forwarder.addFace(face2);
Fib& fib = forwarder.getFib();
- fib.insert("/A").first->addOrUpdateNextHop(*face2, 0, 0);
+ fib.insert("/A").first->addOrUpdateNextHop(*face2, 0);
BOOST_CHECK_EQUAL(forwarder.getCounters().nInInterests, 0);
BOOST_CHECK_EQUAL(forwarder.getCounters().nOutInterests, 0);
@@ -91,7 +91,7 @@
forwarder.addFace(face3);
Fib& fib = forwarder.getFib();
- fib.insert("/A").first->addOrUpdateNextHop(*face2, 0, 0);
+ fib.insert("/A").first->addOrUpdateNextHop(*face2, 0);
Pit& pit = forwarder.getPit();
BOOST_CHECK_EQUAL(pit.size(), 0);
@@ -156,7 +156,7 @@
forwarder.addFace(face3);
Fib& fib = forwarder.getFib();
- fib.insert("/A").first->addOrUpdateNextHop(*face3, 0, 0);
+ fib.insert("/A").first->addOrUpdateNextHop(*face3, 0);
auto interest = makeInterest("/A/B");
interest->setTag(make_shared<lp::NextHopFaceIdTag>(face2->getId()));
@@ -485,7 +485,7 @@
forwarder.addFace(face4);
Fib& fib = forwarder.getFib();
- fib.insert("/zT4XwK0Hnx").first->addOrUpdateNextHop(*face4, 0, 0);
+ fib.insert("/zT4XwK0Hnx").first->addOrUpdateNextHop(*face4, 0);
// receive Interest on face1
face1->sentNacks.clear();
@@ -537,7 +537,7 @@
});
Fib& fib = forwarder.getFib();
- fib.insert("/A").first->addOrUpdateNextHop(*face2, 0, 0);
+ fib.insert("/A").first->addOrUpdateNextHop(*face2, 0);
// receive an Interest
auto interest = makeInterest("/A/1", false, 50_ms, 82101183);
diff --git a/tests/daemon/fw/multicast-strategy.t.cpp b/tests/daemon/fw/multicast-strategy.t.cpp
index a44ba78..24027f0 100644
--- a/tests/daemon/fw/multicast-strategy.t.cpp
+++ b/tests/daemon/fw/multicast-strategy.t.cpp
@@ -69,9 +69,9 @@
BOOST_AUTO_TEST_CASE(Forward2)
{
fib::Entry& fibEntry = *fib.insert(Name()).first;
- fibEntry.addOrUpdateNextHop(*face1, 0, 0);
- fibEntry.addOrUpdateNextHop(*face2, 0, 0);
- fibEntry.addOrUpdateNextHop(*face3, 0, 0);
+ fibEntry.addOrUpdateNextHop(*face1, 0);
+ fibEntry.addOrUpdateNextHop(*face2, 0);
+ fibEntry.addOrUpdateNextHop(*face3, 0);
shared_ptr<Interest> interest = makeInterest("ndn:/H0D6i5fc");
shared_ptr<pit::Entry> pitEntry = pit.insert(*interest).first;
@@ -123,7 +123,7 @@
BOOST_AUTO_TEST_CASE(RejectLoopback)
{
fib::Entry& fibEntry = *fib.insert(Name()).first;
- fibEntry.addOrUpdateNextHop(*face1, 0, 0);
+ fibEntry.addOrUpdateNextHop(*face1, 0);
shared_ptr<Interest> interest = makeInterest("ndn:/H0D6i5fc");
shared_ptr<pit::Entry> pitEntry = pit.insert(*interest).first;
diff --git a/tests/daemon/fw/ncc-strategy.t.cpp b/tests/daemon/fw/ncc-strategy.t.cpp
index d7172e3..c9a604b 100644
--- a/tests/daemon/fw/ncc-strategy.t.cpp
+++ b/tests/daemon/fw/ncc-strategy.t.cpp
@@ -59,8 +59,8 @@
Fib& fib = forwarder.getFib();
fib::Entry& fibEntry = *fib.insert(Name()).first;
- fibEntry.addOrUpdateNextHop(*face1, 0, 10);
- fibEntry.addOrUpdateNextHop(*face2, 0, 20);
+ fibEntry.addOrUpdateNextHop(*face1, 10);
+ fibEntry.addOrUpdateNextHop(*face2, 20);
Pit& pit = forwarder.getPit();
@@ -118,7 +118,7 @@
Fib& fib = forwarder.getFib();
fib::Entry& fibEntry = *fib.insert(Name()).first;
- fibEntry.addOrUpdateNextHop(*face1, 0, 10);
+ fibEntry.addOrUpdateNextHop(*face1, 10);
Pit& pit = forwarder.getPit();
@@ -149,7 +149,7 @@
strategy.afterReceiveInterest(FaceEndpoint(*face3, 0), *interest2, pitEntry2);
// FIB entry is changed before doPropagate executes
- fibEntry.addOrUpdateNextHop(*face2, 0, 20);
+ fibEntry.addOrUpdateNextHop(*face2, 20);
this->advanceClocks(10_ms, 1_s);// should not crash
}
@@ -169,8 +169,8 @@
Fib& fib = forwarder.getFib();
fib::Entry& fibEntry = *fib.insert(Name()).first;
- fibEntry.addOrUpdateNextHop(*face1, 0, 10);
- fibEntry.addOrUpdateNextHop(*face2, 0, 20);
+ fibEntry.addOrUpdateNextHop(*face1, 10);
+ fibEntry.addOrUpdateNextHop(*face2, 20);
Pit& pit = forwarder.getPit();
@@ -222,7 +222,7 @@
Fib& fib = forwarder.getFib();
fib::Entry& fibEntry = *fib.insert(Name()).first;
- fibEntry.addOrUpdateNextHop(*face2, 0, 10);
+ fibEntry.addOrUpdateNextHop(*face2, 10);
Pit& pit = forwarder.getPit();
@@ -265,8 +265,8 @@
Fib& fib = forwarder.getFib();
fib::Entry& fibEntry = *fib.insert(Name()).first;
- fibEntry.addOrUpdateNextHop(*face1, 0, 10); // face1 is top-ranked nexthop
- fibEntry.addOrUpdateNextHop(*face2, 0, 20);
+ fibEntry.addOrUpdateNextHop(*face1, 10); // face1 is top-ranked nexthop
+ fibEntry.addOrUpdateNextHop(*face2, 20);
Pit& pit = forwarder.getPit();
@@ -368,7 +368,7 @@
// NccStrategy has selected one path as the best.
// When we reduce the RTT of the other path, ideally it should be selected as the best face.
// However, this won't happen due to a weakness in NccStrategy.
- // See https://redmine.named-data.net/issues/3411#note-4
+ // See https://redmine.named-data.net/issues/3411#note-4
shared_ptr<Face> bestFace1 = getMeInfo()->bestFace.lock();
if (bestFace1.get() == &linkAB->getFace(nodeA)) {
linkCD->setDelay(5_ms);
diff --git a/tests/daemon/fw/strategy-nack-return.t.cpp b/tests/daemon/fw/strategy-nack-return.t.cpp
index 2494710..41b59e2 100644
--- a/tests/daemon/fw/strategy-nack-return.t.cpp
+++ b/tests/daemon/fw/strategy-nack-return.t.cpp
@@ -93,9 +93,9 @@
S, Strategies, StrategyNackReturnFixture<S>)
{
fib::Entry& fibEntry = *this->fib.insert(Name()).first;
- fibEntry.addOrUpdateNextHop(*this->face3, 0, 10);
- fibEntry.addOrUpdateNextHop(*this->face4, 0, 20);
- fibEntry.addOrUpdateNextHop(*this->face5, 0, 30);
+ fibEntry.addOrUpdateNextHop(*this->face3, 10);
+ fibEntry.addOrUpdateNextHop(*this->face4, 20);
+ fibEntry.addOrUpdateNextHop(*this->face5, 30);
auto interest1 = makeInterest("/McQYjMbm", false, nullopt, 992);
auto interest2 = makeInterest("/McQYjMbm", false, nullopt, 114);
@@ -128,9 +128,9 @@
S, Strategies, StrategyNackReturnFixture<S>)
{
fib::Entry& fibEntry = *this->fib.insert(Name()).first;
- fibEntry.addOrUpdateNextHop(*this->face3, 0, 10);
- fibEntry.addOrUpdateNextHop(*this->face4, 0, 20);
- fibEntry.addOrUpdateNextHop(*this->face5, 0, 30);
+ fibEntry.addOrUpdateNextHop(*this->face3, 10);
+ fibEntry.addOrUpdateNextHop(*this->face4, 20);
+ fibEntry.addOrUpdateNextHop(*this->face5, 30);
auto interest1 = makeInterest("/aS9FAyUV19", 286);
shared_ptr<pit::Entry> pitEntry = this->pit.insert(*interest1).first;
@@ -161,9 +161,9 @@
S, Strategies, StrategyNackReturnFixture<S>)
{
fib::Entry& fibEntry = *this->fib.insert(Name()).first;
- fibEntry.addOrUpdateNextHop(*this->face3, 0, 10);
- fibEntry.addOrUpdateNextHop(*this->face4, 0, 20);
- fibEntry.addOrUpdateNextHop(*this->face5, 0, 30);
+ fibEntry.addOrUpdateNextHop(*this->face3, 10);
+ fibEntry.addOrUpdateNextHop(*this->face4, 20);
+ fibEntry.addOrUpdateNextHop(*this->face5, 30);
auto interest1 = makeInterest("/sIYw0TXWDj", false, 400_ms, 115);
shared_ptr<pit::Entry> pitEntry = this->pit.insert(*interest1).first;
@@ -313,9 +313,9 @@
StrategyNackReturnFixture<BestRouteStrategy2>)
{
fib::Entry& fibEntry = *fib.insert(Name()).first;
- fibEntry.addOrUpdateNextHop(*face3, 0, 10);
- fibEntry.addOrUpdateNextHop(*face4, 0, 20);
- fibEntry.addOrUpdateNextHop(*face5, 0, 30);
+ fibEntry.addOrUpdateNextHop(*face3, 10);
+ fibEntry.addOrUpdateNextHop(*face4, 20);
+ fibEntry.addOrUpdateNextHop(*face5, 30);
auto interest1 = makeInterest("/F6sEwB24I", false, nullopt, 282);
shared_ptr<pit::Entry> pitEntry = pit.insert(*interest1).first;
diff --git a/tests/daemon/fw/strategy-no-route.t.cpp b/tests/daemon/fw/strategy-no-route.t.cpp
index 43c57d0..d554d47 100644
--- a/tests/daemon/fw/strategy-no-route.t.cpp
+++ b/tests/daemon/fw/strategy-no-route.t.cpp
@@ -115,7 +115,7 @@
void
insertFibEntry(StrategyNoRouteFixture<S>* fixture)
{
- fixture->fib.insert(Name()).first->addOrUpdateNextHop(*fixture->face1, 0, 10);
+ fixture->fib.insert(Name()).first->addOrUpdateNextHop(*fixture->face1, 10);
}
};
@@ -132,7 +132,7 @@
void
insertFibEntry(StrategyNoRouteFixture<S>* fixture)
{
- fixture->fib.insert("/localhop").first->addOrUpdateNextHop(*fixture->face2, 0, 10);
+ fixture->fib.insert("/localhop").first->addOrUpdateNextHop(*fixture->face2, 10);
// face1 and face2 are both non-local; Interest from face1 cannot be forwarded to face2
}
};
diff --git a/tests/daemon/fw/strategy-scope-control.t.cpp b/tests/daemon/fw/strategy-scope-control.t.cpp
index 0214152..ec88374 100644
--- a/tests/daemon/fw/strategy-scope-control.t.cpp
+++ b/tests/daemon/fw/strategy-scope-control.t.cpp
@@ -116,7 +116,7 @@
T, Tests, StrategyScopeControlFixture<typename T::Strategy>)
{
fib::Entry* fibEntry = this->fib.insert("/localhost/A").first;
- fibEntry->addOrUpdateNextHop(*this->localFace4, 0, 10);
+ fibEntry->addOrUpdateNextHop(*this->localFace4, 10);
auto interest = makeInterest("/localhost/A/1");
shared_ptr<pit::Entry> pitEntry = this->pit.insert(*interest).first;
@@ -135,7 +135,7 @@
T, Tests, StrategyScopeControlFixture<typename T::Strategy>)
{
fib::Entry* fibEntry = this->fib.insert("/localhost/A").first;
- fibEntry->addOrUpdateNextHop(*this->nonLocalFace2, 0, 10);
+ fibEntry->addOrUpdateNextHop(*this->nonLocalFace2, 10);
auto interest = makeInterest("/localhost/A/1");
shared_ptr<pit::Entry> pitEntry = this->pit.insert(*interest).first;
@@ -157,8 +157,8 @@
T, Tests, StrategyScopeControlFixture<typename T::Strategy>)
{
fib::Entry* fibEntry = this->fib.insert("/localhost/A").first;
- fibEntry->addOrUpdateNextHop(*this->nonLocalFace2, 0, 10);
- fibEntry->addOrUpdateNextHop(*this->localFace4, 0, 20);
+ fibEntry->addOrUpdateNextHop(*this->nonLocalFace2, 10);
+ fibEntry->addOrUpdateNextHop(*this->localFace4, 20);
auto interest = makeInterest("/localhost/A/1");
shared_ptr<pit::Entry> pitEntry = this->pit.insert(*interest).first;
@@ -178,7 +178,7 @@
T, Tests, StrategyScopeControlFixture<typename T::Strategy>)
{
fib::Entry* fibEntry = this->fib.insert("/localhop/A").first;
- fibEntry->addOrUpdateNextHop(*this->nonLocalFace2, 0, 10);
+ fibEntry->addOrUpdateNextHop(*this->nonLocalFace2, 10);
auto interest = makeInterest("/localhop/A/1");
shared_ptr<pit::Entry> pitEntry = this->pit.insert(*interest).first;
@@ -200,8 +200,8 @@
T, Tests, StrategyScopeControlFixture<typename T::Strategy>)
{
fib::Entry* fibEntry = this->fib.insert("/localhop/A").first;
- fibEntry->addOrUpdateNextHop(*this->nonLocalFace2, 0, 10);
- fibEntry->addOrUpdateNextHop(*this->localFace4, 0, 20);
+ fibEntry->addOrUpdateNextHop(*this->nonLocalFace2, 10);
+ fibEntry->addOrUpdateNextHop(*this->localFace4, 20);
auto interest = makeInterest("/localhop/A/1");
shared_ptr<pit::Entry> pitEntry = this->pit.insert(*interest).first;
@@ -221,8 +221,8 @@
T, Tests, StrategyScopeControlFixture<typename T::Strategy>)
{
fib::Entry* fibEntry = this->fib.insert("/localhost/A").first;
- fibEntry->addOrUpdateNextHop(*this->localFace4, 0, 10);
- fibEntry->addOrUpdateNextHop(*this->nonLocalFace2, 0, 20);
+ fibEntry->addOrUpdateNextHop(*this->localFace4, 10);
+ fibEntry->addOrUpdateNextHop(*this->nonLocalFace2, 20);
auto interest = makeInterest("/localhost/A/1", false, nullopt, 1460);
shared_ptr<pit::Entry> pitEntry = this->pit.insert(*interest).first;
@@ -246,8 +246,8 @@
T, Tests, StrategyScopeControlFixture<typename T::Strategy>)
{
fib::Entry* fibEntry = this->fib.insert("/localhop/A").first;
- fibEntry->addOrUpdateNextHop(*this->localFace4, 0, 10);
- fibEntry->addOrUpdateNextHop(*this->nonLocalFace2, 0, 20);
+ fibEntry->addOrUpdateNextHop(*this->localFace4, 10);
+ fibEntry->addOrUpdateNextHop(*this->nonLocalFace2, 20);
auto interest = makeInterest("/localhop/A/1", 1377);
shared_ptr<pit::Entry> pitEntry = this->pit.insert(*interest).first;
diff --git a/tests/daemon/fw/topology-tester.cpp b/tests/daemon/fw/topology-tester.cpp
index 067e2b7..ce7bc26 100644
--- a/tests/daemon/fw/topology-tester.cpp
+++ b/tests/daemon/fw/topology-tester.cpp
@@ -242,7 +242,7 @@
{
Forwarder& forwarder = this->getForwarder(i);
Fib& fib = forwarder.getFib();
- fib.insert(prefix).first->addOrUpdateNextHop(const_cast<Face&>(face), 0, cost);
+ fib.insert(prefix).first->addOrUpdateNextHop(const_cast<Face&>(face), cost);
}
void
diff --git a/tests/daemon/mgmt/fib-manager.t.cpp b/tests/daemon/mgmt/fib-manager.t.cpp
index 0918aaf..6a0ab6c 100644
--- a/tests/daemon/mgmt/fib-manager.t.cpp
+++ b/tests/daemon/mgmt/fib-manager.t.cpp
@@ -301,9 +301,9 @@
BOOST_REQUIRE_NE(face3, face::INVALID_FACEID);
fib::Entry* entry = m_fib.insert("/hello").first;
- entry->addOrUpdateNextHop(*m_faceTable.get(face1), 0, 101);
- entry->addOrUpdateNextHop(*m_faceTable.get(face2), 0, 202);
- entry->addOrUpdateNextHop(*m_faceTable.get(face3), 0, 303);
+ entry->addOrUpdateNextHop(*m_faceTable.get(face1), 101);
+ entry->addOrUpdateNextHop(*m_faceTable.get(face2), 202);
+ entry->addOrUpdateNextHop(*m_faceTable.get(face3), 303);
testRemoveNextHop(makeParameters("/hello", face1));
BOOST_REQUIRE_EQUAL(m_responses.size(), 1);
@@ -354,8 +354,8 @@
};
fib::Entry* entry = m_fib.insert("/hello").first;
- entry->addOrUpdateNextHop(*m_faceTable.get(face1), 0, 101);
- entry->addOrUpdateNextHop(*m_faceTable.get(face2), 0, 202);
+ entry->addOrUpdateNextHop(*m_faceTable.get(face1), 101);
+ entry->addOrUpdateNextHop(*m_faceTable.get(face2), 202);
testWithImplicitFaceId(ControlParameters().setName("/hello").setFaceId(0), face1);
BOOST_REQUIRE_EQUAL(m_responses.size(), 1);
@@ -385,7 +385,7 @@
receiveInterest(req);
};
- m_fib.insert("/hello").first->addOrUpdateNextHop(*m_faceTable.get(face1), 0, 101);
+ m_fib.insert("/hello").first->addOrUpdateNextHop(*m_faceTable.get(face1), 101);
testRemoveNextHop(makeParameters("/hello", face2 + 100));
BOOST_REQUIRE_EQUAL(m_responses.size(), 1); // face does not exist
@@ -410,8 +410,8 @@
Name prefix = Name("test").appendSegment(i);
actualPrefixes.insert(prefix);
fib::Entry* fibEntry = m_fib.insert(prefix).first;
- fibEntry->addOrUpdateNextHop(*m_faceTable.get(addFace()), 0, std::numeric_limits<uint8_t>::max() - 1);
- fibEntry->addOrUpdateNextHop(*m_faceTable.get(addFace()), 0, std::numeric_limits<uint8_t>::max() - 2);
+ fibEntry->addOrUpdateNextHop(*m_faceTable.get(addFace()), std::numeric_limits<uint8_t>::max() - 1);
+ fibEntry->addOrUpdateNextHop(*m_faceTable.get(addFace()), std::numeric_limits<uint8_t>::max() - 2);
}
receiveInterest(Interest("/localhost/nfd/fib/list").setCanBePrefix(true));
diff --git a/tests/daemon/table/cleanup.t.cpp b/tests/daemon/table/cleanup.t.cpp
index 25405a6..911de1c 100644
--- a/tests/daemon/table/cleanup.t.cpp
+++ b/tests/daemon/table/cleanup.t.cpp
@@ -49,7 +49,7 @@
Name name = Name("/P").appendVersion(i);
fib::Entry* fibEntry = fib.insert(name).first;
- fibEntry->addOrUpdateNextHop(*face1, 0, 0);
+ fibEntry->addOrUpdateNextHop(*face1, 0);
shared_ptr<Interest> interest = makeInterest(name);
shared_ptr<pit::Entry> pitEntry = pit.insert(*interest).first;
@@ -88,24 +88,24 @@
BOOST_CHECK_EQUAL(fib.size(), 0);
fib::Entry* entryA = fib.insert("/A").first;
- entryA->addOrUpdateNextHop(*face1, 0, 0);
- entryA->addOrUpdateNextHop(*face2, 0, 0);
+ entryA->addOrUpdateNextHop(*face1, 0);
+ entryA->addOrUpdateNextHop(*face2, 0);
// {'/A':[1,2]}
fib::Entry* entryB = fib.insert("/B").first;
- entryB->addOrUpdateNextHop(*face1, 0, 0);
+ entryB->addOrUpdateNextHop(*face1, 0);
// {'/A':[1,2], '/B':[1]}
fib::Entry* entryC = fib.insert("/C").first;
- entryC->addOrUpdateNextHop(*face2, 0, 1);
+ entryC->addOrUpdateNextHop(*face2, 1);
// {'/A':[1,2], '/B':[1], '/C':[2]}
fib::Entry* entryB1 = fib.insert("/B/1").first;
- entryB1->addOrUpdateNextHop(*face1, 0, 0);
+ entryB1->addOrUpdateNextHop(*face1, 0);
// {'/A':[1,2], '/B':[1], '/B/1':[1], '/C':[2]}
fib::Entry* entryB12 = fib.insert("/B/1/2").first;
- entryB12->addOrUpdateNextHop(*face1, 0, 0);
+ entryB12->addOrUpdateNextHop(*face1, 0);
// {'/A':[1,2], '/B':[1], '/B/1':[1], '/B/1/2':[1], '/C':[2]}
// ---- close face1 ----
diff --git a/tests/daemon/table/fib.t.cpp b/tests/daemon/table/fib.t.cpp
index 6e83a95..33cbdfe 100644
--- a/tests/daemon/table/fib.t.cpp
+++ b/tests/daemon/table/fib.t.cpp
@@ -52,138 +52,71 @@
// []
BOOST_CHECK_EQUAL(entry.getNextHops().size(), 0);
- // [(face, cost, endpointId)]
- entry.addOrUpdateNextHop(*face1, 200, 20);
- // [(face1,200,20)]
+ entry.addOrUpdateNextHop(*face1, 20);
+ // [(face1,20)]
BOOST_CHECK_EQUAL(entry.getNextHops().size(), 1);
BOOST_CHECK_EQUAL(&entry.getNextHops().begin()->getFace(), face1.get());
- BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getEndpointId(), 200);
BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getCost(), 20);
- entry.addOrUpdateNextHop(*face1, 300, 30);
- // [(face1,200,20), (face1,300,30)]
- BOOST_CHECK_EQUAL(entry.getNextHops().size(), 2);
+ entry.addOrUpdateNextHop(*face1, 30);
+ // [(face1,30)]
+ BOOST_CHECK_EQUAL(entry.getNextHops().size(), 1);
BOOST_CHECK_EQUAL(&entry.getNextHops().begin()->getFace(), face1.get());
- BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getEndpointId(), 200);
- BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getCost(), 20);
+ BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getCost(), 30);
- entry.addOrUpdateNextHop(*face2, 400, 40);
- // [(face1,200,20), (face1,300,30), (face2,400,40)]
- BOOST_CHECK_EQUAL(entry.getNextHops().size(), 3);
+ entry.addOrUpdateNextHop(*face2, 40);
+ // [(face1,30), (face2,40)]
+ BOOST_CHECK_EQUAL(entry.getNextHops().size(), 2);
{
NextHopList::const_iterator it = entry.getNextHops().begin();
BOOST_REQUIRE(it != entry.getNextHops().end());
BOOST_CHECK_EQUAL(&it->getFace(), face1.get());
- BOOST_CHECK_EQUAL(it->getEndpointId(), 200);
- BOOST_CHECK_EQUAL(it->getCost(), 20);
-
- ++it;
- BOOST_REQUIRE(it != entry.getNextHops().end());
- BOOST_CHECK_EQUAL(&it->getFace(), face1.get());
- BOOST_CHECK_EQUAL(it->getEndpointId(), 300);
BOOST_CHECK_EQUAL(it->getCost(), 30);
++it;
BOOST_REQUIRE(it != entry.getNextHops().end());
BOOST_CHECK_EQUAL(&it->getFace(), face2.get());
- BOOST_CHECK_EQUAL(it->getEndpointId(), 400);
BOOST_CHECK_EQUAL(it->getCost(), 40);
++it;
BOOST_CHECK(it == entry.getNextHops().end());
}
- entry.addOrUpdateNextHop(*face2, 100, 10);
- // [(face2,100,10), (face1,200,20), (face1,300,30), (face2,400,40)]
- BOOST_CHECK_EQUAL(entry.getNextHops().size(), 4);
+ entry.addOrUpdateNextHop(*face2, 10);
+ // [(face2,10), (face1,30)]
+ BOOST_CHECK_EQUAL(entry.getNextHops().size(), 2);
{
NextHopList::const_iterator it = entry.getNextHops().begin();
BOOST_REQUIRE(it != entry.getNextHops().end());
BOOST_CHECK_EQUAL(&it->getFace(), face2.get());
- BOOST_CHECK_EQUAL(it->getEndpointId(), 100);
BOOST_CHECK_EQUAL(it->getCost(), 10);
++it;
BOOST_REQUIRE(it != entry.getNextHops().end());
BOOST_CHECK_EQUAL(&it->getFace(), face1.get());
- BOOST_CHECK_EQUAL(it->getEndpointId(), 200);
- BOOST_CHECK_EQUAL(it->getCost(), 20);
-
- ++it;
- BOOST_REQUIRE(it != entry.getNextHops().end());
- BOOST_CHECK_EQUAL(&it->getFace(), face1.get());
- BOOST_CHECK_EQUAL(it->getEndpointId(), 300);
BOOST_CHECK_EQUAL(it->getCost(), 30);
++it;
- BOOST_REQUIRE(it != entry.getNextHops().end());
- BOOST_CHECK_EQUAL(&it->getFace(), face2.get());
- BOOST_CHECK_EQUAL(it->getEndpointId(), 400);
- BOOST_CHECK_EQUAL(it->getCost(), 40);
-
- ++it;
BOOST_CHECK(it == entry.getNextHops().end());
}
- entry.addOrUpdateNextHop(*face1, 200, 50);
- // [(face2,100,10), (face1,300,30), (face2,400,40), (face1,200,50)]
- BOOST_CHECK_EQUAL(entry.getNextHops().size(), 4);
- {
- NextHopList::const_iterator it = entry.getNextHops().begin();
- BOOST_REQUIRE(it != entry.getNextHops().end());
- BOOST_CHECK_EQUAL(&it->getFace(), face2.get());
- BOOST_CHECK_EQUAL(it->getEndpointId(), 100);
- BOOST_CHECK_EQUAL(it->getCost(), 10);
-
- ++it;
- BOOST_REQUIRE(it != entry.getNextHops().end());
- BOOST_CHECK_EQUAL(&it->getFace(), face1.get());
- BOOST_CHECK_EQUAL(it->getEndpointId(), 300);
- BOOST_CHECK_EQUAL(it->getCost(), 30);
-
- ++it;
- BOOST_REQUIRE(it != entry.getNextHops().end());
- BOOST_CHECK_EQUAL(&it->getFace(), face2.get());
- BOOST_CHECK_EQUAL(it->getEndpointId(), 400);
- BOOST_CHECK_EQUAL(it->getCost(), 40);
-
- ++it;
- BOOST_REQUIRE(it != entry.getNextHops().end());
- BOOST_CHECK_EQUAL(&it->getFace(), face1.get());
- BOOST_CHECK_EQUAL(it->getEndpointId(), 200);
- BOOST_CHECK_EQUAL(it->getCost(), 50);
-
- ++it;
- BOOST_CHECK(it == entry.getNextHops().end());
- }
-
- entry.removeNextHop(*face1, 200);
- // [(face2,100,10), (face1,300,30), (face2,400,40)]
- BOOST_CHECK_EQUAL(entry.getNextHops().size(), 3);
- BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getFace().getId(), face2->getId());
- BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getEndpointId(), 100);
- BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getCost(), 10);
-
- entry.removeNextHop(*face1, 200);
- // [(face2,100,10), (face1,300,30), (face2,400,40)]
- BOOST_CHECK_EQUAL(entry.getNextHops().size(), 3);
- BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getFace().getId(), face2->getId());
- BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getEndpointId(), 100);
- BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getCost(), 10);
-
- entry.removeNextHop(*face2,100);
- // [(face1,300,30), (face2,400,40)]
- BOOST_CHECK_EQUAL(entry.getNextHops().size(), 2);
-
- entry.removeNextHop(*face2,400);
- // [(face1,300,30)]
+ entry.removeNextHop(*face1);
+ // [(face2,10)]
BOOST_CHECK_EQUAL(entry.getNextHops().size(), 1);
+ BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getFace().getId(), face2->getId());
+ BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getCost(), 10);
- entry.removeNextHop(*face1,300);
+ entry.removeNextHop(*face1);
+ // [(face2,10)]
+ BOOST_CHECK_EQUAL(entry.getNextHops().size(), 1);
+ BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getFace().getId(), face2->getId());
+ BOOST_CHECK_EQUAL(entry.getNextHops().begin()->getCost(), 10);
+
+ entry.removeNextHop(*face2);
// []
BOOST_CHECK_EQUAL(entry.getNextHops().size(), 0);
- entry.removeNextHop(*face1,300);
+ entry.removeNextHop(*face2);
// []
BOOST_CHECK_EQUAL(entry.getNextHops().size(), 0);
}