diff --git a/examples/csma-cd-one-subnet.cc b/examples/csma-cd-one-subnet.cc index f93337823..ceaf88810 100644 --- a/examples/csma-cd-one-subnet.cc +++ b/examples/csma-cd-one-subnet.cc @@ -52,7 +52,7 @@ #include "ns3/csma-cd-ipv4-topology.h" #include "ns3/eui48-address.h" #include "ns3/ipv4-address.h" -#include "ns3/inet-address.h" +#include "ns3/inet-socket-address.h" #include "ns3/ipv4.h" #include "ns3/socket.h" #include "ns3/ipv4-route.h" @@ -132,7 +132,7 @@ int main (int argc, char *argv[]) // from n0 to n1 Ptr ooff = Create ( n0, - InetAddress (Ipv4Address("10.1.1.2"), 80).ConvertTo (), + InetSocketAddress (Ipv4Address("10.1.1.2"), 80).ConvertTo (), "Udp", ConstantVariable(1), ConstantVariable(0)); @@ -143,7 +143,7 @@ int main (int argc, char *argv[]) // Create a similar flow from n3 to n0, starting at time 1.1 seconds ooff = Create ( n3, - InetAddress (Ipv4Address("10.1.1.1"), 80).ConvertTo (), + InetSocketAddress (Ipv4Address("10.1.1.1"), 80).ConvertTo (), "Udp", ConstantVariable(1), ConstantVariable(0)); diff --git a/examples/simple-p2p.cc b/examples/simple-p2p.cc index 5d1bb545e..d06ef329f 100644 --- a/examples/simple-p2p.cc +++ b/examples/simple-p2p.cc @@ -57,7 +57,7 @@ #include "ns3/p2p-channel.h" #include "ns3/p2p-net-device.h" #include "ns3/ipv4-address.h" -#include "ns3/inet-address.h" +#include "ns3/inet-socket-address.h" #include "ns3/ipv4.h" #include "ns3/socket.h" #include "ns3/ipv4-route.h" @@ -143,7 +143,7 @@ int main (int argc, char *argv[]) // 210 bytes at a rate of 448 Kb/s Ptr ooff = Create ( n0, - InetAddress("10.1.3.2", 80).ConvertTo (), + InetSocketAddress("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 ( n3, - InetAddress("10.1.2.1", 80).ConvertTo (), + InetSocketAddress("10.1.2.1", 80).ConvertTo (), "Udp", ConstantVariable(1), ConstantVariable(0)); diff --git a/examples/simple-point-to-point.cc b/examples/simple-point-to-point.cc index 2398cc22b..806c4d120 100644 --- a/examples/simple-point-to-point.cc +++ b/examples/simple-point-to-point.cc @@ -58,7 +58,7 @@ #include "ns3/point-to-point-channel.h" #include "ns3/point-to-point-net-device.h" #include "ns3/ipv4-address.h" -#include "ns3/inet-address.h" +#include "ns3/inet-socket-address.h" #include "ns3/ipv4.h" #include "ns3/socket.h" #include "ns3/ipv4-route.h" @@ -144,7 +144,7 @@ int main (int argc, char *argv[]) // 210 bytes at a rate of 448 Kb/s Ptr ooff = Create ( n0, - InetAddress (Ipv4Address("10.1.3.2"), 80).ConvertTo (), + InetSocketAddress (Ipv4Address("10.1.3.2"), 80).ConvertTo (), "Udp", ConstantVariable(1), ConstantVariable(0)); @@ -155,7 +155,7 @@ int main (int argc, char *argv[]) // Create a similar flow from n3 to n1, starting at time 1.1 seconds ooff = Create ( n3, - InetAddress (Ipv4Address("10.1.2.1"), 80).ConvertTo (), + InetSocketAddress (Ipv4Address("10.1.2.1"), 80).ConvertTo (), "Udp", ConstantVariable(1), ConstantVariable(0)); diff --git a/samples/main-simple.cc b/samples/main-simple.cc index 4c709b4c5..e3567e0b1 100644 --- a/samples/main-simple.cc +++ b/samples/main-simple.cc @@ -4,7 +4,7 @@ #include "ns3/simulator.h" #include "ns3/socket-factory.h" #include "ns3/socket.h" -#include "ns3/inet-address.h" +#include "ns3/inet-socket-address.h" #include "ns3/nstime.h" using namespace ns3; @@ -45,11 +45,11 @@ RunSimulation (void) Ptr socketFactory = a->QueryInterface (iid); Ptr sink = socketFactory->CreateSocket (); - InetAddress local = InetAddress (Ipv4Address::GetAny (), 80); + InetSocketAddress local = InetSocketAddress (Ipv4Address::GetAny (), 80); sink->Bind (local.ConvertTo ()); Ptr source = socketFactory->CreateSocket (); - InetAddress remote = InetAddress (Ipv4Address::GetLoopback (), 80); + InetSocketAddress remote = InetSocketAddress (Ipv4Address::GetLoopback (), 80); source->Connect (remote.ConvertTo ()); GenerateTraffic (source, 500); diff --git a/src/internet-node/udp-socket.cc b/src/internet-node/udp-socket.cc index 9ae438f6b..020076cb5 100644 --- a/src/internet-node/udp-socket.cc +++ b/src/internet-node/udp-socket.cc @@ -19,7 +19,7 @@ * Author: Mathieu Lacage */ #include "ns3/node.h" -#include "ns3/inet-address.h" +#include "ns3/inet-socket-address.h" #include "udp-socket.h" #include "udp-l4-protocol.h" #include "ipv4-end-point.h" @@ -91,7 +91,7 @@ UdpSocket::Bind (void) int UdpSocket::Bind (const Address &address) { - InetAddress transport = InetAddress::ConvertFrom (address); + InetSocketAddress transport = InetSocketAddress::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 > connectionFailed, ns3::Callback > halfClose) { - InetAddress transport = InetAddress::ConvertFrom (address); + InetSocketAddress transport = InetSocketAddress::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, uint32_t> dataSent) { - InetAddress transport = InetAddress::ConvertFrom (address); + InetSocketAddress transport = InetSocketAddress::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); } - InetAddress transport = InetAddress::ConvertFrom (address); + InetSocketAddress transport = InetSocketAddress::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 = InetAddress (ipv4, port).ConvertTo (); + Address address = InetSocketAddress (ipv4, port).ConvertTo (); Packet p = packet; if (!m_dummyRxCallback.IsNull ()) { diff --git a/src/node/inet-address.cc b/src/node/inet-socket-address.cc similarity index 54% rename from src/node/inet-address.cc rename to src/node/inet-socket-address.cc index bf82cfc83..b8d0e10cf 100644 --- a/src/node/inet-address.cc +++ b/src/node/inet-socket-address.cc @@ -1,52 +1,52 @@ -#include "inet-address.h" +#include "inet-socket-address.h" #include "ns3/assert.h" namespace ns3 { -InetAddress::InetAddress (Ipv4Address ipv4, uint16_t port) +InetSocketAddress::InetSocketAddress (Ipv4Address ipv4, uint16_t port) : m_ipv4 (ipv4), m_port (port) {} -InetAddress::InetAddress (Ipv4Address ipv4) +InetSocketAddress::InetSocketAddress (Ipv4Address ipv4) : m_ipv4 (ipv4), m_port (0) {} -InetAddress::InetAddress (const char *ipv4, uint16_t port) +InetSocketAddress::InetSocketAddress (const char *ipv4, uint16_t port) : m_ipv4 (Ipv4Address (ipv4)), m_port (port) {} -InetAddress::InetAddress (const char * ipv4) +InetSocketAddress::InetSocketAddress (const char * ipv4) : m_ipv4 (Ipv4Address (ipv4)), m_port (0) {} -InetAddress::InetAddress (uint16_t port) +InetSocketAddress::InetSocketAddress (uint16_t port) : m_ipv4 (Ipv4Address::GetAny ()), m_port (port) {} uint16_t -InetAddress::GetPort (void) const +InetSocketAddress::GetPort (void) const { return m_port; } Ipv4Address -InetAddress::GetIpv4 (void) const +InetSocketAddress::GetIpv4 (void) const { return m_ipv4; } void -InetAddress::SetPort (uint16_t port) +InetSocketAddress::SetPort (uint16_t port) { m_port = port; } void -InetAddress::SetIpv4 (Ipv4Address address) +InetSocketAddress::SetIpv4 (Ipv4Address address) { m_ipv4 = address; } Address -InetAddress::ConvertTo (void) const +InetSocketAddress::ConvertTo (void) const { uint8_t buf[6]; m_ipv4.Serialize (buf); @@ -54,18 +54,18 @@ InetAddress::ConvertTo (void) const buf[5] = (m_port >> 8) & 0xff; return Address (GetType (), buf, 6); } -InetAddress -InetAddress::ConvertFrom (const Address &address) +InetSocketAddress +InetSocketAddress::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 InetAddress (ipv4, port); + return InetSocketAddress (ipv4, port); } uint8_t -InetAddress::GetType (void) +InetSocketAddress::GetType (void) { static uint8_t type = Address::Register (); return type; diff --git a/src/node/inet-address.h b/src/node/inet-socket-address.h similarity index 78% rename from src/node/inet-address.h rename to src/node/inet-socket-address.h index 577974325..35fe52863 100644 --- a/src/node/inet-address.h +++ b/src/node/inet-socket-address.h @@ -15,37 +15,37 @@ namespace ns3 { * API. i.e., this class holds an Ipv4Address and a port number * to form an ipv4 transport endpoint. */ -class InetAddress +class InetSocketAddress { public: /** * \param ipv4 the ipv4 address * \param port the port number */ - InetAddress (Ipv4Address ipv4, uint16_t port); + InetSocketAddress (Ipv4Address ipv4, uint16_t port); /** * \param ipv4 the ipv4 address * * The port number is set to zero by default. */ - InetAddress (Ipv4Address ipv4); + InetSocketAddress (Ipv4Address ipv4); /** * \param port the port number * * The ipv4 address is set to the "Any" address by default. */ - InetAddress (uint16_t port); + InetSocketAddress (uint16_t port); /** * \param ipv4 string which represents an ipv4 address * \param port the port number */ - InetAddress (const char *ipv4, uint16_t port); + InetSocketAddress (const char *ipv4, uint16_t port); /** * \param ipv4 string which represents an ipv4 address * * The port number is set to zero. */ - InetAddress (const char *ipv4); + InetSocketAddress (const char *ipv4); /** * \returns the port number */ @@ -66,15 +66,15 @@ public: /** * \returns an Address instance which represents this - * InetAddress instance. + * InetSocketAddress instance. */ Address ConvertTo (void) const; /** * \param address the Address instance to convert from. - * \returns an InetAddress which corresponds to the input + * \returns an InetSocketAddress which corresponds to the input * Address */ - static InetAddress ConvertFrom (const Address &address); + static InetSocketAddress ConvertFrom (const Address &address); private: static uint8_t GetType (void); Ipv4Address m_ipv4; diff --git a/src/node/wscript b/src/node/wscript index 47f5b09a2..9cc3d3daf 100644 --- a/src/node/wscript +++ b/src/node/wscript @@ -8,7 +8,7 @@ def build(bld): node.source = [ 'address.cc', 'eui48-address.cc', - 'inet-address.cc', + 'inet-socket-address.cc', 'node.cc', 'ipv4-address.cc', 'net-device.cc', @@ -32,7 +32,7 @@ def build(bld): headers.source = [ 'address.h', 'eui48-address.h', - 'inet-address.h', + 'inet-socket-address.h', 'node.h', 'ipv4-address.h', 'net-device.h',