commit 43e702598082e6852c8ef0b33e47a1bec41302cb
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Aug 08 18:48:18 2011 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Aug 08 18:48:18 2011 -0700
tree 730712723317ce4b1597bf23ff4a15bba4a26570
parent b085f7440e0913dd136828a9d652c734de4f9995

Small source movements (ccn_* to ccn/). Small change of NameBuilder implementation

model/ndn_stupidinterestgenerator.cc

diff --git a/model/ndn_stupidinterestgenerator.cc b/model/ndn_stupidinterestgenerator.cc
index 629d48f..5bc1861 100644
--- a/model/ndn_stupidinterestgenerator.cc
+++ b/model/ndn_stupidinterestgenerator.cc
@@ -13,6 +13,8 @@
 #include "ndn_interestpacket.h"
 #include "ndn_namebuilder.h"
 
+#include "ccn/ccn_charbuf.h"
+
 NS_LOG_COMPONENT_DEFINE ("StupidInterestGenerator");
 
 namespace ns3
@@ -159,11 +161,9 @@
         NS_LOG_LOGIC ("sending packet at " << Simulator::Now ());
         NS_ASSERT (m_sendEvent.IsExpired ());
         
-        NameBuilder name;        
-        name.AddComponent("prefix1");
-        name.AddComponent("prefix2");
-        name.AddComponent("filename");
-        ccn_charbuf *output = name.GetName();
+        NameBuilder name;
+		name("prefix1")("prefix2")("filename");
+        const ccn_charbuf *output = name.GetName();
         Ptr<InterestPacket> packet = Create<InterestPacket>(output->buf,(uint32_t)output->length);
         packet->AddTimeout(4000);
         UniformVariable var;
@@ -174,4 +174,4 @@
     }
 
 //}
-}
\ No newline at end of file
+}