commit 9213601b0ccb87fb855fc8750a5d8e46eaf75300
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Jul 16 20:36:30 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jul 19 17:11:15 2013 -0700
tree 16107100048a2893f8a0a505aefc27c5b35153ea
parent 7b923f387617e2fc3f055f09a70ca1eed4c441e5

model: Another major change: switching to NDN.cxx API for ndn::Name

NDN.cxx code is almost exactly the same, with minor NS-3 specific customizations

Refs #1011 (http://redmine.named-data.net/issues/1011)

apps/ndn-consumer-zipf-mandelbrot.cc

diff --git a/apps/ndn-consumer-zipf-mandelbrot.cc b/apps/ndn-consumer-zipf-mandelbrot.cc
index 866eb48..3f863f5 100644
--- a/apps/ndn-consumer-zipf-mandelbrot.cc
+++ b/apps/ndn-consumer-zipf-mandelbrot.cc
@@ -176,7 +176,7 @@
 
   //
   Ptr<Name> nameWithSequence = Create<Name> (m_interestName);
-  (*nameWithSequence) (seq);
+  nameWithSequence->appendSeqNum (seq);
   //
 
   Ptr<Interest> interest = Create<Interest> ();

apps/ndn-consumer.cc

diff --git a/apps/ndn-consumer.cc b/apps/ndn-consumer.cc
index adbce0f..619e2f1 100644
--- a/apps/ndn-consumer.cc
+++ b/apps/ndn-consumer.cc
@@ -37,14 +37,9 @@
 #include "ns3/ndnSIM/utils/ndn-rtt-mean-deviation.h"
 
 #include <boost/ref.hpp>
-#include <boost/lexical_cast.hpp>
-#include <boost/lambda/lambda.hpp>
-#include <boost/lambda/bind.hpp>
 
 #include "ns3/names.h"
 
-namespace ll = boost::lambda;
-
 NS_LOG_COMPONENT_DEFINE ("ndn.Consumer");
 
 namespace ns3 {
@@ -200,7 +195,7 @@
 
   //
   Ptr<Name> nameWithSequence = Create<Name> (m_interestName);
-  (*nameWithSequence) (seq);
+  nameWithSequence->appendSeqNum (seq);
   //
 
   Ptr<Interest> interest = Create<Interest> ();
@@ -238,7 +233,7 @@
 
   // NS_LOG_INFO ("Received content object: " << boost::cref(*data));
 
-  uint32_t seq = boost::lexical_cast<uint32_t> (data->GetName ().GetComponents ().back ());
+  uint32_t seq = data->GetName ().get (-1).toSeqNum ();
   NS_LOG_INFO ("< DATA for " << seq);
 
   int hopCount = -1;
@@ -282,7 +277,7 @@
   // NS_LOG_FUNCTION (interest->GetName ());
 
   // NS_LOG_INFO ("Received NACK: " << boost::cref(*interest));
-  uint32_t seq = boost::lexical_cast<uint32_t> (interest->GetName ().GetComponents ().back ());
+  uint32_t seq = interest->GetName ().get (-1).toSeqNum ();
   NS_LOG_INFO ("< NACK for " << seq);
   // std::cout << Simulator::Now ().ToDouble (Time::S) << "s -> " << "NACK for " << seq << "\n";
 

apps/ndn-producer.cc

diff --git a/apps/ndn-producer.cc b/apps/ndn-producer.cc
index 130b450..e8a66aa 100644
--- a/apps/ndn-producer.cc
+++ b/apps/ndn-producer.cc
@@ -129,7 +129,7 @@
 
   Ptr<ContentObject> data = Create<ContentObject> (Create<Packet> (m_virtualPayloadSize));
   Ptr<Name> dataName = Create<Name> (interest->GetName ());
-  dataName->Append (m_postfix);
+  dataName->append (m_postfix);
   data->SetName (dataName);
   data->SetFreshness (m_freshness);