Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge release branch back into develop branch #2809

Merged
merged 5 commits into from
Feb 9, 2024
Merged

Merge release branch back into develop branch #2809

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4100e45
Try to fix syncing issue
abitmore Dec 14, 2023
a25659f
Merge pull request #2799 from bitshares/fix-sync-stop
abitmore Dec 14, 2023
9ed758b
Update sonar.branch.target for release branch
abitmore Feb 7, 2024
dae97b2
Merge pull request #2808 from bitshares/develop-to-release
abitmore Feb 8, 2024
8246be8
Update sonar.branch.target for develop branch
abitmore Feb 8, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 27 additions & 4 deletions libraries/net/message_oriented_connection.cpp
View file
Open in desktop
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
Loading