commit beceb367b093c354d6da83f77b00a9bcd823d032
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Nov 02 16:54:12 2011 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Wed Nov 02 16:54:12 2011 -0700
tree 119589a3c019f7d686fd317441d01e00661fbf43
parent 4e473489c48c904d86e18bdb1ac1cc1a18d0d3e1

Update ccnx-routing-simple example

examples/ccnx-routing-simple.cc

diff --git a/examples/ccnx-routing-simple.cc b/examples/ccnx-routing-simple.cc
index 6416c1f..a5ee7a4 100644
--- a/examples/ccnx-routing-simple.cc
+++ b/examples/ccnx-routing-simple.cc
@@ -24,6 +24,7 @@
 #include "ns3/ipv4-global-routing-helper.h"
 #include "ns3/point-to-point-grid.h"
 #include "ns3/ipv4-global-routing-helper.h"
+#include "ns3/applications-module.h"
 
 using namespace ns3;
 
@@ -55,21 +56,28 @@
   InternetStackHelper stack;
 
   Ipv4GlobalRoutingHelper ipv4RoutingHelper;
-  // Ptr<Ipv4RoutingHelper> ipv4RoutingHelper = stack.GetRoutingHelper ();
   stack.SetRoutingHelper (ipv4RoutingHelper);
 
   PointToPointGridHelper grid (nNodes, nNodes, p2p);
   grid.InstallStack (stack);
-
-  // // Create router nodes, initialize routing database and set up the routing
-  // // tables in the nodes.
-  Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
   
   grid.AssignIpv4Addresses (
                             Ipv4AddressHelper("10.1.0.0", "255.255.255.0"),
                             Ipv4AddressHelper("10.2.0.0", "255.255.255.0")
                             );
 
+  // // Create router nodes, initialize routing database and set up the routing
+  // // tables in the nodes.
+  Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
+
+  // testing ip routing
+  UdpEchoClientHelper client (Ipv4Address ("10.2.1.1"), 1029);
+  client.SetAttribute ("MaxPackets", UintegerValue (1));
+  client.SetAttribute ("Interval", TimeValue (Seconds(1.0)));
+  client.SetAttribute ("PacketSize", UintegerValue (100));
+  client.Install (grid.GetNode (0,0));
+  // bla
+  
   // apps.Stop (Seconds(150.0));
 
   Simulator::ScheduleWithContext (grid.GetNode (0,0)->GetId (),
@@ -77,7 +85,8 @@
 
   // Trace routing tables 
   Ptr<OutputStreamWrapper> routingStream = Create<OutputStreamWrapper> ("routes.log", std::ios::out);
-  ipv4RoutingHelper.PrintRoutingTableAllEvery (Seconds (10), routingStream);
+  *routingStream->GetStream () << "Node (1,1)\n";
+  ipv4RoutingHelper.PrintRoutingTableAt (Seconds (20), grid.GetNode (1,1), routingStream);
 
   Simulator::Stop (Seconds(160.0));
   Simulator::Run ();