fw: eliminate fibEntry in Strategy API
Strategy::lookupFib can be used to obtain FIB entry.
FIB lookup is skipped when strategy does not need it.
refs #3205
Change-Id: Icba67229cbc261d9def44ffa91461ea4b09982b2
diff --git a/tests/daemon/fw/dummy-strategy.hpp b/tests/daemon/fw/dummy-strategy.hpp
index 25623cb..ca6a858 100644
--- a/tests/daemon/fw/dummy-strategy.hpp
+++ b/tests/daemon/fw/dummy-strategy.hpp
@@ -55,13 +55,11 @@
virtual void
afterReceiveInterest(const Face& inFace,
const Interest& interest,
- shared_ptr<fib::Entry> fibEntry,
shared_ptr<pit::Entry> pitEntry) override
{
++afterReceiveInterest_count;
if (wantAfterReceiveInterestCalls) {
- afterReceiveInterestCalls.push_back(std::make_tuple(inFace.getId(), interest,
- fibEntry, pitEntry));
+ afterReceiveInterestCalls.emplace_back(inFace.getId(), interest, pitEntry);
}
if (interestOutFace) {
@@ -89,7 +87,6 @@
virtual void
afterReceiveNack(const Face& inFace,
const lp::Nack& nack,
- shared_ptr<fib::Entry> fibEntry,
shared_ptr<pit::Entry> pitEntry) override
{
++afterReceiveNack_count;
@@ -98,8 +95,7 @@
public:
int afterReceiveInterest_count;
bool wantAfterReceiveInterestCalls;
- std::vector<std::tuple<FaceId, Interest, shared_ptr<fib::Entry>,
- shared_ptr<pit::Entry>>> afterReceiveInterestCalls;
+ std::vector<std::tuple<FaceId, Interest, shared_ptr<pit::Entry>>> afterReceiveInterestCalls;
shared_ptr<Face> interestOutFace;
int beforeSatisfyInterest_count;