Ipv4TransportAddress -> InetAddress

examples/simple-p2p.cc

@@ -143,7 +143,7 @@ int main (int argc, char *argv[])
   // 210 bytes at a rate of 448 Kb/s
   Ptr<OnOffApplication> ooff = Create<OnOffApplication> (
     n0, 
-    Ipv4TransportAddress(Ipv4Address ("10.1.3.2"), 80).ConvertTo (), 
+    InetAddress(Ipv4Address ("10.1.3.2"), 80).ConvertTo (), 
     "Udp",
     ConstantVariable(1), 
     ConstantVariable(0));
@@ -154,7 +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, 
-    Ipv4TransportAddress(Ipv4Address ("10.1.2.1"), 80).ConvertTo (),
+    InetAddress(Ipv4Address ("10.1.2.1"), 80).ConvertTo (),
     "Udp",
     ConstantVariable(1), 
     ConstantVariable(0));

samples/main-simple.cc

@@ -45,11 +45,11 @@ RunSimulation (void)
   Ptr<SocketFactory> socketFactory = a->QueryInterface<SocketFactory> (iid);
 
   Ptr<Socket> sink = socketFactory->CreateSocket ();
-  Ipv4TransportAddress local = Ipv4TransportAddress (Ipv4Address::GetAny (), 80);
+  InetAddress local = InetAddress (Ipv4Address::GetAny (), 80);
   sink->Bind (local.ConvertTo ());
 
   Ptr<Socket> source = socketFactory->CreateSocket ();
-  Ipv4TransportAddress remote = Ipv4TransportAddress (Ipv4Address::GetLoopback (), 80);
+  InetAddress remote = InetAddress (Ipv4Address::GetLoopback (), 80);
   source->Connect (remote.ConvertTo ());
 
   GenerateTraffic (source, 500);

src/internet-node/udp-socket.cc

@@ -91,7 +91,7 @@ UdpSocket::Bind (void)
 int 
 UdpSocket::Bind (const Address &address)
 {
-  Ipv4TransportAddress transport = Ipv4TransportAddress::ConvertFrom (address);
+  InetAddress transport = InetAddress::ConvertFrom (address);
   Ipv4Address ipv4 = transport.GetIpv4 ();
   uint16_t port = transport.GetPort ();
   if (ipv4 == Ipv4Address::GetAny () && port == 0)
@@ -147,7 +147,7 @@ UdpSocket::DoConnect(const Address & address,
                      ns3::Callback<void, Ptr<Socket> > connectionFailed,
                      ns3::Callback<void, Ptr<Socket> > halfClose)
 {
-  Ipv4TransportAddress transport = Ipv4TransportAddress::ConvertFrom (address);
+  InetAddress transport = InetAddress::ConvertFrom (address);
   m_defaultAddress = transport.GetIpv4 ();
   m_defaultPort = transport.GetPort ();
   if (!connectionSucceeded.IsNull ())
@@ -190,7 +190,7 @@ int
 UdpSocket::DoSendPacketTo (const Packet &p, const Address &address,
                            ns3::Callback<void, Ptr<Socket>, uint32_t> dataSent)
 {
-  Ipv4TransportAddress transport = Ipv4TransportAddress::ConvertFrom (address);
+  InetAddress transport = InetAddress::ConvertFrom (address);
   Ipv4Address ipv4 = transport.GetIpv4 ();
   uint16_t port = transport.GetPort ();
   return DoSendPacketTo (p, ipv4, port, dataSent);
@@ -241,7 +241,7 @@ UdpSocket::DoSendTo(const Address &address,
     {
       p = Packet (buffer, size);
     }
-  Ipv4TransportAddress transport = Ipv4TransportAddress::ConvertFrom (address);
+  InetAddress transport = InetAddress::ConvertFrom (address);
   Ipv4Address ipv4 = transport.GetIpv4 ();
   uint16_t port = transport.GetPort ();
   return DoSendPacketTo (p, ipv4, port, dataSent);
@@ -265,7 +265,7 @@ UdpSocket::ForwardUp (const Packet &packet, Ipv4Address ipv4, uint16_t port)
       return;
     }
   
-  Address address = Ipv4TransportAddress (ipv4, port).ConvertTo ();
+  Address address = InetAddress (ipv4, port).ConvertTo ();
   Packet p = packet;
   if (!m_dummyRxCallback.IsNull ())
     {

src/node/inet-address.cc

@@ -3,42 +3,42 @@
 
 namespace ns3 {
 
-Ipv4TransportAddress::Ipv4TransportAddress (Ipv4Address ipv4, uint16_t port)
+InetAddress::InetAddress (Ipv4Address ipv4, uint16_t port)
   : m_ipv4 (ipv4),
     m_port (port)
 {}
-Ipv4TransportAddress::Ipv4TransportAddress (Ipv4Address ipv4)
+InetAddress::InetAddress (Ipv4Address ipv4)
   : m_ipv4 (ipv4),
     m_port (0)
 {}
-Ipv4TransportAddress::Ipv4TransportAddress (uint16_t port)
+InetAddress::InetAddress (uint16_t port)
   : m_ipv4 (Ipv4Address::GetAny ()),
     m_port (port)
 {}
 uint16_t 
-Ipv4TransportAddress::GetPort (void) const
+InetAddress::GetPort (void) const
 {
   return m_port;
 }
 Ipv4Address 
-Ipv4TransportAddress::GetIpv4 (void) const
+InetAddress::GetIpv4 (void) const
 {
   return m_ipv4;
 }
 
 void 
-Ipv4TransportAddress::SetPort (uint16_t port)
+InetAddress::SetPort (uint16_t port)
 {
   m_port = port;
 }
 void 
-Ipv4TransportAddress::SetIpv4 (Ipv4Address address)
+InetAddress::SetIpv4 (Ipv4Address address)
 {
   m_ipv4 = address;
 }
 
 Address 
-Ipv4TransportAddress::ConvertTo (void) const
+InetAddress::ConvertTo (void) const
 {
   uint8_t buf[6];
   m_ipv4.Serialize (buf);
@@ -46,18 +46,18 @@ Ipv4TransportAddress::ConvertTo (void) const
   buf[5] = (m_port >> 8) & 0xff;
   return Address (GetType (), buf, 6);
 }
-Ipv4TransportAddress 
-Ipv4TransportAddress::ConvertFrom (const Address &address)
+InetAddress 
+InetAddress::ConvertFrom (const Address &address)
 {
   NS_ASSERT (address.CheckCompatible (GetType (), 6));
   uint8_t buf[6];
   address.CopyTo (buf);
   Ipv4Address ipv4 = Ipv4Address::Deserialize (buf);
   uint16_t port = buf[0] | (buf[1] << 8);
-  return Ipv4TransportAddress (ipv4, port);
+  return InetAddress (ipv4, port);
 }
 uint8_t 
-Ipv4TransportAddress::GetType (void)
+InetAddress::GetType (void)
 {
   static uint8_t type = Address::Register ();
   return type;

src/node/inet-address.h

@@ -7,12 +7,12 @@
 
 namespace ns3 {
 
-class Ipv4TransportAddress
+class InetAddress
 {
 public:
-  Ipv4TransportAddress (Ipv4Address ipv4, uint16_t port);
-  Ipv4TransportAddress (Ipv4Address ipv4);
-  Ipv4TransportAddress (uint16_t post);
+  InetAddress (Ipv4Address ipv4, uint16_t port);
+  InetAddress (Ipv4Address ipv4);
+  InetAddress (uint16_t post);
   uint16_t GetPort (void) const;
   Ipv4Address GetIpv4 (void) const;
 
@@ -20,7 +20,7 @@ public:
   void SetIpv4 (Ipv4Address address);
 
   Address ConvertTo (void) const;
-  static Ipv4TransportAddress ConvertFrom (const Address &address);
+  static InetAddress ConvertFrom (const Address &address);
 private:
   static uint8_t GetType (void);
   Ipv4Address m_ipv4;