# HG changeset patch # User Mathieu Lacage # Date 1186387585 -7200 # Node ID d9caeae5943ca786f393217226de28551e6abcb7 # Parent ac0801202d42222608c536d880cdde8ba09aa90f use the InetSocketAddress API for ip sockets diff -r ac0801202d42 -r d9caeae5943c examples/simple-global-routing.cc --- a/examples/simple-global-routing.cc Mon Aug 06 09:59:29 2007 +0200 +++ b/examples/simple-global-routing.cc Mon Aug 06 10:06:25 2007 +0200 @@ -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 @@ 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 @@ // 210 bytes at a rate of 448 Kb/s Ptr ooff = Create ( n0, - Ipv4Address ("10.1.3.2"), - 80, + InetSocketAddress ("10.1.3.2", 80).ConvertTo (), "Udp", ConstantVariable (1), ConstantVariable (0)); @@ -155,8 +154,7 @@ // Create a similar flow from n3 to n1, starting at time 1.1 seconds ooff = Create ( n3, - Ipv4Address ("10.1.2.1"), - 80, + InetSocketAddress ("10.1.2.1", 80).ConvertTo (), "Udp", ConstantVariable (1), ConstantVariable (0));