mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd synced 2024-11-13 01:20:22 +03:00
Code Issues Packages Projects Releases Wiki Activity

read more data from socket if available

Browse Source
This commit is contained in:
orignal 2015-02-08 11:52:03 -05:00
parent 6064d12af3
commit 1ad04bf8bf
1 changed files with 39 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
NTCPSession.cpp
View File

@ -489,19 +489,48 @@ namespace transport
if (m_ReceiveBufferOffset >= 16) if (m_ReceiveBufferOffset >= 16)
{ {
uint8_t * nextBlock = m_ReceiveBuffer; int numReloads = 0;
while (m_ReceiveBufferOffset >= 16) do
{ {
if (!DecryptNextBlock (nextBlock)) // 16 bytes uint8_t * nextBlock = m_ReceiveBuffer;
while (m_ReceiveBufferOffset >= 16)
{ {
Terminate (); if (!DecryptNextBlock (nextBlock)) // 16 bytes
return; {
Terminate ();
return;
}
nextBlock += 16;
m_ReceiveBufferOffset -= 16;
}
if (m_ReceiveBufferOffset > 0)
memcpy (m_ReceiveBuffer, nextBlock, m_ReceiveBufferOffset);
// try to read more
if (numReloads < 5)
{
boost::asio::socket_base::bytes_readable command (true);
m_Socket.io_control (command);
size_t moreBytes = command.get();
if (moreBytes)
{
if (moreBytes > NTCP_BUFFER_SIZE - m_ReceiveBufferOffset)
moreBytes = NTCP_BUFFER_SIZE - m_ReceiveBufferOffset;
boost::system::error_code ec;
moreBytes = m_Socket.read_some (boost::asio::buffer (m_ReceiveBuffer + m_ReceiveBufferOffset, moreBytes));
if (ec)
{
LogPrint (eLogError, "Read more bytes error: ", ec.message ());
Terminate ();
return;
}
m_NumReceivedBytes += moreBytes;
m_ReceiveBufferOffset += moreBytes;
numReloads++;
}
} }
nextBlock += 16;
m_ReceiveBufferOffset -= 16;
} }
if (m_ReceiveBufferOffset > 0) while (m_ReceiveBufferOffset >= 16);
memcpy (m_ReceiveBuffer, nextBlock, m_ReceiveBufferOffset);
m_Handler.Flush (); m_Handler.Flush ();
} }