Adding several corrections. Most important is fixing regression in ccnb-parser-block.cc
diff --git a/examples/annotated-topology-read-example.cc b/examples/annotated-topology-read-example.cc
index 7aff4fe..000b578 100644
--- a/examples/annotated-topology-read-example.cc
+++ b/examples/annotated-topology-read-example.cc
@@ -30,7 +30,6 @@
#include "ns3/ipv4-list-routing-helper.h"
#include "ns3/annotated-topology-reader.h"
#include <list>
-#include "ns3/visualizer-module.h"
#include "ns3/ccnx.h"
#include "ns3/ipv4-global-routing-helper.h"
#include "ns3/NDNabstraction-module.h"
@@ -42,8 +41,6 @@
int main (int argc, char *argv[])
{
- GlobalValue::Bind ("SimulatorImplementationType", StringValue
- ("ns3::VisualSimulatorImpl"));
Packet::EnableChecking();
Packet::EnablePrinting();
string input ("/Users/iliamo/ns3-abstract-ndn/ns-3.11/src/NDNabstraction/examples/simpletopology.txt");
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 ();
diff --git a/examples/syntactic-topology-ndnabstraction.cc b/examples/syntactic-topology-ndnabstraction.cc
index 61f5c49..5ca03e1 100644
--- a/examples/syntactic-topology-ndnabstraction.cc
+++ b/examples/syntactic-topology-ndnabstraction.cc
@@ -28,7 +28,6 @@
#include <iostream>
#include <sstream>
-#include "ns3/visualizer-module.h"
#include "ns3/ccnx.h"
@@ -39,9 +38,6 @@
int
main (int argc, char *argv[])
{
- GlobalValue::Bind ("SimulatorImplementationType", StringValue
- ("ns3::VisualSimulatorImpl"));
-
// Set up some default values for the simulation. Use the
Config::SetDefault ("ns3::OnOffApplication::PacketSize", UintegerValue (210));