NFD: Keep both the CS of NFD and ndnSIM
Ref: #2231
diff --git a/NFD/daemon/fw/forwarder.hpp b/NFD/daemon/fw/forwarder.hpp
index a753f15..627148e 100644
--- a/NFD/daemon/fw/forwarder.hpp
+++ b/NFD/daemon/fw/forwarder.hpp
@@ -37,6 +37,8 @@
#include "table/strategy-choice.hpp"
#include "table/dead-nonce-list.hpp"
+#include "ns3/ndnSIM/model/cs/ndn-content-store.hpp"
+
namespace nfd {
namespace fw {
@@ -104,6 +106,10 @@
DeadNonceList&
getDeadNonceList();
+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
*/
@@ -199,6 +205,8 @@
StrategyChoice m_strategyChoice;
DeadNonceList m_deadNonceList;
+ ns3::Ptr<ns3::ndn::ContentStore> m_csFromNdnSim;
+
static const Name LOCALHOST_NAME;
// allow Strategy (base class) to enter pipelines
@@ -283,6 +291,12 @@
return m_deadNonceList;
}
+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)