Mirrors/i2pd
2
0
Fork 0
mirror of https://github.com/PurpleI2P/i2pd.git synced 2025-11-04 08:30:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

handle stream ternimation properly

Browse source
This commit is contained in:
orignal 2016-10-28 11:33:11 -04:00
parent 2dcb91b284
commit 5c64c2ff42
1 changed files with 30 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

34
SAM.cpp
View file

@ -587,10 +587,28 @@ namespace client
void SAMSocket::I2PReceive () void SAMSocket::I2PReceive ()
{ {
if (m_Stream) if (m_Stream)
m_Stream->AsyncReceive (boost::asio::buffer (m_StreamBuffer, SAM_SOCKET_BUFFER_SIZE), {
std::bind (&SAMSocket::HandleI2PReceive, shared_from_this (), if (m_Stream->GetStatus () == i2p::stream::eStreamStatusNew ||
std::placeholders::_1, std::placeholders::_2), m_Stream->GetStatus () == i2p::stream::eStreamStatusOpen) // regular
SAM_SOCKET_CONNECTION_MAX_IDLE); {
m_Stream->AsyncReceive (boost::asio::buffer (m_StreamBuffer, SAM_SOCKET_BUFFER_SIZE),
std::bind (&SAMSocket::HandleI2PReceive, shared_from_this (),
std::placeholders::_1, std::placeholders::_2),
SAM_SOCKET_CONNECTION_MAX_IDLE);
}
else // closed by peer
{
// get remaning data
auto len = m_Stream->ReadSome (m_StreamBuffer, SAM_SOCKET_BUFFER_SIZE);
if (len > 0) // still some data
{
boost::asio::async_write (m_Socket, boost::asio::buffer (m_StreamBuffer, len),
std::bind (&SAMSocket::HandleWriteI2PData, shared_from_this (), std::placeholders::_1));
}
else // no more data
Terminate ();
}
}
} }
void SAMSocket::HandleI2PReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred) void SAMSocket::HandleI2PReceive (const boost::system::error_code& ecode, std::size_t bytes_transferred)
@ -599,6 +617,14 @@ namespace client
{ {
LogPrint (eLogError, "SAM: stream read error: ", ecode.message ()); LogPrint (eLogError, "SAM: stream read error: ", ecode.message ());
if (ecode != boost::asio::error::operation_aborted) if (ecode != boost::asio::error::operation_aborted)
{
if (bytes_transferred > 0)
boost::asio::async_write (m_Socket, boost::asio::buffer (m_StreamBuffer, bytes_transferred),
std::bind (&SAMSocket::HandleWriteI2PData, shared_from_this (), std::placeholders::_1)); // postpone termination
else
Terminate ();
}
else
Terminate (); Terminate ();
} }
else else