fw: remove onInterestUnsatisfied pipeline stage
Change-Id: Ic008bb26b87db176bac8d51230e53f923b19e5d2
refs: 4290
diff --git a/daemon/fw/forwarder.cpp b/daemon/fw/forwarder.cpp
index 6d57a2d..cea2974 100644
--- a/daemon/fw/forwarder.cpp
+++ b/daemon/fw/forwarder.cpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2017, Regents of the University of California,
+ * Copyright (c) 2014-2018, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -244,19 +244,6 @@
}
void
-Forwarder::onInterestUnsatisfied(const shared_ptr<pit::Entry>& pitEntry)
-{
- NFD_LOG_DEBUG("onInterestUnsatisfied interest=" << pitEntry->getName());
-
- // invoke PIT unsatisfied callback
- this->dispatchToStrategy(*pitEntry,
- [&] (fw::Strategy& strategy) { strategy.beforeExpirePendingInterest(pitEntry); });
-
- // goto Interest Finalize pipeline
- this->onInterestFinalize(pitEntry, false);
-}
-
-void
Forwarder::onInterestFinalize(const shared_ptr<pit::Entry>& pitEntry, bool isSatisfied,
ndn::optional<time::milliseconds> dataFreshnessPeriod)
{
@@ -511,7 +498,7 @@
scheduler::cancel(pitEntry->m_unsatisfyTimer);
pitEntry->m_unsatisfyTimer = scheduler::schedule(lastExpiryFromNow,
- bind(&Forwarder::onInterestUnsatisfied, this, pitEntry));
+ bind(&Forwarder::onInterestFinalize, this, pitEntry, false, ndn::nullopt));
}
void