Merge remote-tracking branch 'git.irl/master'
diff --git a/examples/blackhole-abilene.cc b/examples/blackhole-abilene.cc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/examples/blackhole-abilene.cc
@@ -0,0 +1 @@
+
diff --git a/examples/blackhole-sprint.cc b/examples/blackhole-sprint.cc
new file mode 100644
index 0000000..8b13789
--- /dev/null
+++ b/examples/blackhole-sprint.cc
@@ -0,0 +1 @@
+
diff --git a/examples/link-failure-abilene.cc b/examples/link-failure-abilene.cc
new file mode 100644
index 0000000..f118b04
--- /dev/null
+++ b/examples/link-failure-abilene.cc
@@ -0,0 +1,171 @@
+/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 University of California, Los Angeles
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: Ilya Moiseenko <iliamo@cs.ucla.edu>
+ */
+
+
+
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/point-to-point-module.h"
+#include "ns3/NDNabstraction-module.h"
+#include "ns3/point-to-point-grid.h"
+#include "ns3/ipv4-global-routing-helper.h"
+#include "ns3/animation-interface.h"
+// #include "ns3/ccnx-l3-protocol.h"
+
+#include <iostream>
+#include <sstream>
+#include "ns3/annotated-topology-reader.h"
+#include "../utils/spring-mobility-helper.h"
+
+#include "ns3/config-store.h"
+
+using namespace ns3;
+using namespace std;
+
+NS_LOG_COMPONENT_DEFINE ("CcnxLinkFailureAbilene");
+
+
+int
+main (int argc, char *argv[])
+{
+ // Packet::EnableChecking();
+ // Packet::EnablePrinting();
+ string input ("./src/NDNabstraction/examples/abilene-topology.txt");
+
+ Time finishTime = Seconds (20.0);
+ string animationFile;
+ string strategy = "ns3::CcnxFloodingStrategy";
+ CommandLine cmd;
+ cmd.AddValue ("finish", "Finish time", finishTime);
+ cmd.AddValue ("netanim", "NetAnim filename", animationFile);
+ cmd.AddValue ("strategy", "CCNx forwarding strategy", strategy);
+ cmd.Parse (argc, argv);
+
+ ConfigStore config;
+ config.ConfigureDefaults ();
+
+ // ------------------------------------------------------------
+ // -- Read topology data.
+ // --------------------------------------------
+
+ AnnotatedTopologyReader reader ("/abilene");
+ reader.SetMobilityModel ("ns3::SpringMobilityModel");
+ reader.SetFileName (input);
+
+ NodeContainer nodes = reader.Read ();
+
+ if (reader.LinksSize () == 0)
+ {
+ NS_LOG_ERROR ("Problems reading the topology file. Failing.");
+ return -1;
+ }
+
+ SpringMobilityHelper::InstallSprings (reader.LinksBegin (), reader.LinksEnd ());
+
+ // InternetStackHelper stack;
+ Ipv4GlobalRoutingHelper ipv4RoutingHelper ("ns3::Ipv4GlobalRoutingOrderedNexthops");
+ stack.SetRoutingHelper (ipv4RoutingHelper);
+ stack.Install (nodes);
+
+ // reader.AssignIpv4Addresses (Ipv4Address ("10.0.0.0"));
+
+ NS_LOG_INFO("Nodes = " << nodes.GetN());
+ NS_LOG_INFO("Links = " << reader.LinksSize ());
+
+ // Install CCNx stack
+ NS_LOG_INFO ("Installing CCNx stack");
+ CcnxStackHelper ccnxHelper;
+ ccnxHelper.SetForwardingStrategy (strategy);
+ ccnxHelper.EnableLimits (false, Seconds(0.1));
+ ccnxHelper.SetDefaultRoutes (true);
+ ccnxHelper.InstallAll ();
+
+ NS_LOG_INFO ("Installing Applications");
+ CcnxConsumerHelper consumerHelper ("/5");
+ ApplicationContainer consumers = consumerHelper.Install (Names::Find<Node> ("/abilene", "ATLAng"));
+
+ // CcnxProducerHelper producerHelper ("/5",1024);
+ // ApplicationContainer producers = producerHelper.Install (Names::Find<Node> ("/abilene", "IPLSng"));
+
+ // // Populate FIB based on IPv4 global routing controller
+ // ccnxHelper.InstallFakeGlobalRoutes ();
+ // ccnxHelper.InstallRouteTo (Names::Find<Node> ("/abilene", "IPLSng"));
+
+ // Simulator::Schedule (Seconds (1.0), PrintFIBs);
+ // PrintFIBs ();
+
+ // Simulator::Schedule (Seconds (10.0), PrintTime);
+
+ Simulator::Stop (finishTime);
+
+ AnimationInterface *anim = 0;
+ if (animationFile != "")
+ {
+ anim = new AnimationInterface (animationFile);
+ anim->SetMobilityPollInterval (Seconds (1));
+ }
+
+ // NS_LOG_INFO ("Configure Tracing.");
+ /*AggregateTrace trace;
+ Config::Connect ("/NodeList/*/ApplicationList/*/$ns3::CcnxConsumer/TransmittedInterests",
+ MakeCallback (&AggregateTrace::TransmittedInterests, &trace));
+
+ Config::Connect ("/NodeList/*/ApplicationList/*/$ns3::CcnxConsumer/ReceivedNacks",
+ MakeCallback (&AggregateTrace::ReceivedNacks, &trace));
+
+ Config::Connect ("/NodeList/*/ApplicationList/*/$ns3::CcnxProducer/ReceivedInterests",
+ MakeCallback (&AggregateTrace::ReceivedInterests, &trace));
+
+ Config::Connect ("/NodeList/*/ApplicationList/*/$ns3::CcnxProducer/TransmittedContentObjects",
+ MakeCallback (&AggregateTrace::TransmittedData, &trace));
+
+ Config::Connect ("/NodeList/*/ApplicationList/*/$ns3::CcnxConsumer/ReceivedContentObjects",
+ MakeCallback (&AggregateTrace::ReceivedData, &trace));
+ */
+ // Config::Connect("/NodeList/*/ns3::CcnxL3Protocol/TransmittedInterestTrace",
+ // MakeCallback (&OnTransmittedInterest));
+ // Config::Connect ("/NodeList/*/ns3::CcnxL3Protocol/ReceivedInterestTrace",
+ // MakeCallback (&OnReceivedInterest));
+ // Config::Connect ("/NodeList/*/ns3::CcnxL3Protocol/DroppedInterestTrace",
+ // MakeCallback (&OnDroppedInterest));
+
+ // Config::Connect ("/NodeList/*/ns3::CcnxL3Protocol/ReceivedDataTrace",
+ // MakeCallback (&OnReceivedData));
+ // Config::Connect ("/NodeList/*/ns3::CcnxL3Protocol/TransmittedDataTrace",
+ // MakeCallback (&OnTransmittedData));
+ // Config::Connect ("/NodeList/*/ns3::CcnxL3Protocol/DroppedDataTrace",
+ // MakeCallback (&OnDroppedData));
+
+ config.ConfigureAttributes ();
+
+ NS_LOG_INFO ("Run Simulation.");
+ Simulator::Run ();
+ Simulator::Destroy ();
+ NS_LOG_INFO ("Done.");
+
+ // NS_LOG_INFO("Total received interests = " << receivedInterests);
+ // NS_LOG_INFO("Total transmitted interests = " << transmittedInterests);
+ // NS_LOG_INFO("Total dropped interests = " << droppedInterests);
+ // NS_LOG_INFO("Total received data = " << receivedData);
+ // NS_LOG_INFO("Total transmitted data = " << transmittedData);
+ // NS_LOG_INFO("Total dropped data = " << droppedData);
+ NS_LOG_INFO (trace);
+ return 0;
+}
diff --git a/examples/link-failure-sprint.cc b/examples/link-failure-sprint.cc
new file mode 100644
index 0000000..dfbbf04
--- /dev/null
+++ b/examples/link-failure-sprint.cc
@@ -0,0 +1,252 @@
+/* -*- Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2011 University of California, Los Angeles
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: Ilya Moiseenko <iliamo@cs.ucla.edu>
+ */
+
+
+#include "ns3/core-module.h"
+#include "ns3/network-module.h"
+#include "ns3/point-to-point-module.h"
+#include "ns3/NDNabstraction-module.h"
+#include "ns3/point-to-point-grid.h"
+#include "ns3/ipv4-global-routing-helper.h"
+#include "ns3/random-variable.h"
+
+#include <iostream>
+#include <sstream>
+#include <map>
+#include <list>
+#include <set>
+#include "ns3/rocketfuel-topology-reader.h"
+
+#include <boost/lexical_cast.hpp>
+#include <boost/foreach.hpp>
+
+using namespace ns3;
+using namespace std;
+using namespace boost;
+
+NS_LOG_COMPONENT_DEFINE ("LinkFailureSprint");
+
+void PrintTime ()
+{
+ cout << "Progress: " << Simulator::Now ().ToDouble (Time::S) << "s" << endl;
+
+ Simulator::Schedule (Seconds (1.0), PrintTime);
+}
+
+
+class Experiment
+{
+public:
+ void
+ ConfigureTopology ()
+ {
+ string weights ("./src/NDNabstraction/examples/sprint-pops.weights");
+ string latencies ("./src/NDNabstraction/examples/sprint-pops.latencies");
+ string positions ("./src/NDNabstraction/examples/sprint-pops.positions");
+ string strategy ("ns3::CcnxBestRouteStrategy");
+ // string strategy ("ns3::CcnxFloodingStrategy");
+
+ RocketfuelWeightsReader reader ("/sprint");
+ m_reader = reader;
+
+ reader.SetFileName (positions);
+ reader.SetFileType (RocketfuelWeightsReader::POSITIONS);
+ reader.Read ();
+
+ reader.SetFileName (weights);
+ reader.SetFileType (RocketfuelWeightsReader::WEIGHTS);
+ reader.Read ();
+
+ reader.SetFileName (latencies);
+ reader.SetFileType (RocketfuelWeightsReader::LATENCIES);
+ reader.Read ();
+
+ reader.Commit ();
+ NS_ASSERT_MSG (reader.LinksSize () != 0, "Problems reading the topology file. Failing.");
+
+ NS_LOG_INFO("Nodes = " << reader.GetNodes ().GetN());
+ NS_LOG_INFO("Links = " << reader.LinksSize ());
+
+ // ------------------------------------------------------------
+ // -- Read topology data.
+ // --------------------------------------------
+
+ InternetStackHelper stack;
+ Ipv4GlobalRoutingHelper ipv4RoutingHelper ("ns3::Ipv4GlobalRoutingOrderedNexthops");
+ stack.SetRoutingHelper (ipv4RoutingHelper);
+ stack.Install (reader.GetNodes ());
+
+ reader.AssignIpv4Addresses (Ipv4Address ("10.0.0.0"));
+
+ // Install CCNx stack
+ NS_LOG_INFO ("Installing CCNx stack");
+ CcnxStackHelper ccnxHelper;
+ ccnxHelper.SetForwardingStrategy (strategy);
+ ccnxHelper.EnableLimits (true, Seconds(0.1));
+ ccnxHelper.SetDefaultRoutes (false);
+ ccnxHelper.InstallAll ();
+
+ // // Populate FIB based on IPv4 global routing controller
+ ccnxHelper.InstallFakeGlobalRoutes ();
+ ccnxHelper.InstallRoutesToAll ();
+
+ m_rand = UniformVariable (0, reader.GetNodes ().GetN());
+ }
+
+public:
+ void
+ Run (const Time &finishTime)
+ {
+ cout << "Run Simulation.\n";
+ Simulator::Stop (finishTime);
+ Simulator::Schedule (Seconds (1.0), PrintTime);
+ Simulator::Run ();
+ Simulator::Destroy ();
+ cout << "Done.\n";
+ }
+
+ //We are creating "everybody-to-everybody" usage pattern
+ ApplicationContainer
+ AddApplications()
+ {
+ ApplicationContainer apps;
+ for(int i =0; i<reader.GetNodes().GetN(); i++;)
+ {
+ Ptr<Node> node1 = Names::Find<Node> ("/sprint", lexical_cast<string> (node1_num));
+ CcnxAppHelper producerHelper ("ns3::CcnxProducer");
+ producerHelper.SetPrefix ("/" + lexical_cast<string> (i));
+
+ apps.Add(producerHelper.Install (node1));
+
+ for(int j = 0; j<reader.GetNodes().GetN();j++)
+ {
+ if(i==j)
+ continue;
+
+ Ptr<Node> node2 = Names::Find<Node> ("/sprint", lexical_cast<string> (node2_num));
+
+ CcnxAppHelper consumerHelper ("ns3::CcnxConsumer");
+ consumerHelper.SetPrefix ("/" + lexical_cast<string> (i));
+ consumerHelper.SetAttribute ("MeanRate", StringValue ("2Mbps"));
+ consumerHelper.SetAttribute ("Size", StringValue ("2"));
+
+ apps.Add(consumerHelper.Install (node2));
+ }
+ }
+ return apps;
+ }
+
+ ApplicationContainer
+ AddRandomApplications (uint16_t numStreams)
+ {
+ map<uint32_t, set<uint32_t> > streams;
+ ApplicationContainer apps;
+
+ uint16_t createdStreams = 0;
+ uint16_t guard = 0;
+ while (createdStreams < numStreams && guard < (numeric_limits<uint16_t>::max ()-1))
+ {
+ guard ++;
+
+ uint32_t node1_num = m_rand.GetValue ();
+ uint32_t node2_num = m_rand.GetValue ();
+
+ if (node1_num == node2_num)
+ continue;
+
+ if (streams[node1_num].count (node2_num) > 0) // don't create duplicate streams
+ continue;
+
+ streams[node1_num].insert (node2_num);
+
+ Ptr<Node> node1 = Names::Find<Node> ("/sprint", lexical_cast<string> (node1_num));
+ Ptr<Node> node2 = Names::Find<Node> ("/sprint", lexical_cast<string> (node2_num));
+
+ CcnxAppHelper consumerHelper ("ns3::CcnxConsumer");
+ consumerHelper.SetPrefix ("/" + lexical_cast<string> (node2->GetId ()));
+ consumerHelper.SetAttribute ("MeanRate", StringValue ("2Mbps"));
+ consumerHelper.SetAttribute ("Size", StringValue ("2"));
+
+ CcnxAppHelper producerHelper ("ns3::CcnxProducer");
+ producerHelper.SetPrefix ("/" + lexical_cast<string> (node2->GetId ()));
+
+ apps.Add
+ (consumerHelper.Install (node1));
+
+ apps.Add
+ (producerHelper.Install (node2));
+
+ createdStreams ++;
+ }
+
+ return apps;
+ }
+
+
+ UniformVariable m_rand;
+
+private:
+ RocketfuelWeightsReader m_reader;
+};
+
+int
+main (int argc, char *argv[])
+{
+ cout << "Begin congestion-pop scenario\n";
+
+ Config::SetDefault ("ns3::PointToPointNetDevice::DataRate", StringValue ("1Mbps"));
+ Config::SetDefault ("ns3::DropTailQueue::MaxPackets", StringValue ("20"));
+
+ Time finishTime = Seconds (20.0);
+
+ CommandLine cmd;
+ cmd.AddValue ("finish", "Finish time", finishTime);
+ cmd.Parse (argc, argv);
+
+ Experiment experiment;
+
+ for (uint32_t i = 0; i < 100; i++)
+ {
+
+ experiment.ConfigureTopology ();
+ ApplicationContainer apps = experiment.AddApplications ();
+
+ for (uint32_t i = 0; i < apps.GetN () / 2; i++)
+ {
+ cout << "From " << apps.Get (i*2)->GetNode ()->GetId ()
+ << " to " << apps.Get (i*2 + 1)->GetNode ()->GetId ();
+ cout << "\n";
+ }
+
+ CcnxTraceHelper traceHelper;
+ // traceHelper.EnableAggregateAppAll ("ns3::CcnxConsumer");
+ // traceHelper.EnableAggregateAppAll ("ns3::CcnxProducer");
+ // traceHelper.EnableAggregateL3All ();
+ // traceHelper.SetL3TraceFile ("trace-l3.log");
+ // traceHelper.SetAppTraceFile ("trace-app.log");
+ // traceHelper.EnableRateL3All ("rate-trace.log");
+ traceHelper.EnableSeqsAppAll ("ns3::CcnxConsumer", "consumers-seqs.log");
+
+ experiment.Run (finishTime);
+ }
+
+ cout << "Finish congestion-pop scenario\n";
+ return 0;
+}
diff --git a/wscript b/wscript
index fcfd524..5b6c0d4 100644
--- a/wscript
+++ b/wscript
@@ -117,4 +117,19 @@
obj = bld.create_ns3_program('congestion-tcp-pop', ['NDNabstraction'])
obj.source = 'examples/congestion-tcp-pop.cc'
+ #obj = bld.create_ns3_program('congestion-pop', ['NDNabstraction'])
+ #obj.source = 'examples/congestion-pop.cc'
+
+ obj = bld.create_ns3_program('link-failure-sprint', ['NDNabstraction'])
+ obj.source = 'examples/link-failure-sprint.cc'
+
+ #obj = bld.create_ns3_program('link-failure-abilene', ['NDNabstraction'])
+ #obj.source = 'examples/link-failure-abilene.cc'
+
+ #obj = bld.create_ns3_program('blackhole-sprint', ['NDNabstraction'])
+ #obj.source = 'examples/blackhole-sprint.cc'
+
+ #obj = bld.create_ns3_program('blackhole-abilene', ['NDNabstraction'])
+ #obj.source = 'examples/blackhole-abilene.cc'
+
bld.ns3_python_bindings()