mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-19 12:39:11 +00:00
Code Issues 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

3
src/network/network_func.h
View File

@@ -69,6 +69,9 @@ void NetworkServerSendRcon(ClientID client_id, ConsoleColour colour_code, const
void NetworkServerSendError(ClientID client_id, NetworkErrorCode error);
void NetworkServerSendChat(NetworkAction action, DestType type, int dest, const char *msg, ClientID from_id, int64 data = 0);
void NetworkServerKickClient(ClientID client_id);
void NetworkServerBanIP(const char *banip);
void NetworkInitChatMessage();
void CDECL NetworkAddChatMessage(TextColour colour, uint8 duration, const char *message, ...);
void NetworkUndrawChatMessage();

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)

27
src/network/network_server.cpp
View File

@@ -1766,6 +1766,33 @@ void NetworkServerSendError(ClientID client_id, NetworkErrorCode error)
SEND_COMMAND(PACKET_SERVER_ERROR)(NetworkFindClientStateFromClientID(client_id), error);
}
void NetworkServerKickClient(ClientID client_id)
{
if (client_id == CLIENT_ID_SERVER) return;
NetworkServerSendError(client_id, NETWORK_ERROR_KICKED);
}
void NetworkServerBanIP(const char *banip)
{
const NetworkClientInfo *ci;
uint32 ip_number = inet_addr(banip);
/* There can be multiple clients with the same IP, kick them all */
FOR_ALL_CLIENT_INFOS(ci) {
if (ci->client_ip == ip_number) {
NetworkServerKickClient(ci->client_id);
}
}
/* Add user to ban-list */
for (uint index = 0; index < lengthof(_network_ban_list); index++) {
if (_network_ban_list[index] == NULL) {
_network_ban_list[index] = strdup(banip);
break;
}
}
}
bool NetworkCompanyHasClients(CompanyID company)
{
const NetworkClientInfo *ci;