Revert "fib: add EndpointId field in NextHop record"
This reverts commit 3ad49db6eaef0d3f4a0a9bdd3356c6bb9845db57.
refs: #4973
Change-Id: I3216a55a8c4ed52cd9181f790f8ab72e44330a38
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