face: add EndpointId in Face and LinkService
refs: #4843
Change-Id: If1249015392ef904a56a0d0d97946e2b3024d7d4
diff --git a/tests/daemon/fw/forwarder.t.cpp b/tests/daemon/fw/forwarder.t.cpp
index d07d160..7325f24 100644
--- a/tests/daemon/fw/forwarder.t.cpp
+++ b/tests/daemon/fw/forwarder.t.cpp
@@ -60,7 +60,7 @@
BOOST_CHECK_EQUAL(forwarder.getCounters().nOutInterests, 0);
BOOST_CHECK_EQUAL(forwarder.getCounters().nCsHits, 0);
BOOST_CHECK_EQUAL(forwarder.getCounters().nCsMisses, 0);
- face1->receiveInterest(*interestAB);
+ face1->receiveInterest(*interestAB, 0);
this->advanceClocks(100_ms, 1_s);
BOOST_REQUIRE_EQUAL(face2->sentInterests.size(), 1);
BOOST_CHECK_EQUAL(face2->sentInterests[0].getName(), "/A/B");
@@ -73,7 +73,7 @@
BOOST_CHECK_EQUAL(forwarder.getCounters().nInData, 0);
BOOST_CHECK_EQUAL(forwarder.getCounters().nOutData, 0);
- face2->receiveData(*dataABC);
+ face2->receiveData(*dataABC, 0);
this->advanceClocks(100_ms, 1_s);
BOOST_REQUIRE_EQUAL(face1->sentData.size(), 1);
BOOST_CHECK_EQUAL(face1->sentData[0].getName(), "/A/B/C");
@@ -110,7 +110,7 @@
BOOST_CHECK_EQUAL(forwarder.getCounters().nCsHits, 0);
BOOST_CHECK_EQUAL(forwarder.getCounters().nCsMisses, 0);
- face1->receiveInterest(*interestA);
+ face1->receiveInterest(*interestA, 0);
this->advanceClocks(1_ms, 5_ms);
// Interest matching ContentStore should not be forwarded
BOOST_REQUIRE_EQUAL(face2->sentInterests.size(), 0);
@@ -170,7 +170,7 @@
shared_ptr<Interest> interest = makeInterest("/A/B");
interest->setTag(make_shared<lp::NextHopFaceIdTag>(face2->getId()));
- face1->receiveInterest(*interest);
+ face1->receiveInterest(*interest, 0);
this->advanceClocks(100_ms, 1_s);
BOOST_CHECK_EQUAL(face3->sentInterests.size(), 0);
BOOST_REQUIRE_EQUAL(face2->sentInterests.size(), 1);
@@ -501,19 +501,19 @@
// receive Interest on face1
face1->sentNacks.clear();
shared_ptr<Interest> interest1a = makeInterest("/zT4XwK0Hnx/28JBUvbEzc", 732);
- face1->receiveInterest(*interest1a);
+ face1->receiveInterest(*interest1a, 0);
BOOST_CHECK(face1->sentNacks.empty());
// receive Interest with duplicate Nonce on face1: legit retransmission
face1->sentNacks.clear();
shared_ptr<Interest> interest1b = makeInterest("/zT4XwK0Hnx/28JBUvbEzc", 732);
- face1->receiveInterest(*interest1b);
+ face1->receiveInterest(*interest1b, 0);
BOOST_CHECK(face1->sentNacks.empty());
// receive Interest with duplicate Nonce on face2
face2->sentNacks.clear();
shared_ptr<Interest> interest2a = makeInterest("/zT4XwK0Hnx/28JBUvbEzc", 732);
- face2->receiveInterest(*interest2a);
+ face2->receiveInterest(*interest2a, 0);
BOOST_REQUIRE_EQUAL(face2->sentNacks.size(), 1);
BOOST_CHECK_EQUAL(face2->sentNacks.back().getInterest(), *interest2a);
BOOST_CHECK_EQUAL(face2->sentNacks.back().getReason(), lp::NackReason::DUPLICATE);
@@ -521,13 +521,13 @@
// receive Interest with new Nonce on face2
face2->sentNacks.clear();
shared_ptr<Interest> interest2b = makeInterest("/zT4XwK0Hnx/28JBUvbEzc", 944);
- face2->receiveInterest(*interest2b);
+ face2->receiveInterest(*interest2b, 0);
BOOST_CHECK(face2->sentNacks.empty());
// receive Interest with duplicate Nonce on face3, don't send Nack to multi-access face
face3->sentNacks.clear();
shared_ptr<Interest> interest3a = makeInterest("/zT4XwK0Hnx/28JBUvbEzc", 732);
- face3->receiveInterest(*interest3a);
+ face3->receiveInterest(*interest3a, 0);
BOOST_CHECK(face3->sentNacks.empty());
}
@@ -543,7 +543,7 @@
face2->afterSend.connect([face1, face2] (uint32_t pktType) {
if (pktType == tlv::Interest) {
auto interest = make_shared<Interest>(face2->sentInterests.back());
- getScheduler().schedule(170_ms, [face1, interest] { face1->receiveInterest(*interest); });
+ getScheduler().schedule(170_ms, [face1, interest] { face1->receiveInterest(*interest, 0); });
}
});
@@ -554,7 +554,7 @@
shared_ptr<Interest> interest = makeInterest("ndn:/A/1");
interest->setNonce(82101183);
interest->setInterestLifetime(50_ms);
- face1->receiveInterest(*interest);
+ face1->receiveInterest(*interest, 0);
// interest should be forwarded only once, as long as Nonce is in Dead Nonce List
BOOST_ASSERT(25_ms * 40 < forwarder.getDeadNonceList().getLifetime());
diff --git a/tests/daemon/fw/pit-expiry.t.cpp b/tests/daemon/fw/pit-expiry.t.cpp
index 5467c4a..94caac9 100644
--- a/tests/daemon/fw/pit-expiry.t.cpp
+++ b/tests/daemon/fw/pit-expiry.t.cpp
@@ -135,8 +135,8 @@
interest1->setInterestLifetime(90_ms);
interest2->setInterestLifetime(90_ms);
- face1->receiveInterest(*interest1);
- face2->receiveInterest(*interest2);
+ face1->receiveInterest(*interest1, 0);
+ face2->receiveInterest(*interest2, 0);
BOOST_CHECK_EQUAL(pit.size(), 2);
this->advanceClocks(100_ms);
@@ -158,10 +158,10 @@
interest->setInterestLifetime(90_ms);
shared_ptr<Data> data = makeData("/A/0");
- face1->receiveInterest(*interest);
+ face1->receiveInterest(*interest, 0);
this->advanceClocks(30_ms);
- face2->receiveData(*data);
+ face2->receiveData(*data, 0);
this->advanceClocks(1_ms);
BOOST_CHECK_EQUAL(pit.size(), 0);
@@ -192,14 +192,14 @@
Cs& cs = forwarder.getCs();
cs.insert(*data);
- face1->receiveInterest(*interest);
+ face1->receiveInterest(*interest, 0);
this->advanceClocks(1_ms);
BOOST_CHECK_EQUAL(pit.size(), 1);
this->advanceClocks(190_ms);
BOOST_CHECK_EQUAL(pit.size(), 0);
- face1->receiveInterest(*interest);
+ face1->receiveInterest(*interest, 0);
this->advanceClocks(1_ms);
BOOST_CHECK_EQUAL(pit.size(), 0);
}
@@ -225,13 +225,13 @@
interest->setInterestLifetime(90_ms);
lp::Nack nack = makeNack("/A/0", 562, lp::NackReason::CONGESTION);
- face1->receiveInterest(*interest);
+ face1->receiveInterest(*interest, 0);
auto entry = pit.find(*interest);
entry->insertOrUpdateOutRecord(*face2, 0, *interest);
entry->insertOrUpdateOutRecord(*face3, 0, *interest);
this->advanceClocks(10_ms);
- face2->receiveNack(nack);
+ face2->receiveNack(nack, 0);
this->advanceClocks(1_ms);
BOOST_CHECK_EQUAL(pit.size(), 1);
@@ -256,7 +256,7 @@
shared_ptr<Interest> interest = makeInterest("/A/0");
interest->setInterestLifetime(90_ms);
- face->receiveInterest(*interest);
+ face->receiveInterest(*interest, 0);
BOOST_CHECK_EQUAL(pit.size(), 1);
this->advanceClocks(100_ms);
@@ -291,30 +291,30 @@
interest2->setInterestLifetime(90_ms);
shared_ptr<Data> data = makeData("/A/0");
- face1->receiveInterest(*interest1);
- face2->receiveInterest(*interest2);
+ face1->receiveInterest(*interest1, 0);
+ face2->receiveInterest(*interest2, 0);
BOOST_CHECK_EQUAL(pit.size(), 2);
// beforeSatisfyInterest: the first Data prolongs PIT expiry timer by 190 ms
this->advanceClocks(30_ms);
- face3->receiveData(*data);
+ face3->receiveData(*data, 0);
this->advanceClocks(189_ms);
BOOST_CHECK_EQUAL(pit.size(), 2);
this->advanceClocks(2_ms);
BOOST_CHECK_EQUAL(pit.size(), 0);
- face1->receiveInterest(*interest1);
- face2->receiveInterest(*interest2);
+ face1->receiveInterest(*interest1, 0);
+ face2->receiveInterest(*interest2, 0);
// beforeSatisfyInterest: the second Data prolongs PIT expiry timer
// and the third one sets the timer to now
this->advanceClocks(30_ms);
- face3->receiveData(*data);
+ face3->receiveData(*data, 0);
this->advanceClocks(1_ms);
BOOST_CHECK_EQUAL(pit.size(), 2);
this->advanceClocks(30_ms);
- face3->receiveData(*data);
+ face3->receiveData(*data, 0);
this->advanceClocks(1_ms);
BOOST_CHECK_EQUAL(pit.size(), 0);
@@ -343,27 +343,27 @@
interest->setInterestLifetime(90_ms);
shared_ptr<Data> data = makeData("/A/0");
- face1->receiveInterest(*interest);
+ face1->receiveInterest(*interest, 0);
// afterReceiveData: the first Data prolongs PIT expiry timer by 290 ms
this->advanceClocks(30_ms);
- face2->receiveData(*data);
+ face2->receiveData(*data, 0);
this->advanceClocks(289_ms);
BOOST_CHECK_EQUAL(pit.size(), 1);
this->advanceClocks(2_ms);
BOOST_CHECK_EQUAL(pit.size(), 0);
- face1->receiveInterest(*interest);
+ face1->receiveInterest(*interest, 0);
// afterReceiveData: the second Data prolongs PIT expiry timer
// and the third one sets the timer to now
this->advanceClocks(30_ms);
- face2->receiveData(*data);
+ face2->receiveData(*data, 0);
this->advanceClocks(1_ms);
BOOST_CHECK_EQUAL(pit.size(), 1);
this->advanceClocks(30_ms);
- face2->receiveData(*data);
+ face2->receiveData(*data, 0);
this->advanceClocks(1_ms);
BOOST_CHECK_EQUAL(pit.size(), 0);
@@ -392,20 +392,20 @@
interest->setInterestLifetime(90_ms);
lp::Nack nack = makeNack("/A/0", 562, lp::NackReason::CONGESTION);
- face1->receiveInterest(*interest);
+ face1->receiveInterest(*interest, 0);
auto entry = pit.find(*interest);
entry->insertOrUpdateOutRecord(*face2, 0, *interest);
entry->insertOrUpdateOutRecord(*face3, 0, *interest);
//pitEntry is not erased after receiving the first Nack
this->advanceClocks(10_ms);
- face2->receiveNack(nack);
+ face2->receiveNack(nack, 0);
this->advanceClocks(1_ms);
BOOST_CHECK_EQUAL(pit.size(), 1);
//pitEntry is erased after receiving the second Nack
this->advanceClocks(10_ms);
- face3->receiveNack(nack);
+ face3->receiveNack(nack, 0);
this->advanceClocks(1_ms);
BOOST_CHECK_EQUAL(pit.size(), 0);
}
diff --git a/tests/daemon/fw/topology-tester.cpp b/tests/daemon/fw/topology-tester.cpp
index 5c63f61..2c077ba 100644
--- a/tests/daemon/fw/topology-tester.cpp
+++ b/tests/daemon/fw/topology-tester.cpp
@@ -138,27 +138,27 @@
///\todo #3941 call GenericLinkServiceCounters constructor in TopologyPcapLinkService constructor
void
- doSendInterest(const Interest& interest) override
+ doSendInterest(const Interest& interest, const EndpointId& endpointId) override
{
this->sentInterests.push_back(interest);
this->sentInterests.back().setTag(std::make_shared<TopologyPcapTimestamp>(time::steady_clock::now()));
- this->GenericLinkService::doSendInterest(interest);
+ this->GenericLinkService::doSendInterest(interest, endpointId);
}
void
- doSendData(const Data& data) override
+ doSendData(const Data& data, const EndpointId& endpointId) override
{
this->sentData.push_back(data);
this->sentData.back().setTag(std::make_shared<TopologyPcapTimestamp>(time::steady_clock::now()));
- this->GenericLinkService::doSendData(data);
+ this->GenericLinkService::doSendData(data, endpointId);
}
void
- doSendNack(const lp::Nack& nack) override
+ doSendNack(const lp::Nack& nack, const EndpointId& endpointId) override
{
this->sentNacks.push_back(nack);
this->sentNacks.back().setTag(std::make_shared<TopologyPcapTimestamp>(time::steady_clock::now()));
- this->GenericLinkService::doSendNack(nack);
+ this->GenericLinkService::doSendNack(nack, endpointId);
}
};