diff --git a/examples/csma-broadcast.cc b/examples/csma-broadcast.cc index 9585bf06d..7928b3a82 100644 --- a/examples/csma-broadcast.cc +++ b/examples/csma-broadcast.cc @@ -93,7 +93,7 @@ main (int argc, char *argv[]) // Create the OnOff application to send UDP datagrams of size // 512 bytes (default) at a rate of 500 Kb/s (default) from n0 NS_LOG_INFO ("Create Applications."); - OnOffHelper onoff ("ns3::Udp", + OnOffHelper onoff ("ns3::UdpSocketFactory", Address (InetSocketAddress (Ipv4Address ("255.255.255.255"), port))); onoff.SetAttribute ("OnTime", RandomVariableValue (ConstantVariable (1))); onoff.SetAttribute ("OffTime", RandomVariableValue (ConstantVariable (0))); @@ -104,7 +104,7 @@ main (int argc, char *argv[]) app.Stop (Seconds (10.0)); // Create an optional packet sink to receive these packets - PacketSinkHelper sink ("ns3::Udp", + PacketSinkHelper sink ("ns3::UdpSocketFactory", Address (InetSocketAddress (Ipv4Address::GetAny (), port))); sink.Install (c0.Get (1)); sink.Install (c1.Get (1)); diff --git a/examples/csma-multicast.cc b/examples/csma-multicast.cc index 870494809..6a07a3c6b 100644 --- a/examples/csma-multicast.cc +++ b/examples/csma-multicast.cc @@ -140,7 +140,7 @@ main (int argc, char *argv[]) // Configure a multicast packet generator that generates a packet // every few seconds - OnOffHelper onoff ("ns3::Udp", + OnOffHelper onoff ("ns3::UdpSocketFactory", Address (InetSocketAddress (multicastGroup, multicastPort))); onoff.SetAttribute ("OnTime", RandomVariableValue (ConstantVariable (1))); onoff.SetAttribute ("OffTime", RandomVariableValue (ConstantVariable (0))); @@ -156,7 +156,7 @@ main (int argc, char *argv[]) srcC.Stop (Seconds(10.)); // Create an optional packet sink to receive these packets - PacketSinkHelper sink ("ns3::Udp", + PacketSinkHelper sink ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny(), multicastPort)); ApplicationContainer sinkC = sink.Install (c1.Get (2)); // Node n4 diff --git a/examples/csma-one-subnet.cc b/examples/csma-one-subnet.cc index d75df160c..f90a6ad43 100644 --- a/examples/csma-one-subnet.cc +++ b/examples/csma-one-subnet.cc @@ -95,7 +95,7 @@ main (int argc, char *argv[]) NS_LOG_INFO ("Create Applications."); uint16_t port = 9; // Discard port (RFC 863) - OnOffHelper onoff ("ns3::Udp", + OnOffHelper onoff ("ns3::UdpSocketFactory", Address (InetSocketAddress (Ipv4Address ("10.1.1.2"), port))); onoff.SetAttribute ("OnTime", RandomVariableValue (ConstantVariable (1))); onoff.SetAttribute ("OffTime", RandomVariableValue (ConstantVariable (0))); @@ -106,7 +106,7 @@ main (int argc, char *argv[]) app.Stop (Seconds (10.0)); // Create an optional packet sink to receive these packets - PacketSinkHelper sink ("ns3::Udp", + PacketSinkHelper sink ("ns3::UdpSocketFactory", Address (InetSocketAddress (Ipv4Address::GetAny (), port))); sink.Install (c.Get (1)); diff --git a/examples/mixed-global-routing.cc b/examples/mixed-global-routing.cc index 764c7e3a5..f003571bf 100644 --- a/examples/mixed-global-routing.cc +++ b/examples/mixed-global-routing.cc @@ -112,7 +112,7 @@ main (int argc, char *argv[]) // 210 bytes at a rate of 448 Kb/s NS_LOG_INFO ("Create Applications."); uint16_t port = 9; // Discard port (RFC 863) - OnOffHelper onoff ("ns3::Udp", + OnOffHelper onoff ("ns3::UdpSocketFactory", InetSocketAddress (i5i6.GetAddress (1), port)); onoff.SetAttribute ("OnTime", RandomVariableValue (ConstantVariable (1))); onoff.SetAttribute ("OffTime", RandomVariableValue (ConstantVariable (0))); diff --git a/examples/mixed-wireless.cc b/examples/mixed-wireless.cc index baf9a2836..2e74f18c0 100644 --- a/examples/mixed-wireless.cc +++ b/examples/mixed-wireless.cc @@ -305,7 +305,7 @@ main (int argc, char *argv[]) Ptr appSink = NodeList::GetNode (13); Ipv4Address remoteAddr = Ipv4Address ("172.16.0.5"); - OnOffHelper onoff ("ns3::Udp", + OnOffHelper onoff ("ns3::UdpSocketFactory", Address (InetSocketAddress (remoteAddr, port))); onoff.SetAttribute ("OnTime", RandomVariableValue (ConstantVariable (1))); onoff.SetAttribute ("OffTime", RandomVariableValue (ConstantVariable (0))); @@ -314,7 +314,7 @@ main (int argc, char *argv[]) apps.Stop (Seconds (20.0)); // Create a packet sink to receive these packets - PacketSinkHelper sink ("ns3::Udp", + PacketSinkHelper sink ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), port)); apps = sink.Install (appSink); apps.Start (Seconds (3.0)); diff --git a/examples/simple-alternate-routing.cc b/examples/simple-alternate-routing.cc index dd83323c8..0cdc687b0 100644 --- a/examples/simple-alternate-routing.cc +++ b/examples/simple-alternate-routing.cc @@ -141,7 +141,7 @@ main (int argc, char *argv[]) uint16_t port = 9; // Discard port (RFC 863) // Create a flow from n3 to n1, starting at time 1.1 seconds - OnOffHelper onoff ("ns3::Udp", + OnOffHelper onoff ("ns3::UdpSocketFactory", Address (InetSocketAddress (i1i2.GetAddress (0), port))); onoff.SetAttribute ("OnTime", RandomVariableValue (ConstantVariable (1))); onoff.SetAttribute ("OffTime", RandomVariableValue (ConstantVariable (0))); @@ -151,7 +151,7 @@ main (int argc, char *argv[]) apps.Start (Seconds (10.0)); // Create a packet sink to receive these packets - PacketSinkHelper sink ("ns3::Udp", + PacketSinkHelper sink ("ns3::UdpSocketFactory", Address (InetSocketAddress (Ipv4Address::GetAny (), port))); apps = sink.Install (c.Get (1)); apps.Start (Seconds (1.1)); diff --git a/examples/simple-error-model.cc b/examples/simple-error-model.cc index 617666d12..1c08f3f04 100644 --- a/examples/simple-error-model.cc +++ b/examples/simple-error-model.cc @@ -122,7 +122,7 @@ main (int argc, char *argv[]) NS_LOG_INFO ("Create Applications."); uint16_t port = 9; // Discard port (RFC 863) - OnOffHelper onoff ("ns3::Udp", + OnOffHelper onoff ("ns3::UdpSocketFactory", Address (InetSocketAddress (i3i2.GetAddress (1), port))); onoff.SetAttribute ("OnTime", RandomVariableValue (ConstantVariable(1))); onoff.SetAttribute ("OffTime", RandomVariableValue (ConstantVariable(0))); @@ -132,7 +132,7 @@ main (int argc, char *argv[]) apps.Stop (Seconds(10.0)); // Create an optional packet sink to receive these packets - PacketSinkHelper sink ("ns3::Udp", + PacketSinkHelper sink ("ns3::UdpSocketFactory", Address (InetSocketAddress (Ipv4Address::GetAny (), port))); apps = sink.Install (c.Get (3)); apps.Start (Seconds (1.0)); diff --git a/examples/simple-global-routing.cc b/examples/simple-global-routing.cc index aa33d090b..e6a7b4eef 100644 --- a/examples/simple-global-routing.cc +++ b/examples/simple-global-routing.cc @@ -122,7 +122,7 @@ main (int argc, char *argv[]) // 210 bytes at a rate of 448 Kb/s NS_LOG_INFO ("Create Applications."); uint16_t port = 9; // Discard port (RFC 863) - OnOffHelper onoff ("ns3::Udp", + OnOffHelper onoff ("ns3::UdpSocketFactory", Address (InetSocketAddress (i3i2.GetAddress (0), port))); onoff.SetAttribute ("OnTime", RandomVariableValue (ConstantVariable (1))); onoff.SetAttribute ("OffTime", RandomVariableValue (ConstantVariable (0))); @@ -131,7 +131,7 @@ main (int argc, char *argv[]) apps.Stop (Seconds (10.0)); // Create a packet sink to receive these packets - PacketSinkHelper sink ("ns3::Udp", + PacketSinkHelper sink ("ns3::UdpSocketFactory", Address (InetSocketAddress (Ipv4Address::GetAny (), port))); apps = sink.Install (c.Get (3)); apps.Start (Seconds (1.0)); diff --git a/examples/simple-point-to-point-olsr.cc b/examples/simple-point-to-point-olsr.cc index 8c78030a6..bd7b39487 100644 --- a/examples/simple-point-to-point-olsr.cc +++ b/examples/simple-point-to-point-olsr.cc @@ -127,7 +127,7 @@ main (int argc, char *argv[]) NS_LOG_INFO ("Create Applications."); uint16_t port = 9; // Discard port (RFC 863) - OnOffHelper onoff ("ns3::Udp", + OnOffHelper onoff ("ns3::UdpSocketFactory", InetSocketAddress (i34.GetAddress (1), port)); onoff.SetAttribute ("OnTime", RandomVariableValue (ConstantVariable (1))); onoff.SetAttribute ("OffTime", RandomVariableValue (ConstantVariable (0))); @@ -137,7 +137,7 @@ main (int argc, char *argv[]) apps.Stop (Seconds (10.0)); // Create a packet sink to receive these packets - PacketSinkHelper sink ("ns3::Udp", + PacketSinkHelper sink ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), port)); apps = sink.Install (c.Get (3)); diff --git a/samples/main-simple.cc b/samples/main-simple.cc index 719406f27..92c6e5c36 100644 --- a/samples/main-simple.cc +++ b/samples/main-simple.cc @@ -48,7 +48,7 @@ RunSimulation (void) internet.Install (c); - TypeId tid = TypeId::LookupByName ("ns3::Udp"); + TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory"); Ptr sink = Socket::CreateSocket (c.Get (0), tid); InetSocketAddress local = InetSocketAddress (Ipv4Address::GetAny (), 80); sink->Bind (local); diff --git a/src/applications/onoff/onoff-application.cc b/src/applications/onoff/onoff-application.cc index 271304715..c4f84277a 100644 --- a/src/applications/onoff/onoff-application.cc +++ b/src/applications/onoff/onoff-application.cc @@ -35,7 +35,7 @@ #include "ns3/uinteger.h" #include "ns3/trace-source-accessor.h" #include "onoff-application.h" -#include "ns3/udp.h" +#include "ns3/udp-socket-factory.h" NS_LOG_COMPONENT_DEFINE ("OnOffApplication"); @@ -79,7 +79,7 @@ OnOffApplication::GetTypeId (void) MakeUintegerAccessor (&OnOffApplication::m_maxBytes), MakeUintegerChecker ()) .AddAttribute ("Protocol", "The type of protocol to use.", - TypeIdValue (Udp::GetTypeId ()), + TypeIdValue (UdpSocketFactory::GetTypeId ()), MakeTypeIdAccessor (&OnOffApplication::m_tid), MakeTypeIdChecker ()) .AddTraceSource ("Tx", "A new packet is created and is sent", diff --git a/src/applications/packet-sink/packet-sink.cc b/src/applications/packet-sink/packet-sink.cc index d4478dc32..d71de1495 100644 --- a/src/applications/packet-sink/packet-sink.cc +++ b/src/applications/packet-sink/packet-sink.cc @@ -26,7 +26,7 @@ #include "ns3/socket-factory.h" #include "ns3/packet.h" #include "ns3/trace-source-accessor.h" -#include "ns3/udp.h" +#include "ns3/udp-socket-factory.h" #include "packet-sink.h" using namespace std; @@ -47,7 +47,7 @@ PacketSink::GetTypeId (void) MakeAddressAccessor (&PacketSink::m_local), MakeAddressChecker ()) .AddAttribute ("Protocol", "The type id of the protocol to use for the rx socket.", - TypeIdValue (Udp::GetTypeId ()), + TypeIdValue (UdpSocketFactory::GetTypeId ()), MakeTypeIdAccessor (&PacketSink::m_tid), MakeTypeIdChecker ()) .AddTraceSource ("Rx", "A packet has been received", diff --git a/src/applications/udp-echo/udp-echo-client.cc b/src/applications/udp-echo/udp-echo-client.cc index 3241b49c5..6276a5ec7 100644 --- a/src/applications/udp-echo/udp-echo-client.cc +++ b/src/applications/udp-echo/udp-echo-client.cc @@ -95,7 +95,7 @@ UdpEchoClient::StartApplication (void) if (!m_socket) { - TypeId tid = TypeId::LookupByName ("ns3::Udp"); + TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory"); m_socket = Socket::CreateSocket (GetNode(), tid); m_socket->Bind (); m_socket->Connect (InetSocketAddress (m_peerAddress, m_peerPort)); diff --git a/src/applications/udp-echo/udp-echo-server.cc b/src/applications/udp-echo/udp-echo-server.cc index ea305616c..51b7904bd 100644 --- a/src/applications/udp-echo/udp-echo-server.cc +++ b/src/applications/udp-echo/udp-echo-server.cc @@ -71,7 +71,7 @@ UdpEchoServer::StartApplication (void) if (!m_socket) { - TypeId tid = TypeId::LookupByName ("ns3::Udp"); + TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory"); m_socket = Socket::CreateSocket (GetNode(), tid); InetSocketAddress local = InetSocketAddress (Ipv4Address::GetAny (), m_port); m_socket->Bind (local); diff --git a/src/core/type-id.cc b/src/core/type-id.cc index 6234cb628..1c12a843d 100644 --- a/src/core/type-id.cc +++ b/src/core/type-id.cc @@ -386,7 +386,7 @@ TypeId TypeId::LookupByName (std::string name) { uint16_t uid = Singleton::Get ()->GetUid (name); - NS_ASSERT (uid != 0); + NS_ASSERT_MSG (uid != 0, "Assert in TypeId::LookupByName: " << name << " not found"); return TypeId (uid); } bool diff --git a/src/helper/packet-sink-helper.cc b/src/helper/packet-sink-helper.cc index 45f1d17a6..e7cc76f72 100644 --- a/src/helper/packet-sink-helper.cc +++ b/src/helper/packet-sink-helper.cc @@ -41,7 +41,7 @@ PacketSinkHelper::SetAttribute (std::string name, const AttributeValue &value) void PacketSinkHelper::SetUdpLocal (Ipv4Address ip, uint16_t port) { - m_factory.Set ("Protocol", String ("ns3::Udp")); + m_factory.Set ("Protocol", String ("ns3::UdpSocketFactory")); m_factory.Set ("Local", Address (InetSocketAddress (ip, port))); } void diff --git a/src/internet-node/udp-impl.cc b/src/internet-node/udp-impl.cc index 9de5259e5..86114bb4a 100644 --- a/src/internet-node/udp-impl.cc +++ b/src/internet-node/udp-impl.cc @@ -48,7 +48,7 @@ void UdpImpl::DoDispose (void) { m_udp = 0; - Udp::DoDispose (); + UdpSocketFactory::DoDispose (); } } // namespace ns3 diff --git a/src/internet-node/udp-impl.h b/src/internet-node/udp-impl.h index 114edfdbb..defbdbb02 100644 --- a/src/internet-node/udp-impl.h +++ b/src/internet-node/udp-impl.h @@ -20,7 +20,7 @@ #ifndef UDP_IMPL_H #define UDP_IMPL_H -#include "ns3/udp.h" +#include "ns3/udp-socket-factory.h" #include "ns3/ptr.h" namespace ns3 { @@ -36,7 +36,7 @@ class UdpL4Protocol; * also hold global variables used to initialize newly created sockets, * such as values that are set through the sysctl or proc interfaces in Linux. */ -class UdpImpl : public Udp +class UdpImpl : public UdpSocketFactory { public: UdpImpl (); diff --git a/src/internet-node/udp-socket.cc b/src/internet-node/udp-socket.cc index d2689dfbb..86d37d2da 100644 --- a/src/internet-node/udp-socket.cc +++ b/src/internet-node/udp-socket.cc @@ -23,8 +23,7 @@ #include "ns3/inet-socket-address.h" #include "ns3/ipv4-route.h" #include "ns3/ipv4.h" -#include "ns3/ipv4.h" -#include "ns3/udp.h" +#include "ns3/udp-socket-factory.h" #include "ns3/trace-source-accessor.h" #include "ns3/uinteger.h" #include "ns3/boolean.h" @@ -464,7 +463,7 @@ UdpSocket::ForwardUp (Ptr packet, Ipv4Address ipv4, uint16_t port) #include "ns3/test.h" #include "ns3/socket-factory.h" -#include "ns3/udp.h" +#include "ns3/udp-socket-factory.h" #include "ns3/simulator.h" #include "ns3/simple-channel.h" #include "ns3/simple-net-device.h" @@ -588,7 +587,7 @@ UdpSocketTest::RunTests (void) // Create the UDP sockets - Ptr rxSocketFactory = rxNode->GetObject (); + Ptr rxSocketFactory = rxNode->GetObject (); Ptr rxSocket = rxSocketFactory->CreateSocket (); NS_TEST_ASSERT_EQUAL (rxSocket->Bind (InetSocketAddress (Ipv4Address ("10.0.0.1"), 1234)), 0); rxSocket->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePkt, this)); @@ -597,7 +596,7 @@ UdpSocketTest::RunTests (void) rxSocket2->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePkt2, this)); NS_TEST_ASSERT_EQUAL (rxSocket2->Bind (InetSocketAddress (Ipv4Address ("10.0.1.1"), 1234)), 0); - Ptr txSocketFactory = txNode->GetObject (); + Ptr txSocketFactory = txNode->GetObject (); Ptr txSocket = txSocketFactory->CreateSocket (); // ------ Now the tests ------------ diff --git a/src/internet-node/udp-socket.h b/src/internet-node/udp-socket.h index 812d5f552..4683d8f2e 100644 --- a/src/internet-node/udp-socket.h +++ b/src/internet-node/udp-socket.h @@ -64,7 +64,7 @@ public: virtual uint32_t GetRxAvailable (void) const; private: - friend class Udp; + friend class UdpSocketFactory; // invoked by Udp class int FinishBind (void); void ForwardUp (Ptr p, Ipv4Address ipv4, uint16_t port); diff --git a/src/node/udp.cc b/src/node/udp-socket-factory.cc similarity index 84% rename from src/node/udp.cc rename to src/node/udp-socket-factory.cc index 14311a2bb..d95b0068a 100644 --- a/src/node/udp.cc +++ b/src/node/udp-socket-factory.cc @@ -17,16 +17,16 @@ * * Author: Mathieu Lacage */ -#include "udp.h" +#include "udp-socket-factory.h" #include "ns3/uinteger.h" namespace ns3 { -NS_OBJECT_ENSURE_REGISTERED (Udp); +NS_OBJECT_ENSURE_REGISTERED (UdpSocketFactory); -TypeId Udp::GetTypeId (void) +TypeId UdpSocketFactory::GetTypeId (void) { - static TypeId tid = TypeId ("ns3::Udp") + static TypeId tid = TypeId ("ns3::UdpSocketFactory") .SetParent () ; return tid; diff --git a/src/node/udp.h b/src/node/udp-socket-factory.h similarity index 91% rename from src/node/udp.h rename to src/node/udp-socket-factory.h index be6b0149d..3fac525ce 100644 --- a/src/node/udp.h +++ b/src/node/udp-socket-factory.h @@ -17,8 +17,8 @@ * * Author: Mathieu Lacage */ -#ifndef UDP_H -#define UDP_H +#ifndef UDP_SOCKET_FACTORY_H +#define UDP_SOCKET_FACTORY_H #include "socket-factory.h" @@ -39,7 +39,7 @@ class Socket; * * \see UdpImpl */ -class Udp : public SocketFactory +class UdpSocketFactory : public SocketFactory { public: static TypeId GetTypeId (void); @@ -56,4 +56,4 @@ public: } // namespace ns3 -#endif /* UDP_H */ +#endif /* UDP_SOCKET_FACTORY_H */ diff --git a/src/node/wscript b/src/node/wscript index 770b1edb9..1a80b33d6 100644 --- a/src/node/wscript +++ b/src/node/wscript @@ -25,7 +25,7 @@ def build(bld): 'socket-factory.cc', 'packet-socket-factory.cc', 'packet-socket.cc', - 'udp.cc', + 'udp-socket-factory.cc', 'tcp.cc', 'ipv4.cc', 'application.cc', @@ -57,7 +57,7 @@ def build(bld): 'socket.h', 'socket-factory.h', 'packet-socket-factory.h', - 'udp.h', + 'udp-socket-factory.h', 'tcp.h', 'ipv4.h', 'application.h', diff --git a/src/routing/olsr/olsr-agent-impl.cc b/src/routing/olsr/olsr-agent-impl.cc index 19257306a..929a2b446 100644 --- a/src/routing/olsr/olsr-agent-impl.cc +++ b/src/routing/olsr/olsr-agent-impl.cc @@ -31,7 +31,7 @@ #include "olsr-agent-impl.h" #include "ns3/socket-factory.h" -#include "ns3/udp.h" +#include "ns3/udp-socket-factory.h" #include "ns3/simulator.h" #include "ns3/log.h" #include "ns3/random-variable.h" @@ -280,7 +280,7 @@ void AgentImpl::Start () // Create a socket to listen only on this interface Ptr socket = Socket::CreateSocket (GetObject (), - Udp::GetTypeId()); + UdpSocketFactory::GetTypeId()); socket->SetRecvCallback (MakeCallback (&AgentImpl::RecvOlsr, this)); if (socket->Bind (InetSocketAddress (addr, OLSR_PORT_NUMBER))) { diff --git a/utils/print-introspected-doxygen.cc b/utils/print-introspected-doxygen.cc index e76629571..c714d5ee7 100644 --- a/utils/print-introspected-doxygen.cc +++ b/utils/print-introspected-doxygen.cc @@ -237,7 +237,7 @@ int main (int argc, char *argv[]) StaticInformation info; info.RecordAggregationInfo ("ns3::Node", "ns3::Tcp"); - info.RecordAggregationInfo ("ns3::Node", "ns3::Udp"); + info.RecordAggregationInfo ("ns3::Node", "ns3::UdpSocketFactory"); info.RecordAggregationInfo ("ns3::Node", "ns3::PacketSocketFactory"); info.RecordAggregationInfo ("ns3::Node", "ns3::olsr::Agent"); info.RecordAggregationInfo ("ns3::Node", "ns3::MobilityModel");