1.1 --- a/examples/csma-broadcast.cc	Mon Apr 07 10:41:21 2008 -0700
     1.2 +++ b/examples/csma-broadcast.cc	Mon Apr 07 10:44:06 2008 -0700
     1.3 @@ -106,7 +106,7 @@
     1.4    
     1.5    // Create an optional packet sink to receive these packets
     1.6    PacketSinkHelper sink;
     1.7 -  sink.SetupUdp (Ipv4Address::GetAny (), port);
     1.8 +  sink.SetUdpLocal (Ipv4Address::GetAny (), port);
     1.9    sink.Install (c0.Get (1));
    1.10    sink.Install (c1.Get (1));
    1.11  

     2.1 --- a/examples/csma-multicast.cc	Mon Apr 07 10:41:21 2008 -0700
     2.2 +++ b/examples/csma-multicast.cc	Mon Apr 07 10:44:06 2008 -0700
     2.3 @@ -157,7 +157,7 @@
     2.4  
     2.5    // Create an optional packet sink to receive these packets
     2.6    PacketSinkHelper sink;
     2.7 -  sink.SetupUdp (Ipv4Address::GetAny(), multicastPort);
     2.8 +  sink.SetUdpLocal (Ipv4Address::GetAny(), multicastPort);
     2.9    ApplicationContainer sinkC = sink.Install (c1.Get (2)); // Node n4 
    2.10    // Start the sink
    2.11    sinkC.Start (Seconds (1.0));

     3.1 --- a/examples/csma-one-subnet.cc	Mon Apr 07 10:41:21 2008 -0700
     3.2 +++ b/examples/csma-one-subnet.cc	Mon Apr 07 10:44:06 2008 -0700
     3.3 @@ -106,7 +106,7 @@
     3.4  
     3.5    // Create an optional packet sink to receive these packets
     3.6    PacketSinkHelper sink;
     3.7 -  sink.SetupUdp (Ipv4Address::GetAny (), port);
     3.8 +  sink.SetUdpLocal (Ipv4Address::GetAny (), port);
     3.9    sink.Install (c.Get (1));
    3.10  
    3.11  // 

     4.1 --- a/examples/simple-alternate-routing.cc	Mon Apr 07 10:41:21 2008 -0700
     4.2 +++ b/examples/simple-alternate-routing.cc	Mon Apr 07 10:44:06 2008 -0700
     4.3 @@ -150,7 +150,7 @@
     4.4  
     4.5    // Create a packet sink to receive these packets
     4.6    PacketSinkHelper sink;
     4.7 -  sink.SetupUdp (Ipv4Address::GetAny (), port);
     4.8 +  sink.SetUdpLocal (Ipv4Address::GetAny (), port);
     4.9    apps = sink.Install (c.Get (1));
    4.10    apps.Start (Seconds (1.1));
    4.11    apps.Stop (Seconds (10.0));

     5.1 --- a/examples/simple-error-model.cc	Mon Apr 07 10:41:21 2008 -0700
     5.2 +++ b/examples/simple-error-model.cc	Mon Apr 07 10:44:06 2008 -0700
     5.3 @@ -130,7 +130,7 @@
     5.4  
     5.5    // Create an optional packet sink to receive these packets
     5.6    PacketSinkHelper sink;
     5.7 -  sink.SetupUdp (Ipv4Address::GetAny (), port);
     5.8 +  sink.SetUdpLocal (Ipv4Address::GetAny (), port);
     5.9    apps = sink.Install (c.Get (3));
    5.10    apps.Start (Seconds (1.0));
    5.11    apps.Stop (Seconds (10.0));
    5.12 @@ -142,7 +142,7 @@
    5.13    apps.Stop (Seconds(10.0));
    5.14  
    5.15    // Create a packet sink to receive these packets
    5.16 -  sink.SetupUdp (Ipv4Address::GetAny (), port);
    5.17 +  sink.SetUdpLocal (Ipv4Address::GetAny (), port);
    5.18    apps = sink.Install (c.Get (1));
    5.19    apps.Start (Seconds (1.1));
    5.20    apps.Stop (Seconds (10.0));

     6.1 --- a/examples/simple-global-routing.cc	Mon Apr 07 10:41:21 2008 -0700
     6.2 +++ b/examples/simple-global-routing.cc	Mon Apr 07 10:44:06 2008 -0700
     6.3 @@ -131,7 +131,7 @@
     6.4  
     6.5    // Create a packet sink to receive these packets
     6.6    PacketSinkHelper sink;
     6.7 -  sink.SetupUdp (Ipv4Address::GetAny (), port);
     6.8 +  sink.SetUdpLocal (Ipv4Address::GetAny (), port);
     6.9    apps = sink.Install (c.Get (3));
    6.10    apps.Start (Seconds (1.0));
    6.11    apps.Stop (Seconds (10.0));

     7.1 --- a/examples/simple-point-to-point-olsr.cc	Mon Apr 07 10:41:21 2008 -0700
     7.2 +++ b/examples/simple-point-to-point-olsr.cc	Mon Apr 07 10:44:06 2008 -0700
     7.3 @@ -135,7 +135,7 @@
     7.4  
     7.5    // Create a packet sink to receive these packets
     7.6    PacketSinkHelper sink;
     7.7 -  sink.SetupUdp (Ipv4Address::GetAny (), port);
     7.8 +  sink.SetUdpLocal (Ipv4Address::GetAny (), port);
     7.9    apps = sink.Install (c.Get (3));
    7.10    apps.Start (Seconds (1.0));
    7.11    apps.Stop (Seconds (10.0));

     8.1 --- a/examples/tcp-large-transfer.cc	Mon Apr 07 10:41:21 2008 -0700
     8.2 +++ b/examples/tcp-large-transfer.cc	Mon Apr 07 10:44:06 2008 -0700
     8.3 @@ -170,7 +170,7 @@
     8.4  
     8.5    // Create a packet sink to receive these packets
     8.6    PacketSinkHelper sink;
     8.7 -  sink.SetupTcp (Ipv4Address::GetAny (), servPort);
     8.8 +  sink.SetTcpLocal (Ipv4Address::GetAny (), servPort);
     8.9    ApplicationContainer apps = sink.Install (c1.Get (1));
    8.10    apps.Start (Seconds (0.0));
    8.11  

     9.1 --- a/src/helper/packet-sink-helper.cc	Mon Apr 07 10:41:21 2008 -0700
     9.2 +++ b/src/helper/packet-sink-helper.cc	Mon Apr 07 10:44:06 2008 -0700
     9.3 @@ -29,13 +29,13 @@
     9.4  }
     9.5  
     9.6  void 
     9.7 -PacketSinkHelper::SetupUdp (Ipv4Address ip, uint16_t port)
     9.8 +PacketSinkHelper::SetUdpLocal (Ipv4Address ip, uint16_t port)
     9.9  {
    9.10    m_factory.Set ("Protocol", String ("ns3::Udp"));
    9.11    m_factory.Set ("Local", Address (InetSocketAddress (ip, port)));
    9.12  }
    9.13  void 
    9.14 -PacketSinkHelper::SetupTcp (Ipv4Address ip, uint16_t port)
    9.15 +PacketSinkHelper::SetTcpLocal (Ipv4Address ip, uint16_t port)
    9.16  {
    9.17    m_factory.Set ("Protocol", String ("ns3::Tcp"));
    9.18    m_factory.Set ("Local", Address (InetSocketAddress (ip, port)));

    10.1 --- a/src/helper/packet-sink-helper.h	Mon Apr 07 10:41:21 2008 -0700
    10.2 +++ b/src/helper/packet-sink-helper.h	Mon Apr 07 10:44:06 2008 -0700
    10.3 @@ -32,8 +32,8 @@
    10.4  public:
    10.5    PacketSinkHelper ();
    10.6  
    10.7 -  void SetupUdp (Ipv4Address ip, uint16_t port);
    10.8 -  void SetupTcp (Ipv4Address ip, uint16_t port);
    10.9 +  void SetUdpLocal (Ipv4Address ip, uint16_t port);
   10.10 +  void SetTcpLocal (Ipv4Address ip, uint16_t port);
   10.11  
   10.12    ApplicationContainer Install (NodeContainer c);
   10.13  private: