Merge branch 'merge-650' into openssl

This commit is contained in:
Jeff Becker 2016-10-05 11:29:55 -04:00
commit f3c080f8a4
No known key found for this signature in database
GPG key ID: AB950234D6EA286B
18 changed files with 83 additions and 65 deletions

View file

@ -197,7 +197,7 @@ namespace client
std::bind (&I2CPSession::HandleReceivedHeader, shared_from_this (), std::placeholders::_1, std::placeholders::_2));
}
void I2CPSession::HandleReceivedHeader (const boost::system::error_code& ecode, std::size_t bytes_transferred)
void I2CPSession::HandleReceivedHeader (const boost::system::error_code& ecode, std::size_t /*bytes_transferred*/)
{
if (ecode)
Terminate ();
@ -224,7 +224,7 @@ namespace client
std::bind (&I2CPSession::HandleReceivedPayload, shared_from_this (), std::placeholders::_1, std::placeholders::_2));
}
void I2CPSession::HandleReceivedPayload (const boost::system::error_code& ecode, std::size_t bytes_transferred)
void I2CPSession::HandleReceivedPayload (const boost::system::error_code& ecode, std::size_t /*bytes_transferred*/)
{
if (ecode)
Terminate ();
@ -281,7 +281,8 @@ namespace client
LogPrint (eLogError, "I2CP: Can't write to the socket");
}
void I2CPSession::HandleI2CPMessageSent (const boost::system::error_code& ecode, std::size_t bytes_transferred, const uint8_t * buf)
void I2CPSession::HandleI2CPMessageSent (const boost::system::error_code& ecode,
std::size_t /*bytes_transferred*/, const uint8_t* buf)
{
delete[] buf;
if (ecode && ecode != boost::asio::error::operation_aborted)
@ -396,7 +397,7 @@ namespace client
}
}
void I2CPSession::DestroySessionMessageHandler (const uint8_t * buf, size_t len)
void I2CPSession::DestroySessionMessageHandler (const uint8_t* /*buf*/, size_t /*len*/)
{
SendSessionStatusMessage (0); // destroy
LogPrint (eLogDebug, "I2CP: session ", m_SessionID, " destroyed");
@ -407,7 +408,7 @@ namespace client
}
}
void I2CPSession::ReconfigureSessionMessageHandler (const uint8_t * buf, size_t len)
void I2CPSession::ReconfigureSessionMessageHandler (const uint8_t* /*buf*/, size_t /*len*/)
{
// TODO: implement actual reconfiguration
SendSessionStatusMessage (2); // updated
@ -569,7 +570,7 @@ namespace client
}
}
void I2CPSession::DestLookupMessageHandler (const uint8_t * buf, size_t len)
void I2CPSession::DestLookupMessageHandler (const uint8_t * buf, size_t /*len*/)
{
if (m_Destination)
{
@ -606,7 +607,7 @@ namespace client
SendI2CPMessage (I2CP_DEST_REPLY_MESSAGE, buf, 32);
}
void I2CPSession::GetBandwidthLimitsMessageHandler (const uint8_t * buf, size_t len)
void I2CPSession::GetBandwidthLimitsMessageHandler (const uint8_t* /*buf*/, size_t /*len*/)
{
uint8_t limits[64];
memset (limits, 0, 64);