[ndnSIM] fw: Keep both the CS of NFD and ndnSIM
Change-Id: I0c7bcbc09a1be393eddfe8ef3cd7ab60b1622996
Ref: #2231
diff --git a/daemon/fw/forwarder.hpp b/daemon/fw/forwarder.hpp
index 2bac6b0..d2a5eb8 100644
--- a/daemon/fw/forwarder.hpp
+++ b/daemon/fw/forwarder.hpp
@@ -38,6 +38,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 {
@@ -123,6 +125,10 @@
NetworkRegionTable&
getNetworkRegionTable();
+public: // allow enabling ndnSIM content store (will be removed in the future)
+ void
+ setCsFromNdnSim(ns3::Ptr<ns3::ndn::ContentStore> cs);
+
PUBLIC_WITH_TESTS_ELSE_PRIVATE: // pipelines
/** \brief incoming Interest pipeline
*/
@@ -239,6 +245,8 @@
DeadNonceList m_deadNonceList;
NetworkRegionTable m_networkRegionTable;
+ ns3::Ptr<ns3::ndn::ContentStore> m_csFromNdnSim;
+
static const Name LOCALHOST_NAME;
// allow Strategy (base class) to enter pipelines
@@ -317,6 +325,12 @@
return m_networkRegionTable;
}
+inline void
+Forwarder::setCsFromNdnSim(ns3::Ptr<ns3::ndn::ContentStore> cs)
+{
+ m_csFromNdnSim = cs;
+}
+
#ifdef WITH_TESTS
inline void
Forwarder::dispatchToStrategy(shared_ptr<pit::Entry> pitEntry, function<void(fw::Strategy*)> trigger)