commit d02a5d6b16bb3b15046b716b3a523c8488571102
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Nov 21 11:01:51 2011 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Nov 21 11:01:51 2011 -0800
tree e8ffc02e2739265413963197572640843a2a4c25
parent aa1154b230b734b550e6da9515ac7341d9b66710

Adding several corrections. Most important is fixing regression in ccnb-parser-block.cc

examples/ccnx-grid.cc

diff --git a/examples/ccnx-grid.cc b/examples/ccnx-grid.cc
index da76a6c..acf4a5f 100644
--- a/examples/ccnx-grid.cc
+++ b/examples/ccnx-grid.cc
@@ -46,6 +46,7 @@
 {
   Config::SetDefault ("ns3::PointToPointNetDevice::DataRate", StringValue ("1Mbps"));
   Config::SetDefault ("ns3::PointToPointChannel::Delay", StringValue ("1ms"));
+  Config::SetDefault ("ns3::CcnxConsumer::OffTime", StringValue ("100ms"));
     
   Packet::EnableChecking();
   Packet::EnablePrinting();
@@ -81,8 +82,8 @@
   consumerNodes.Add (grid.GetNode (0,0));
   
   // Populate FIB based on IPv4 global routing controller
-  ccnxHelper.InstallFakeGlobalRoutes ();
-  ccnxHelper.InstallRouteTo (producer);
+  // ccnxHelper.InstallFakeGlobalRoutes ();
+  // ccnxHelper.InstallRouteTo (producer);
 
   NS_LOG_INFO ("Installing Applications");
   std::ostringstream prefix;
@@ -91,14 +92,14 @@
   CcnxConsumerHelper consumerHelper (prefix.str ());
   ApplicationContainer consumers = consumerHelper.Install (consumerNodes);
   
-  consumers.Start (Seconds (0));
-  consumers.Stop (Seconds (2000));
+  consumers.Start (Seconds (0.0));
+  consumers.Stop (Seconds (20.0));
     
   CcnxProducerHelper producerHelper (prefix.str (),120);
   ApplicationContainer producers = producerHelper.Install (producer);
   
   producers.Start(Seconds(0.0));
-  producers.Stop(Seconds(2000.0));
+  producers.Stop(Seconds(20.0));
 
   NS_LOG_INFO ("Outputing FIBs into [fibs.log]");
   Ptr<OutputStreamWrapper> routingStream = Create<OutputStreamWrapper> ("fibs.log", std::ios::out);
@@ -118,7 +119,7 @@
   // NS_LOG_INFO ("FIB dump:\n" << *c.Get(0)->GetObject<CcnxFib> ());
   // NS_LOG_INFO ("FIB dump:\n" << *c.Get(1)->GetObject<CcnxFib> ());
     
-  Simulator::Stop (Seconds (2000));
+  Simulator::Stop (Seconds (100));
     
   NS_LOG_INFO ("Run Simulation.");
   Simulator::Run ();