commit a174aa57fc53609e7ecdfdc9e5a96d1c71f41b13
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Dec 13 01:30:32 2011 -0800
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Dec 13 01:30:32 2011 -0800
tree b4090077e0676bb802d98a4c1595349850a85e7f
parent 0782718103e0264ecebaf2b3369f738d14eb5998

Repair regression in CcnxFib.

Successful experiment with BestRouting strategy (commented out code in
the abilene-topology.cc example)

One more rescan of python bindings

examples/abilene-topology.cc

diff --git a/examples/abilene-topology.cc b/examples/abilene-topology.cc
index 394b0e2..75a4b99 100644
--- a/examples/abilene-topology.cc
+++ b/examples/abilene-topology.cc
@@ -81,7 +81,6 @@
     
   AnnotatedTopologyReader reader ("/abilene");
   reader.SetFileName (input);
-  reader.SetBoundingBox (100.0, 100.0, 5000.0, 5000.0);
     
   NodeContainer nodes = reader.Read ();
     
@@ -91,6 +90,13 @@
       return -1;
     }
 
+  // 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 ());
     
@@ -103,14 +109,18 @@
   ccnxHelper.InstallAll ();
     
   NS_LOG_INFO ("Installing Applications");
-  CcnxConsumerHelper consumerHelper ("tralala");
+  CcnxConsumerHelper consumerHelper ("/5");
   ApplicationContainer consumers = consumerHelper.Install (Names::Find<Node> ("/abilene", "ATLAng"));
     
-  CcnxProducerHelper producerHelper ("tralala",1024);
+  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 ();
+  // PrintFIBs ();
 
   Simulator::Schedule (Seconds (10.0), PrintTime);