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

(svn r15628) -Fix [FS#2705]: kicking/banning a client from the Client list window crashed the server

Browse Source
This commit is contained in:
smatz
2009-03-06 12:42:01 +00:00
parent 3d05c31031
commit f3ed8268b6
4 changed files with 40 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/network/network_gui.cpp
View File

@@ -1445,25 +1445,20 @@ static const NetworkClientInfo *NetworkFindClientInfo(byte client_no)
// Here we start to define the options out of the menu
static void ClientList_Kick(byte client_no)
{
if (client_no < MAX_CLIENTS) {
SEND_COMMAND(PACKET_SERVER_ERROR)(GetNetworkClientSocket(client_no), NETWORK_ERROR_KICKED);
}
const NetworkClientInfo *ci = NetworkFindClientInfo(client_no);
if (ci == NULL) return;
NetworkServerKickClient(ci->client_id);
}
static void ClientList_Ban(byte client_no)
{
uint32 ip = NetworkFindClientInfo(client_no)->client_ip;
const NetworkClientInfo *ci = NetworkFindClientInfo(client_no);
for (uint i = 0; i < lengthof(_network_ban_list); i++) {
if (_network_ban_list[i] == NULL) {
_network_ban_list[i] = strdup(inet_ntoa(*(struct in_addr *)&ip));
break;
}
}
if (ci == NULL) return;
if (client_no < MAX_CLIENTS) {
SEND_COMMAND(PACKET_SERVER_ERROR)(GetNetworkClientSocket(client_no), NETWORK_ERROR_KICKED);
}
NetworkServerBanIP(GetClientIP(ci));
}
static void ClientList_GiveMoney(byte client_no)