Refactoring of CcnxForwardingHelper
diff --git a/helper/ccnx-forwarding-helper.cc b/helper/ccnx-forwarding-helper.cc
index c840d7a..dfc7905 100644
--- a/helper/ccnx-forwarding-helper.cc
+++ b/helper/ccnx-forwarding-helper.cc
@@ -42,12 +42,13 @@
}
void
-CcnxForwardingHelper::SetForwarding(Ptr<Ccnx> ccnx) const
+CcnxForwardingHelper::SetForwarding(Ptr<Ccnx> ccnx, Ptr<CcnxPit> pit) const
{
if(m_strategy == Ccnx::NDN_FLOODING)
{
Ptr<CcnxFloodingStrategy> ccnxForwarding = CreateObject<CcnxFloodingStrategy> ();
- ccnxForwarding->SetCcnx(ccnx);
+ //ccnxForwarding->SetCcnx(ccnx);
+ ccnxForwarding->SetPit(pit);
ccnx->SetForwardingStrategy (ccnxForwarding);
}
else if(m_strategy == Ccnx::NDN_BESTROUTE)
diff --git a/helper/ccnx-forwarding-helper.h b/helper/ccnx-forwarding-helper.h
index c40bc12..fe9f9d4 100644
--- a/helper/ccnx-forwarding-helper.h
+++ b/helper/ccnx-forwarding-helper.h
@@ -26,6 +26,7 @@
#include "ns3/output-stream-wrapper.h"
#include "ns3/ccnx.h"
#include "ns3/ccnx-flooding-strategy.h"
+#include "ns3/ccnx-pit.h"
namespace ns3 {
@@ -58,9 +59,9 @@
~CcnxForwardingHelper ();
/*
- * \brief creates a specified ForwardingStrategy object and binds it to Ccnx
+ * \brief creates a specified ForwardingStrategy object and binds it to Pit
*/
- void SetForwarding(Ptr<Ccnx> ccnx) const;
+ void SetForwarding(Ptr<Ccnx> ccnx, Ptr<CcnxPit> pit) const;
/**
* \brief prints the forwarding tables of all nodes at a particular time.