[ndnSIM] fw: Keep both the CS of NFD and ndnSIM
Change-Id: I0c7abbc09a1be393eddfe8ef3cd7ab60b1622996
Ref: #2231
diff --git a/daemon/fw/forwarder.hpp b/daemon/fw/forwarder.hpp
index 6d50909..f417fd6 100644
--- a/daemon/fw/forwarder.hpp
+++ b/daemon/fw/forwarder.hpp
@@ -39,6 +39,8 @@
#include "table/dead-nonce-list.hpp"
#include "table/network-region-table.hpp"
+#include "ns3/ndnSIM/model/cs/ndn-content-store.hpp"
+
namespace nfd {
namespace fw {
@@ -182,6 +184,24 @@
return m_networkRegionTable;
}
+public: // allow enabling ndnSIM content store (will be removed in the future)
+ void
+ setCsFromNdnSim(ns3::Ptr<ns3::ndn::ContentStore> cs)
+ {
+ m_csFromNdnSim = cs;
+ }
+
+public:
+ /** \brief trigger before PIT entry is satisfied
+ * \sa Strategy::beforeSatisfyInterest
+ */
+ signal::Signal<Forwarder, pit::Entry, Face, Data> beforeSatisfyInterest;
+
+ /** \brief trigger before PIT entry expires
+ * \sa Strategy::beforeExpirePendingInterest
+ */
+ signal::Signal<Forwarder, pit::Entry> beforeExpirePendingInterest;
+
PUBLIC_WITH_TESTS_ELSE_PRIVATE: // pipelines
/** \brief incoming Interest pipeline
*/
@@ -302,6 +322,9 @@
StrategyChoice m_strategyChoice;
DeadNonceList m_deadNonceList;
NetworkRegionTable m_networkRegionTable;
+ shared_ptr<Face> m_csFace;
+
+ ns3::Ptr<ns3::ndn::ContentStore> m_csFromNdnSim;
// allow Strategy (base class) to enter pipelines
friend class fw::Strategy;