dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r16022) -Fix (r15159): sometimes the unregister "query" thread could be delayed so much that the network stuff was already closed and the packet would never reach the master server causing the server to appear online longer than necessary.

Browse Source
This commit is contained in:
rubidium
2009-04-10 20:18:48 +00:00
parent edb46a0289
commit a46de87b03
4 changed files with 17 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/network/network.cpp
View File

@@ -586,7 +586,7 @@ static void NetworkClose()
closesocket(s->second);
}
_listensockets.Clear();
DEBUG(net, 1, "Closed listener");
DEBUG(net, 1, "[tcp] closed listeners");
}
TCPConnecter::KillAll();
@@ -813,8 +813,11 @@ void NetworkReboot()
NetworkClose();
}
/* We want to disconnect from the host/clients */
void NetworkDisconnect()
/**
* We want to disconnect from the host/clients.
* @param blocking whether to wait till everything has been closed
*/
void NetworkDisconnect(bool blocking)
{
if (_network_server) {
NetworkClientSocket *cs;
@@ -824,7 +827,7 @@ void NetworkDisconnect()
}
}
if (_settings_client.network.server_advertise) NetworkUDPRemoveAdvertise();
if (_settings_client.network.server_advertise) NetworkUDPRemoveAdvertise(blocking);
DeleteWindowById(WC_NETWORK_STATUS_WINDOW, 0);
@@ -1104,7 +1107,7 @@ void NetworkStartUp()
/** This shuts the network down */
void NetworkShutDown()
{
NetworkDisconnect();
NetworkDisconnect(true);
NetworkUDPClose();
DEBUG(net, 3, "[core] shutting down network");