diff options
author | rubidium <rubidium@openttd.org> | 2011-04-22 16:03:48 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2011-04-22 16:03:48 +0000 |
commit | 2cae0cd54cffde47e771e614175249ed1d75fe85 (patch) | |
tree | b9815cdbb7fb397016dd2da0affba881c52cccc3 /src/network/network_server.cpp | |
parent | 146d532d51d9304ab96138d4b4c701744b77dba5 (diff) | |
download | openttd-2cae0cd54cffde47e771e614175249ed1d75fe85.tar.xz |
(svn r22368) -Codechange: move the IP address field from the ClientInfo to ClientSocket
Diffstat (limited to 'src/network/network_server.cpp')
-rw-r--r-- | src/network/network_server.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index f8f966e76..cc3fd09d0 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -1813,7 +1813,7 @@ void NetworkServerDailyLoop() */ const char *ServerNetworkGameSocketHandler::GetClientIP() { - return this->GetInfo()->client_address.GetHostname(); + return this->client_address.GetHostname(); } void NetworkServerShowStatusToConsole() @@ -1936,11 +1936,11 @@ uint NetworkServerKickOrBanIP(const char *ip, bool ban) uint n = 0; /* There can be multiple clients with the same IP, kick them all */ - NetworkClientInfo *ci; - FOR_ALL_CLIENT_INFOS(ci) { - if (ci->client_id == CLIENT_ID_SERVER) continue; - if (ci->client_address.IsInNetmask(const_cast<char *>(ip))) { - NetworkServerKickClient(ci->client_id); + NetworkClientSocket *cs; + FOR_ALL_CLIENT_SOCKETS(cs) { + if (cs->client_id == CLIENT_ID_SERVER) continue; + if (cs->client_address.IsInNetmask(const_cast<char *>(ip))) { + NetworkServerKickClient(cs->client_id); n++; } } |