--- a/src/internet-node/udp-socket.cc	Mon Jul 30 13:59:13 2007 +0200
+++ b/src/internet-node/udp-socket.cc	Mon Jul 30 14:07:39 2007 +0200
@@ -95,7 +95,7 @@
     {
       return ERROR_INVAL;
     }
-  InetSocketAddress transport = InetSocketAddress::ConvertFrom (address);
+  InetSocketAddress transport = address;
   Ipv4Address ipv4 = transport.GetIpv4 ();
   uint16_t port = transport.GetPort ();
   if (ipv4 == Ipv4Address::GetAny () && port == 0)
@@ -151,7 +151,7 @@
                      ns3::Callback<void, Ptr<Socket> > connectionFailed,
                      ns3::Callback<void, Ptr<Socket> > halfClose)
 {
-  InetSocketAddress transport = InetSocketAddress::ConvertFrom (address);
+  InetSocketAddress transport = address;
   m_defaultAddress = transport.GetIpv4 ();
   m_defaultPort = transport.GetPort ();
   if (!connectionSucceeded.IsNull ())
@@ -194,7 +194,7 @@
 UdpSocket::DoSendPacketTo (const Packet &p, const Address &address,
                            ns3::Callback<void, Ptr<Socket>, uint32_t> dataSent)
 {
-  InetSocketAddress transport = InetSocketAddress::ConvertFrom (address);
+  InetSocketAddress transport = address;
   Ipv4Address ipv4 = transport.GetIpv4 ();
   uint16_t port = transport.GetPort ();
   return DoSendPacketTo (p, ipv4, port, dataSent);
@@ -245,7 +245,7 @@
     {
       p = Packet (buffer, size);
     }
-  InetSocketAddress transport = InetSocketAddress::ConvertFrom (address);
+  InetSocketAddress transport = address;
   Ipv4Address ipv4 = transport.GetIpv4 ();
   uint16_t port = transport.GetPort ();
   return DoSendPacketTo (p, ipv4, port, dataSent);
@@ -269,7 +269,7 @@
       return;
     }
   
-  Address address = InetSocketAddress (ipv4, port).ConvertTo ();
+  Address address = InetSocketAddress (ipv4, port);
   Packet p = packet;
   if (!m_dummyRxCallback.IsNull ())
     {