games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-03-21 21:17:49 +02:00
Code Issues Releases Activity

More robust handling of connection errors

Browse Source 
Fixes potentially hanging by heartbeat sockets
This commit is contained in:
Ivan Savenko 2024-05-12 19:13:17 +00:00
parent 2c99b13482
commit 6d08ec6323
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
lib/network/NetworkConnection.cpp
View File

@ -60,16 +60,17 @@ void NetworkConnection::heartbeat()
constexpr auto heartbeatInterval = std::chrono::seconds(10); constexpr auto heartbeatInterval = std::chrono::seconds(10);
timer->expires_after(heartbeatInterval); timer->expires_after(heartbeatInterval);
timer->async_wait( [self = shared_from_this()](const auto & ec) timer->async_wait( [self = weak_from_this()](const auto & ec)
{ {
if (ec) if (ec)
return; return;
if (!self->socket->is_open()) auto locked = self.lock();
if (!locked)
return; return;
self->sendPacket({}); locked->sendPacket({});
self->heartbeat(); locked->heartbeat();
}); });
} }
@ -77,7 +78,7 @@ void NetworkConnection::onHeaderReceived(const boost::system::error_code & ecHea
{ {
if (ecHeader) if (ecHeader)
{ {
listener.onDisconnected(shared_from_this(), ecHeader.message()); onError(ecHeader.message());
return; return;
} }
@ -89,7 +90,7 @@ void NetworkConnection::onHeaderReceived(const boost::system::error_code & ecHea
if (messageSize > messageMaxSize) if (messageSize > messageMaxSize)
{ {
listener.onDisconnected(shared_from_this(), "Invalid packet size!"); onError("Invalid packet size!");
return; return;
} }
@ -110,7 +111,7 @@ void NetworkConnection::onPacketReceived(const boost::system::error_code & ec, u
{ {
if (ec) if (ec)
{ {
listener.onDisconnected(shared_from_this(), ec.message()); onError(ec.message());
return; return;
} }
@ -160,8 +161,7 @@ void NetworkConnection::onDataSent(const boost::system::error_code & ec)
dataToSend.pop_front(); dataToSend.pop_front();
if (ec) if (ec)
{ {
logNetwork->error("Failed to send package: %s", ec.message()); onError(ec.message());
listener.onDisconnected(shared_from_this(), ec.message());
return; return;
} }
@ -169,6 +169,12 @@ void NetworkConnection::onDataSent(const boost::system::error_code & ec)
doSendData(); doSendData();
} }
void NetworkConnection::onError(const std::string & message)
{
listener.onDisconnected(shared_from_this(), message);
close();
}
void NetworkConnection::close() void NetworkConnection::close()
{ {
boost::system::error_code ec; boost::system::error_code ec;

1
lib/network/NetworkConnection.h
View File

@ -27,6 +27,7 @@ class NetworkConnection : public INetworkConnection, public std::enable_shared_f
INetworkConnectionListener & listener; INetworkConnectionListener & listener;
void heartbeat(); void heartbeat();
void onError(const std::string & message);
void startReceiving(); void startReceiving();
void onHeaderReceived(const boost::system::error_code & ec); void onHeaderReceived(const boost::system::error_code & ec);