commit 3ba44e5872327849ac2aab92e12e5945ed93dac0
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Nov 10 16:38:10 2011 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Nov 10 16:38:10 2011 -0800
tree 135df0b786087b760c0591827b1d0f842de1abf3
parent 3875a4b1559eaf8995954bcc68def2e6db1d8190

Implementation of Ipv4GlobalRoutingUnroderedNexthops to manage multiple
independent sets of routing tables (e.g., for Path Splicing)

examples/ccnx-grid.cc

diff --git a/examples/ccnx-grid.cc b/examples/ccnx-grid.cc
index d9fbe76..0427ae2 100644
--- a/examples/ccnx-grid.cc
+++ b/examples/ccnx-grid.cc
@@ -28,7 +28,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "ns3/visualizer-module.h"
+// #include "ns3/visualizer-module.h"
 #include "ns3/ccnx.h"
 
 using namespace ns3;
@@ -38,8 +38,8 @@
 int 
 main (int argc, char *argv[])
 {
-    GlobalValue::Bind ("SimulatorImplementationType", StringValue
-                       ("ns3::VisualSimulatorImpl"));
+    // GlobalValue::Bind ("SimulatorImplementationType", StringValue
+    //                    ("ns3::VisualSimulatorImpl"));
     
     uint32_t n = 3;
     
@@ -151,4 +151,4 @@
     
     return 0;
 
-}
\ No newline at end of file
+}

examples/ccnx-routing-simple.cc

diff --git a/examples/ccnx-routing-simple.cc b/examples/ccnx-routing-simple.cc
index 1172376..e277cfe 100644
--- a/examples/ccnx-routing-simple.cc
+++ b/examples/ccnx-routing-simple.cc
@@ -55,7 +55,8 @@
   PointToPointHelper p2p;
   InternetStackHelper stack;
 
-  Ipv4GlobalRoutingHelper ipv4RoutingHelper ("ns3::Ipv4GlobalRoutingOrderedNexthops");
+  // Ipv4GlobalRoutingHelper ipv4RoutingHelper ("ns3::Ipv4GlobalRoutingOrderedNexthops");
+  Ipv4GlobalRoutingHelper ipv4RoutingHelper ("ns3::Ipv4GlobalRoutingUnorderedNexthops");
   stack.SetRoutingHelper (ipv4RoutingHelper);
 
   PointToPointGridHelper grid (nNodes, nNodes, p2p);
@@ -75,8 +76,9 @@
   // // Create router nodes, initialize routing database and set up the routing
   // // tables in the nodes.
   // Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
-  Ipv4GlobalRoutingHelper::PopulateAllPossibleRoutingTables ();
-
+  // Ipv4GlobalRoutingHelper::PopulateAllPossibleRoutingTables ();
+  Ipv4GlobalRoutingHelper::PopulateRandomRoutingTables (5);
+  
   // testing ip routing
   UdpEchoClientHelper client (Ipv4Address ("10.2.1.1"), 1029);
   client.SetAttribute ("MaxPackets", UintegerValue (1));