From c6f7bb2d3e9f7cedeaf32c8aa81c73e40234986a Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Mon, 28 Apr 2008 21:45:55 -0700 Subject: [PATCH] remove previous socket receive methods --- examples/wifi-adhoc.cc | 14 ++++++++++---- samples/main-simple.cc | 12 +++++++++--- src/applications/packet-sink/packet-sink.cc | 4 +--- src/applications/udp-echo/udp-echo-client.cc | 3 +-- src/applications/udp-echo/udp-echo-server.cc | 4 +--- src/node/socket.cc | 17 ----------------- src/node/socket.h | 9 --------- 7 files changed, 22 insertions(+), 41 deletions(-) diff --git a/examples/wifi-adhoc.cc b/examples/wifi-adhoc.cc index 0244d8160..35dc1852c 100644 --- a/examples/wifi-adhoc.cc +++ b/examples/wifi-adhoc.cc @@ -38,7 +38,7 @@ public: Experiment (std::string name); GnuplotDataset Run (const WifiHelper &wifi); private: - void ReceivePacket (Ptr socket, Ptr packet, const Address &address); + void ReceivePacket (Ptr socket); void SetPosition (Ptr node, Vector position); Vector GetPosition (Ptr node); void AdvancePosition (Ptr node); @@ -90,9 +90,15 @@ Experiment::AdvancePosition (Ptr node) } void -Experiment::ReceivePacket (Ptr socket, Ptr packet, const Address &address) +Experiment::ReceivePacket (Ptr socket) { - m_bytesTotal += packet->GetSize (); + Ptr packet; + uint32_t maxSize = std::numeric_limits::max(); + uint32_t flags = 0; // no flags + while (packet = socket->Recv (maxSize, flags)) + { + m_bytesTotal += packet->GetSize (); + } } Ptr @@ -102,7 +108,7 @@ Experiment::SetupPacketReceive (Ptr node) Ptr socketFactory = node->GetObject (tid); Ptr sink = socketFactory->CreateSocket (); sink->Bind (); - sink->SetRecvCallback (MakeCallback (&Experiment::ReceivePacket, this)); + sink->SetRecv_Callback (MakeCallback (&Experiment::ReceivePacket, this)); return sink; } diff --git a/samples/main-simple.cc b/samples/main-simple.cc index 2bb339c45..0afc07f4c 100644 --- a/samples/main-simple.cc +++ b/samples/main-simple.cc @@ -23,15 +23,21 @@ GenerateTraffic (Ptr socket, uint32_t size) } static void -SocketPrinter (Ptr socket, Ptr packet, const Address &from) +SocketPrinter (Ptr socket) { - std::cout << "at=" << Simulator::Now ().GetSeconds () << "s, rx bytes=" << packet->GetSize () << std::endl; + Ptr packet; + uint32_t maxSize = std::numeric_limits::max(); + uint32_t flags = 0; // no flags + while (packet = socket->Recv (maxSize, flags)) + { + std::cout << "at=" << Simulator::Now ().GetSeconds () << "s, rx bytes=" << packet->GetSize () << std::endl; + } } static void PrintTraffic (Ptr socket) { - socket->SetRecvCallback (MakeCallback (&SocketPrinter)); + socket->SetRecv_Callback (MakeCallback (&SocketPrinter)); } void diff --git a/src/applications/packet-sink/packet-sink.cc b/src/applications/packet-sink/packet-sink.cc index e090f40ac..b200a4879 100644 --- a/src/applications/packet-sink/packet-sink.cc +++ b/src/applications/packet-sink/packet-sink.cc @@ -87,7 +87,6 @@ void PacketSink::StartApplication() // Called at time specified by Start m_socket->Listen (0); } - m_socket->SetRecvCallback (MakeCallback(&PacketSink::Receive, this)); m_socket->SetRecv_Callback (MakeCallback(&PacketSink::HandleRead, this)); m_socket->SetAcceptCallback ( MakeNullCallback, const Address &> (), @@ -99,8 +98,7 @@ void PacketSink::StopApplication() // Called at time specified by Stop { if (m_socket) { - m_socket->SetRecvCallback (MakeNullCallback, - Ptr, const Address &> ()); + m_socket->SetRecv_Callback (MakeNullCallback > ()); } } diff --git a/src/applications/udp-echo/udp-echo-client.cc b/src/applications/udp-echo/udp-echo-client.cc index 458beb105..86122177f 100644 --- a/src/applications/udp-echo/udp-echo-client.cc +++ b/src/applications/udp-echo/udp-echo-client.cc @@ -115,8 +115,7 @@ UdpEchoClient::StopApplication () if (!m_socket) { - m_socket->SetRecvCallback(MakeNullCallback, Ptr, - const Address &> ()); + m_socket->SetRecv_Callback(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 f0129b160..fda6ad08e 100644 --- a/src/applications/udp-echo/udp-echo-server.cc +++ b/src/applications/udp-echo/udp-echo-server.cc @@ -79,7 +79,6 @@ UdpEchoServer::StartApplication (void) m_socket->Bind (local); } - //m_socket->SetRecvCallback(MakeCallback(&UdpEchoServer::Receive, this)); m_socket->SetRecv_Callback(MakeCallback(&UdpEchoServer::HandleRead, this)); } @@ -90,8 +89,7 @@ UdpEchoServer::StopApplication () if (!m_socket) { - m_socket->SetRecvCallback(MakeNullCallback, - Ptr, const Address &> ()); + m_socket->SetRecv_Callback(MakeNullCallback > ()); } } diff --git a/src/node/socket.cc b/src/node/socket.cc index 071449a31..00c17b9ae 100644 --- a/src/node/socket.cc +++ b/src/node/socket.cc @@ -79,13 +79,6 @@ Socket::SetSendCallback (Callback, uint32_t> sendCb) m_sendCb = sendCb; } -void -Socket::SetRecvCallback (Callback, Ptr,const Address&> receivedData) -{ - NS_LOG_FUNCTION_NOARGS (); - m_receivedData = receivedData; -} - void Socket::SetRecv_Callback (Callback > receivedData) { @@ -227,16 +220,6 @@ Socket::NotifySend (uint32_t spaceAvailable) } } -void -Socket::NotifyDataReceived (Ptr p, const Address &from) -{ - NS_LOG_FUNCTION_NOARGS (); - if (!m_receivedData.IsNull ()) - { - m_receivedData (this, p, from); - } -} - void Socket::NotifyDataRecv (void) { diff --git a/src/node/socket.h b/src/node/socket.h index f60233738..f7300a9b6 100644 --- a/src/node/socket.h +++ b/src/node/socket.h @@ -152,13 +152,6 @@ public: * buffer limit, a maximum-sized integer is always returned. */ void SetSendCallback (Callback, uint32_t> sendCb); - /** - * \brief Receive data - * \param receivedData Invoked whenever new data is received. - * - */ - void SetRecvCallback (Callback, Ptr, - const Address&> receivedData); /** * \brief Receive data * \param receivedData Invoked whenever new data is received. @@ -279,7 +272,6 @@ protected: void NotifyCloseRequested (void); void NotifyDataSent (uint32_t size); void NotifySend (uint32_t spaceAvailable); - void NotifyDataReceived (Ptr p, const Address &from); void NotifyDataRecv (void); Callback > m_closeCompleted; @@ -291,7 +283,6 @@ protected: Callback, const Address&> m_newConnectionCreated; Callback, uint32_t> m_dataSent; Callback, uint32_t > m_sendCb; - Callback, Ptr,const Address&> m_receivedData; Callback > m_receivedData_; };