--- a/src/applications/udp-echo/udp-echo-server.cc Mon Oct 01 14:14:31 2007 +0200
+++ b/src/applications/udp-echo/udp-echo-server.cc Mon Oct 01 14:15:56 2007 +0200
@@ -84,8 +84,7 @@
m_socket->Bind (m_local);
}
- m_socket->SetRecvCallback((Callback<void, Ptr<Socket>, const Packet &,
- const Address &>) MakeCallback(&UdpEchoServer::Receive, this));
+ m_socket->SetRecvCallback(MakeCallback(&UdpEchoServer::Receive, this));
}
void
@@ -95,15 +94,15 @@
if (!m_socket)
{
- m_socket->SetRecvCallback((Callback<void, Ptr<Socket>, const Packet &,
- const Address &>) NULL);
+ m_socket->SetRecvCallback(MakeNullCallback<void, Ptr<Socket>, Ptr<Packet>,
+ const Address &> ());
}
}
void
UdpEchoServer::Receive(
Ptr<Socket> socket,
- const Packet &packet,
+ Ptr<Packet> packet,
const Address &from)
{
NS_LOG_FUNCTION;
@@ -112,7 +111,7 @@
if (InetSocketAddress::IsMatchingType (from))
{
InetSocketAddress address = InetSocketAddress::ConvertFrom (from);
- NS_LOG_INFO ("Received " << packet.GetSize() << " bytes from " <<
+ NS_LOG_INFO ("Received " << packet->GetSize() << " bytes from " <<
address.GetIpv4());
NS_LOG_LOGIC ("Echoing packet");