From fbbd5dc9a68c3901fb1b8d57cef5d608f22fbaff Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Mon, 6 Aug 2007 10:06:25 +0200
Subject: [PATCH] use the InetSocketAddress API for ip sockets

---
 examples/simple-global-routing.cc | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/examples/simple-global-routing.cc b/examples/simple-global-routing.cc
index 2a005589a..4398cbb6a 100644
--- a/examples/simple-global-routing.cc
+++ b/examples/simple-global-routing.cc
@@ -58,10 +58,10 @@
 #include "ns3/internet-node.h"
 #include "ns3/point-to-point-channel.h"
 #include "ns3/point-to-point-net-device.h"
-#include "ns3/mac-address.h"
 #include "ns3/ipv4-address.h"
 #include "ns3/ipv4.h"
 #include "ns3/socket.h"
+#include "ns3/inet-socket-address.h"
 #include "ns3/ipv4-route.h"
 #include "ns3/point-to-point-topology.h"
 #include "ns3/onoff-application.h"
@@ -82,7 +82,7 @@ int main (int argc, char *argv[])
   DebugComponentEnable ("PointToPointChannel");
   DebugComponentEnable ("PointToPointNetDevice");
   DebugComponentEnable ("GlobalRouter");
-  DebugComponentEnable ("GlobalRouteManager");
+  DebugComponentEnable ("GlobalRouteMaager");
 #endif
 
   // Set up some default values for the simulation.  Use the Bind ()
@@ -143,8 +143,7 @@ int main (int argc, char *argv[])
   // 210 bytes at a rate of 448 Kb/s
   Ptr<OnOffApplication> ooff = Create<OnOffApplication> (
     n0, 
-    Ipv4Address ("10.1.3.2"), 
-    80, 
+    InetSocketAddress ("10.1.3.2", 80).ConvertTo (), 
     "Udp",
     ConstantVariable (1), 
     ConstantVariable (0));
@@ -155,8 +154,7 @@ int main (int argc, char *argv[])
   // Create a similar flow from n3 to n1, starting at time 1.1 seconds
   ooff = Create<OnOffApplication> (
     n3, 
-    Ipv4Address ("10.1.2.1"), 
-    80, 
+    InetSocketAddress ("10.1.2.1", 80).ConvertTo (),
     "Udp",
     ConstantVariable (1), 
     ConstantVariable (0));