fw: add FaceEndpoint parameter in Forwarding and Strategy API
refs: #4849
Change-Id: Ibe22557488fa83a555fd13d6eb8e03f8d81d0b2b
diff --git a/tests/daemon/fw/pit-expiry.t.cpp b/tests/daemon/fw/pit-expiry.t.cpp
index b8c0418..1e0b599 100644
--- a/tests/daemon/fw/pit-expiry.t.cpp
+++ b/tests/daemon/fw/pit-expiry.t.cpp
@@ -62,10 +62,10 @@
}
void
- afterReceiveInterest(const Face& inFace, const Interest& interest,
+ afterReceiveInterest(const FaceEndpoint& ingress, const Interest& interest,
const shared_ptr<pit::Entry>& pitEntry) override
{
- DummyStrategy::afterReceiveInterest(inFace, interest, pitEntry);
+ DummyStrategy::afterReceiveInterest(ingress, interest, pitEntry);
if (afterReceiveInterest_count <= 1) {
setExpiryTimer(pitEntry, 190_ms);
@@ -74,9 +74,9 @@
void
beforeSatisfyInterest(const shared_ptr<pit::Entry>& pitEntry,
- const Face& inFace, const Data& data) override
+ const FaceEndpoint& ingress, const Data& data) override
{
- DummyStrategy::beforeSatisfyInterest(pitEntry, inFace, data);
+ DummyStrategy::beforeSatisfyInterest(pitEntry, ingress, data);
if (beforeSatisfyInterest_count <= 2) {
setExpiryTimer(pitEntry, 190_ms);
@@ -85,18 +85,18 @@
void
afterContentStoreHit(const shared_ptr<pit::Entry>& pitEntry,
- const Face& inFace, const Data& data) override
+ const FaceEndpoint& ingress, const Data& data) override
{
if (afterContentStoreHit_count == 0) {
setExpiryTimer(pitEntry, 190_ms);
}
- DummyStrategy::afterContentStoreHit(pitEntry, inFace, data);
+ DummyStrategy::afterContentStoreHit(pitEntry, ingress, data);
}
void
afterReceiveData(const shared_ptr<pit::Entry>& pitEntry,
- const Face& inFace, const Data& data) override
+ const FaceEndpoint& ingress, const Data& data) override
{
++afterReceiveData_count;
@@ -104,14 +104,14 @@
setExpiryTimer(pitEntry, 290_ms);
}
- this->sendDataToAll(pitEntry, inFace, data);
+ this->sendDataToAll(pitEntry, ingress, data);
}
void
- afterReceiveNack(const Face& inFace, const lp::Nack& nack,
+ afterReceiveNack(const FaceEndpoint& ingress, const lp::Nack& nack,
const shared_ptr<pit::Entry>& pitEntry) override
{
- DummyStrategy::afterReceiveNack(inFace, nack, pitEntry);
+ DummyStrategy::afterReceiveNack(ingress, nack, pitEntry);
if (afterReceiveNack_count <= 1) {
setExpiryTimer(pitEntry, 50_ms);