F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove previous socket receive methods

Browse Source
This commit is contained in:
Tom Henderson
2008-04-28 21:45:55 -07:00
parent 075851985f
commit c6f7bb2d3e
7 changed files with 22 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/node/socket.cc
View File

@@ -79,13 +79,6 @@ Socket::SetSendCallback (Callback<void, Ptr<Socket>, uint32_t> sendCb)
m_sendCb = sendCb;
}
void
Socket::SetRecvCallback (Callback<void, Ptr<Socket>, Ptr<Packet>,const Address&> receivedData)
{
NS_LOG_FUNCTION_NOARGS ();
m_receivedData = receivedData;
}
void
Socket::SetRecv_Callback (Callback<void, Ptr<Socket> > receivedData)
{
@@ -227,16 +220,6 @@ Socket::NotifySend (uint32_t spaceAvailable)
}
}
void
Socket::NotifyDataReceived (Ptr<Packet> p, const Address &from)
{
NS_LOG_FUNCTION_NOARGS ();
if (!m_receivedData.IsNull ())
{
m_receivedData (this, p, from);
}
}
void
Socket::NotifyDataRecv (void)
{

9
src/node/socket.h
View File

@@ -152,13 +152,6 @@ public:
* buffer limit, a maximum-sized integer is always returned.
*/
void SetSendCallback (Callback<void, Ptr<Socket>, uint32_t> sendCb);
/**
* \brief Receive data
* \param receivedData Invoked whenever new data is received.
*
*/
void SetRecvCallback (Callback<void, Ptr<Socket>, Ptr<Packet>,
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<Packet> p, const Address &from);
void NotifyDataRecv (void);
Callback<void,Ptr<Socket> > m_closeCompleted;
@@ -291,7 +283,6 @@ protected:
Callback<void, Ptr<Socket>, const Address&> m_newConnectionCreated;
Callback<void, Ptr<Socket>, uint32_t> m_dataSent;
Callback<void, Ptr<Socket>, uint32_t > m_sendCb;
Callback<void, Ptr<Socket>, Ptr<Packet>,const Address&> m_receivedData;
Callback<void, Ptr<Socket> > m_receivedData_;
};