diff --git a/examples/wifi-adhoc.cc b/examples/wifi-adhoc.cc index 35dc1852c..ee2d8d32a 100644 --- a/examples/wifi-adhoc.cc +++ b/examples/wifi-adhoc.cc @@ -108,7 +108,7 @@ Experiment::SetupPacketReceive (Ptr node) Ptr socketFactory = node->GetObject (tid); Ptr sink = socketFactory->CreateSocket (); sink->Bind (); - sink->SetRecv_Callback (MakeCallback (&Experiment::ReceivePacket, this)); + sink->SetRecvCallback (MakeCallback (&Experiment::ReceivePacket, this)); return sink; } diff --git a/samples/main-simple.cc b/samples/main-simple.cc index 0afc07f4c..eddf69b32 100644 --- a/samples/main-simple.cc +++ b/samples/main-simple.cc @@ -37,7 +37,7 @@ SocketPrinter (Ptr socket) static void PrintTraffic (Ptr socket) { - socket->SetRecv_Callback (MakeCallback (&SocketPrinter)); + socket->SetRecvCallback (MakeCallback (&SocketPrinter)); } void diff --git a/src/applications/packet-sink/packet-sink.cc b/src/applications/packet-sink/packet-sink.cc index 2ed2b1882..d55fdf720 100644 --- a/src/applications/packet-sink/packet-sink.cc +++ b/src/applications/packet-sink/packet-sink.cc @@ -87,7 +87,7 @@ void PacketSink::StartApplication() // Called at time specified by Start m_socket->Listen (0); } - m_socket->SetRecv_Callback (MakeCallback(&PacketSink::HandleRead, this)); + m_socket->SetRecvCallback (MakeCallback(&PacketSink::HandleRead, this)); m_socket->SetAcceptCallback ( MakeNullCallback, const Address &> (), MakeNullCallback, const Address&> (), @@ -98,7 +98,7 @@ void PacketSink::StopApplication() // Called at time specified by Stop { if (m_socket) { - m_socket->SetRecv_Callback (MakeNullCallback > ()); + m_socket->SetRecvCallback (MakeNullCallback > ()); } } diff --git a/src/applications/udp-echo/udp-echo-client.cc b/src/applications/udp-echo/udp-echo-client.cc index 382fbac82..a68b600e4 100644 --- a/src/applications/udp-echo/udp-echo-client.cc +++ b/src/applications/udp-echo/udp-echo-client.cc @@ -103,7 +103,7 @@ UdpEchoClient::StartApplication (void) m_socket->Connect (InetSocketAddress (m_peerAddress, m_peerPort)); } - m_socket->SetRecv_Callback(MakeCallback(&UdpEchoClient::HandleRead, this)); + m_socket->SetRecvCallback(MakeCallback(&UdpEchoClient::HandleRead, this)); ScheduleTransmit (Seconds(0.)); } @@ -115,7 +115,7 @@ UdpEchoClient::StopApplication () if (!m_socket) { - m_socket->SetRecv_Callback(MakeNullCallback > ()); + m_socket->SetRecvCallback(MakeNullCallback > ()); } Simulator::Cancel(m_sendEvent); diff --git a/src/applications/udp-echo/udp-echo-server.cc b/src/applications/udp-echo/udp-echo-server.cc index c22b03af3..4472d02b1 100644 --- a/src/applications/udp-echo/udp-echo-server.cc +++ b/src/applications/udp-echo/udp-echo-server.cc @@ -79,7 +79,7 @@ UdpEchoServer::StartApplication (void) m_socket->Bind (local); } - m_socket->SetRecv_Callback(MakeCallback(&UdpEchoServer::HandleRead, this)); + m_socket->SetRecvCallback(MakeCallback(&UdpEchoServer::HandleRead, this)); } void @@ -89,7 +89,7 @@ UdpEchoServer::StopApplication () if (!m_socket) { - m_socket->SetRecv_Callback(MakeNullCallback > ()); + m_socket->SetRecvCallback(MakeNullCallback > ()); } } diff --git a/src/internet-node/udp-socket.cc b/src/internet-node/udp-socket.cc index 7a1976639..cae73b0c7 100644 --- a/src/internet-node/udp-socket.cc +++ b/src/internet-node/udp-socket.cc @@ -491,18 +491,10 @@ UdpSocketTest::RunTests (void) Ptr rxSocketFactory = rxNode->GetObject (); Ptr rxSocket = rxSocketFactory->CreateSocket (); NS_TEST_ASSERT_EQUAL (rxSocket->Bind (InetSocketAddress (Ipv4Address ("10.0.0.1"), 1234)), 0); -#ifdef OLDSEMANTICS - rxSocket->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePacket, this)); -#else - rxSocket->SetRecv_Callback (MakeCallback (&UdpSocketTest::ReceivePkt, this)); -#endif + rxSocket->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePkt, this)); Ptr rxSocket2 = rxSocketFactory->CreateSocket (); -#ifdef OLDSEMANTICS - rxSocket2->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePacket2, this)); -#else - rxSocket2->SetRecv_Callback (MakeCallback (&UdpSocketTest::ReceivePkt2, this)); -#endif + rxSocket2->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePkt2, this)); NS_TEST_ASSERT_EQUAL (rxSocket2->Bind (InetSocketAddress (Ipv4Address ("10.0.1.1"), 1234)), 0); Ptr txSocketFactory = txNode->GetObject (); @@ -543,11 +535,7 @@ UdpSocketTest::RunTests (void) // the socket address matches. rxSocket2->Dispose (); rxSocket2 = rxSocketFactory->CreateSocket (); -#ifdef OLDSEMANTICS - rxSocket2->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePacket2, this)); -#else - rxSocket2->SetRecv_Callback (MakeCallback (&UdpSocketTest::ReceivePkt2, this)); -#endif + rxSocket2->SetRecvCallback (MakeCallback (&UdpSocketTest::ReceivePkt2, this)); NS_TEST_ASSERT_EQUAL (rxSocket2->Bind (InetSocketAddress (Ipv4Address ("0.0.0.0"), 1234)), 0); m_receivedPacket = Create (); diff --git a/src/node/socket.cc b/src/node/socket.cc index 00c17b9ae..ad2747094 100644 --- a/src/node/socket.cc +++ b/src/node/socket.cc @@ -80,10 +80,10 @@ Socket::SetSendCallback (Callback, uint32_t> sendCb) } void -Socket::SetRecv_Callback (Callback > receivedData) +Socket::SetRecvCallback (Callback > receivedData) { NS_LOG_FUNCTION_NOARGS (); - m_receivedData_ = receivedData; + m_receivedData = receivedData; } int Socket::Listen (uint32_t queueLimit) @@ -224,9 +224,9 @@ void Socket::NotifyDataRecv (void) { NS_LOG_FUNCTION_NOARGS (); - if (!m_receivedData_.IsNull ()) + if (!m_receivedData.IsNull ()) { - m_receivedData_ (this); + m_receivedData (this); } } diff --git a/src/node/socket.h b/src/node/socket.h index f7300a9b6..b2b943432 100644 --- a/src/node/socket.h +++ b/src/node/socket.h @@ -153,11 +153,13 @@ public: */ void SetSendCallback (Callback, uint32_t> sendCb); /** - * \brief Receive data - * \param receivedData Invoked whenever new data is received. + * \brief Notify application when new data is available to be read. * + * This callback is intended to notify a socket that would + * have been blocked in a blocking socket model that data + * is available to be read. */ - void SetRecv_Callback (Callback >); + void SetRecvCallback (Callback >); /** * \param address the address to try to allocate * \returns 0 on success, -1 on failure. @@ -283,7 +285,7 @@ protected: Callback, const Address&> m_newConnectionCreated; Callback, uint32_t> m_dataSent; Callback, uint32_t > m_sendCb; - Callback > m_receivedData_; + Callback > m_receivedData; }; /** diff --git a/src/routing/olsr/olsr-agent-impl.cc b/src/routing/olsr/olsr-agent-impl.cc index f0bebc2e8..1db5c5e2a 100644 --- a/src/routing/olsr/olsr-agent-impl.cc +++ b/src/routing/olsr/olsr-agent-impl.cc @@ -282,7 +282,7 @@ void AgentImpl::Start () // Create a socket to listen only on this interface Ptr socket = socketFactory->CreateSocket (); - socket->SetRecv_Callback (MakeCallback (&AgentImpl::RecvOlsr, this)); + socket->SetRecvCallback (MakeCallback (&AgentImpl::RecvOlsr, this)); if (socket->Bind (InetSocketAddress (addr, OLSR_PORT_NUMBER))) { NS_FATAL_ERROR ("Failed to bind() OLSR receive socket");