games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-11-24 08:32:34 +02:00
Code Issues Releases Activity

Fix connection termination handling

Browse Source
This commit is contained in:
Ivan Savenko 2024-05-13 14:09:59 +00:00
parent 2bb96018b8
commit 93038b791e
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/CServerHandler.cpp
View File

@ -913,7 +913,6 @@ void CServerHandler::onDisconnected(const std::shared_ptr<INetworkConnection> &
if(getState() == EClientState::DISCONNECTING) if(getState() == EClientState::DISCONNECTING)
{ {
assert(networkConnection == nullptr);
// Note: this branch can be reached on app shutdown, when main thread holds mutex till destruction // Note: this branch can be reached on app shutdown, when main thread holds mutex till destruction
logNetwork->info("Successfully closed connection to server!"); logNetwork->info("Successfully closed connection to server!");
return; return;

8
lib/network/NetworkServer.cpp
View File

@ -49,9 +49,11 @@ void NetworkServer::connectionAccepted(std::shared_ptr<NetworkSocket> upcomingCo
void NetworkServer::onDisconnected(const std::shared_ptr<INetworkConnection> & connection, const std::string & errorMessage) void NetworkServer::onDisconnected(const std::shared_ptr<INetworkConnection> & connection, const std::string & errorMessage)
{ {
logNetwork->info("Connection lost! Reason: %s", errorMessage); logNetwork->info("Connection lost! Reason: %s", errorMessage);
assert(connections.count(connection)); if (connections.count(connection))
connections.erase(connection); {
listener.onDisconnected(connection, errorMessage); connections.erase(connection);
listener.onDisconnected(connection, errorMessage);
}
} }
void NetworkServer::onPacketReceived(const std::shared_ptr<INetworkConnection> & connection, const std::vector<std::byte> & message) void NetworkServer::onPacketReceived(const std::shared_ptr<INetworkConnection> & connection, const std::vector<std::byte> & message)

2
server/GlobalLobbyProcessor.cpp
View File

@ -51,6 +51,8 @@ void GlobalLobbyProcessor::onDisconnected(const std::shared_ptr<INetworkConnecti
message["accountID"].String() = proxy.first; message["accountID"].String() = proxy.first;
sendMessage(controlConnection, message); sendMessage(controlConnection, message);
proxyConnections.erase(proxy.first);
break; break;
} }
} }