Undo changes to the packet sink to accept incoming connections; change the default behavior of the socket connection request notifier instead
--- a/src/applications/packet-sink/packet-sink.cc Wed Feb 20 14:26:42 2008 -0500
+++ b/src/applications/packet-sink/packet-sink.cc Thu Mar 13 14:22:26 2008 -0400
@@ -83,9 +83,9 @@
m_socket->SetRecvCallback (MakeCallback(&PacketSink::Receive, this));
m_socket->SetAcceptCallback (
- MakeCallback (&PacketSink::AcceptConnectionRequest, this),
+ MakeNullCallback<bool, Ptr<Socket>, const Address &> (),
MakeNullCallback<void, Ptr<Socket>, const Address&> (),
- MakeCallback (&PacketSink::CloseConnection, this) );
+ MakeCallback(&PacketSink::CloseConnection, this) );
}
void PacketSink::StopApplication() // Called at time specified by Stop
@@ -116,11 +116,6 @@
socket->Close ();
}
-bool PacketSink::AcceptConnectionRequest (Ptr<Socket> socket, const Address &from)
-{
- return true;
-}
-
Ptr<TraceResolver>
PacketSink::GetTraceResolver (void) const
{
--- a/src/applications/packet-sink/packet-sink.h Wed Feb 20 14:26:42 2008 -0500
+++ b/src/applications/packet-sink/packet-sink.h Thu Mar 13 14:22:26 2008 -0400
@@ -79,7 +79,6 @@
virtual void Receive (Ptr<Socket> socket, Ptr<Packet> packet, const Address& from);
virtual void CloseConnection (Ptr<Socket> socket);
- virtual bool AcceptConnectionRequest (Ptr<Socket> socket, const Address &from);
Ptr<Socket> m_socket; // Associated socket
Address m_local; // Local address to bind to
--- a/src/node/socket.cc Wed Feb 20 14:26:42 2008 -0500
+++ b/src/node/socket.cc Thu Mar 13 14:22:26 2008 -0400
@@ -164,8 +164,11 @@
}
else
{
- // refuse all incomming connections by default.
- return false;
+ // accept all incoming connections by default.
+ // this way people writing code don't have to do anything
+ // special like register a callback that returns true
+ // just to get incoming connections
+ return true;
}
}