Skip to content

Commit

Permalink
Merge pull request #2809 from bitshares/release_to_develop
Browse files Browse the repository at this point in the history
Merge release branch back into develop branch
  • Loading branch information
abitmore committed Feb 9, 2024
2 parents fe40983 + 8246be8 commit 597e70e
Showing 1 changed file with 27 additions and 4 deletions.
31 changes: 27 additions & 4 deletions libraries/net/message_oriented_connection.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -172,14 +172,20 @@ namespace graphene { namespace net {

fc::oexception exception_to_rethrow;
bool call_on_connection_closed = false;
bool io_error = false;

try
{
message m;
char buffer[BUFFER_SIZE];
while( true )
{
_sock.read(buffer, BUFFER_SIZE);
try {
_sock.read(buffer, BUFFER_SIZE);
} catch ( const fc::canceled_exception& ) {
io_error = true;
throw;
}
_bytes_received += BUFFER_SIZE;
memcpy((char*)&m, buffer, sizeof(message_header));
FC_ASSERT( m.size.value() <= MAX_MESSAGE_SIZE, "", ("m.size",m.size.value())("MAX_MESSAGE_SIZE",MAX_MESSAGE_SIZE) );
Expand All @@ -189,7 +195,12 @@ namespace graphene { namespace net {
std::copy(buffer + sizeof(message_header), buffer + sizeof(buffer), m.data.begin());
if (remaining_bytes_with_padding)
{
_sock.read(&m.data[LEFTOVER], remaining_bytes_with_padding);
try {
_sock.read(&m.data[LEFTOVER], remaining_bytes_with_padding);
} catch ( const fc::canceled_exception& ) {
io_error = true;
throw;
}
_bytes_received += remaining_bytes_with_padding;
}
m.data.resize(m.size.value()); // truncate off the padding bytes
Expand All @@ -214,8 +225,20 @@ namespace graphene { namespace net {
}
catch ( const fc::canceled_exception& e )
{
wlog( "caught a canceled_exception in read_loop. this should mean we're in the process of deleting this object already, so there's no need to notify the delegate: ${e}", ("e", e.to_detail_string() ) );
throw;
if( io_error )
{
wlog( "disconnected on io error ${e}", ("e", e.to_detail_string() ) );
call_on_connection_closed = true;
exception_to_rethrow = fc::unhandled_exception(FC_LOG_MESSAGE(warn, "disconnected on io error: ${e}",
("e", e.to_detail_string())));
}
else
{
wlog( "caught a canceled_exception in read_loop. this should mean we're in the process of deleting "
"this object already, so there's no need to notify the delegate: ${e}",
("e", e.to_detail_string() ) );
throw;
}
}
catch ( const fc::eof_exception& e )
{
Expand Down

0 comments on commit 597e70e

Please sign in to comment.