Thu Dec 8 12:11:00 2016 +0100 6877d58 applications: use of socket creation callback  [Natale Patriciello] diff --git a/src/applications/model/bulk-send-application.cc b/src/applications/model/bulk-send-application.cc index 948de7c..9da02f2 100644 --- a/src/applications/model/bulk-send-application.cc +++ b/src/applications/model/bulk-send-application.cc @@ -118,6 +118,7 @@ void BulkSendApplication::StartApplication (void) // Called at time specified by if (!m_socket) { m_socket = Socket::CreateSocket (GetNode (), m_tid); + m_socketCreated (m_socket); // Fatal error if socket type is not NS3_SOCK_STREAM or NS3_SOCK_SEQPACKET if (m_socket->GetSocketType () != Socket::NS3_SOCK_STREAM && diff --git a/src/applications/model/onoff-application.cc b/src/applications/model/onoff-application.cc index aec8a19..19c1a97 100644 --- a/src/applications/model/onoff-application.cc +++ b/src/applications/model/onoff-application.cc @@ -151,6 +151,8 @@ void OnOffApplication::StartApplication () // Called at time specified by Start if (!m_socket) { m_socket = Socket::CreateSocket (GetNode (), m_tid); + m_socketCreated (m_socket); + if (Inet6SocketAddress::IsMatchingType (m_peer)) { m_socket->Bind6 (); diff --git a/src/applications/model/packet-sink.cc b/src/applications/model/packet-sink.cc index 79216f5..5631c27 100644 --- a/src/applications/model/packet-sink.cc +++ b/src/applications/model/packet-sink.cc @@ -114,6 +114,7 @@ void PacketSink::StartApplication () // Called at time specified by Start if (!m_socket) { m_socket = Socket::CreateSocket (GetNode (), m_tid); + m_socketCreated (m_socket); m_socket->Bind (m_local); m_socket->Listen (); m_socket->ShutdownSend (); diff --git a/src/applications/model/udp-client.cc b/src/applications/model/udp-client.cc index 3919857..c513a01 100644 --- a/src/applications/model/udp-client.cc +++ b/src/applications/model/udp-client.cc @@ -117,6 +117,7 @@ UdpClient::StartApplication (void) { TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory"); m_socket = Socket::CreateSocket (GetNode (), tid); + m_socketCreated (m_socket); if (Ipv4Address::IsMatchingType(m_peerAddress) == true) { m_socket->Bind (); diff --git a/src/applications/model/udp-echo-client.cc b/src/applications/model/udp-echo-client.cc index 06711b2..c45c7a3 100644 --- a/src/applications/model/udp-echo-client.cc +++ b/src/applications/model/udp-echo-client.cc @@ -125,6 +125,7 @@ UdpEchoClient::StartApplication (void) { TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory"); m_socket = Socket::CreateSocket (GetNode (), tid); + m_socketCreated (m_socket); if (Ipv4Address::IsMatchingType(m_peerAddress) == true) { m_socket->Bind(); diff --git a/src/applications/model/udp-echo-server.cc b/src/applications/model/udp-echo-server.cc index 0daaf12..088c327 100644 --- a/src/applications/model/udp-echo-server.cc +++ b/src/applications/model/udp-echo-server.cc @@ -81,6 +81,7 @@ UdpEchoServer::StartApplication (void) { TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory"); m_socket = Socket::CreateSocket (GetNode (), tid); + m_socketCreated (m_socket); InetSocketAddress local = InetSocketAddress (Ipv4Address::GetAny (), m_port); m_socket->Bind (local); if (addressUtils::IsMulticast (m_local)) diff --git a/src/applications/model/udp-server.cc b/src/applications/model/udp-server.cc index e995722..4edbfee 100644 --- a/src/applications/model/udp-server.cc +++ b/src/applications/model/udp-server.cc @@ -119,6 +119,7 @@ UdpServer::StartApplication (void) { TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory"); m_socket = Socket::CreateSocket (GetNode (), tid); + m_socketCreated (m_socket); InetSocketAddress local = InetSocketAddress (Ipv4Address::GetAny (), m_port); m_socket->Bind (local); diff --git a/src/applications/model/udp-trace-client.cc b/src/applications/model/udp-trace-client.cc index 160c4e2..776699f 100644 --- a/src/applications/model/udp-trace-client.cc +++ b/src/applications/model/udp-trace-client.cc @@ -240,6 +240,7 @@ UdpTraceClient::StartApplication (void) { TypeId tid = TypeId::LookupByName ("ns3::UdpSocketFactory"); m_socket = Socket::CreateSocket (GetNode (), tid); + m_socketCreated (m_socket); if (Ipv4Address::IsMatchingType(m_peerAddress) == true) { m_socket->Bind ();