First step of refactoring code (ccnx prefix => ndn prefix)
diff --git a/model/forwarding-strategy/smart-flooding.cc b/model/forwarding-strategy/smart-flooding.cc
index a7d0167..58a56a2 100644
--- a/model/forwarding-strategy/smart-flooding.cc
+++ b/model/forwarding-strategy/smart-flooding.cc
@@ -20,9 +20,9 @@
#include "smart-flooding.h"
-#include "ns3/ccnx-interest-header.h"
-#include "ns3/ccnx-pit.h"
-#include "ns3/ccnx-pit-entry.h"
+#include "ns3/ndn-interest-header.h"
+#include "ns3/ndn-pit.h"
+#include "ns3/ndn-pit-entry.h"
#include "ns3/assert.h"
#include "ns3/log.h"
@@ -39,7 +39,7 @@
namespace ns3 {
-using namespace __ccnx_private;
+using namespace __ndn_private;
namespace ndnSIM {
@@ -49,7 +49,7 @@
SmartFlooding::GetTypeId (void)
{
static TypeId tid = TypeId ("ns3::ndnSIM::SmartFloodingy")
- .SetGroupName ("Ccnx")
+ .SetGroupName ("Ndn")
.SetParent <GreenYellowRed> ()
.AddConstructor <SmartFlooding> ()
;
@@ -61,10 +61,10 @@
}
bool
-SmartFlooding::DoPropagateInterest (const Ptr<CcnxFace> &incomingFace,
- Ptr<CcnxInterestHeader> header,
+SmartFlooding::DoPropagateInterest (const Ptr<NdnFace> &incomingFace,
+ Ptr<NdnInterestHeader> header,
const Ptr<const Packet> &packet,
- Ptr<CcnxPitEntry> pitEntry)
+ Ptr<NdnPitEntry> pitEntry)
{
NS_LOG_FUNCTION (this);
@@ -75,10 +75,10 @@
int propagatedCount = 0;
- BOOST_FOREACH (const CcnxFibFaceMetric &metricFace, pitEntry->GetFibEntry ()->m_faces.get<i_metric> ())
+ BOOST_FOREACH (const NdnFibFaceMetric &metricFace, pitEntry->GetFibEntry ()->m_faces.get<i_metric> ())
{
NS_LOG_DEBUG ("Trying " << boost::cref(metricFace));
- if (metricFace.m_status == CcnxFibFaceMetric::NDN_FIB_RED) // all non-read faces are in the front of the list
+ if (metricFace.m_status == NdnFibFaceMetric::NDN_FIB_RED) // all non-read faces are in the front of the list
break;
if (metricFace.m_face == incomingFace)