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

more cleanup

Browse Source
This commit is contained in:
Tom Henderson
2008-05-02 09:21:01 -07:00
parent af58cc3026
commit f8a2add627
9 changed files with 22 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/node/socket.cc
View File

@@ -80,10 +80,10 @@ Socket::SetSendCallback (Callback<void, Ptr<Socket>, uint32_t> sendCb)
}
void
Socket::SetRecv_Callback (Callback<void, Ptr<Socket> > receivedData)
Socket::SetRecvCallback (Callback<void, Ptr<Socket> > 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);
}
}

10
src/node/socket.h
View File

@@ -153,11 +153,13 @@ public:
*/
void SetSendCallback (Callback<void, Ptr<Socket>, 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, Ptr<Socket> >);
void SetRecvCallback (Callback<void, Ptr<Socket> >);
/**
* \param address the address to try to allocate
* \returns 0 on success, -1 on failure.
@@ -283,7 +285,7 @@ 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> > m_receivedData_;
Callback<void, Ptr<Socket> > m_receivedData;
};
/**