games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Show info dialog when connection to multiplayer server fails

Browse Source
This commit is contained in:
Alexander Wilms
2023-10-08 23:07:25 +02:00
parent 43636af2e4
commit 7c627d8163
5 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
client/CServerHandler.cpp
View File

@@ -251,25 +251,23 @@ void CServerHandler::startLocalServerAndConnect()
void CServerHandler::justConnectToServer(const std::string & addr, const ui16 port)
{
state = EClientState::CONNECTING;
logNetwork->info("justConnectToServer(%s, %d)", addr, port);
std::string hostAddressFromSettings = getHostAddressFromSettings();
ui16 hostPortFromSettings = getHostPortFromSettings();
logNetwork->info("Host settings %s:%d", hostAddressFromSettings, hostPortFromSettings);
std::string connectionAddress = addr.size() ? addr : hostAddressFromSettings;
ui16 connectionPort = port ? port : hostPortFromSettings;
logNetwork->info("Connecting to %s:%d", connectionAddress, connectionPort);
boost::chrono::duration<long, boost::ratio<1, 1000>> sleepDuration{};
int maxConnectionAttempts;
if(connectionAddress == "127.0.0.1" || connectionAddress == "localhost")
{
logNetwork->info("Local server");
sleepDuration = boost::chrono::milliseconds(10);
maxConnectionAttempts = 1000;
maxConnectionAttempts = 100;
}
else
{
@@ -279,14 +277,15 @@ void CServerHandler::justConnectToServer(const std::string & addr, const ui16 po
}
logNetwork->info("Waiting for %d ms between each of the %d attempts to connect", sleepDuration.count(), maxConnectionAttempts);
ui16 connectionAttemptCount = 0;
while(!c && state != EClientState::CONNECTION_CANCELLED)
{
connectionAttemptCount++;
if(connectionAttemptCount > maxConnectionAttempts)
{
logNetwork->error("\nExceeded maximum of %d connection attempts", maxConnectionAttempts);
state = EClientState::CONNECTION_FAILED;
logNetwork->error("Exceeded maximum of %d connection attempts", maxConnectionAttempts);
return;
}