mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r14045) -Codechange: move the network's limitation to chat messages to a more logical location and give it a more consistent name.

release/0.7
rubidium 2008-08-11 22:07:26 +00:00
parent 5f52c44c14
commit 3b4c3a3df6
5 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/network/core/config.h
View File

@ -32,6 +32,7 @@ enum {
NETWORK_PLAYERS_LENGTH = 200, ///< The maximum length for the list of players that controls a company, in bytes including '\0' NETWORK_PLAYERS_LENGTH = 200, ///< The maximum length for the list of players that controls a company, in bytes including '\0'
NETWORK_CLIENT_NAME_LENGTH = 25, ///< The maximum length of a player, in bytes including '\0' NETWORK_CLIENT_NAME_LENGTH = 25, ///< The maximum length of a player, in bytes including '\0'
NETWORK_RCONCOMMAND_LENGTH = 500, ///< The maximum length of a rconsole command, in bytes including '\0' NETWORK_RCONCOMMAND_LENGTH = 500, ///< The maximum length of a rconsole command, in bytes including '\0'
NETWORK_CHAT_LENGTH = 1000, ///< The maximum length of a chat message, in bytes including '\0'
NETWORK_GRF_NAME_LENGTH = 80, ///< Maximum length of the name of a GRF NETWORK_GRF_NAME_LENGTH = 80, ///< Maximum length of the name of a GRF
/** /**

6
src/network/network_client.cpp
View File

@ -245,7 +245,7 @@ DEF_CLIENT_SEND_COMMAND_PARAM(PACKET_CLIENT_CHAT)(NetworkAction action, DestType
// uint8: ActionID (see network_data.h, NetworkAction) // uint8: ActionID (see network_data.h, NetworkAction)
// uint8: Destination Type (see network_data.h, DestType); // uint8: Destination Type (see network_data.h, DestType);
// uint16: Destination Player // uint16: Destination Player
// String: Message (max MAX_TEXT_MSG_LEN) // String: Message (max NETWORK_CHAT_LENGTH)
// //
Packet *p = NetworkSend_Init(PACKET_CLIENT_CHAT); Packet *p = NetworkSend_Init(PACKET_CLIENT_CHAT);
@ -713,13 +713,13 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_COMMAND)
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHAT) DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHAT)
{ {
char name[NETWORK_NAME_LENGTH], msg[MAX_TEXT_MSG_LEN]; char name[NETWORK_NAME_LENGTH], msg[NETWORK_CHAT_LENGTH];
const NetworkClientInfo *ci = NULL, *ci_to; const NetworkClientInfo *ci = NULL, *ci_to;
NetworkAction action = (NetworkAction)p->Recv_uint8(); NetworkAction action = (NetworkAction)p->Recv_uint8();
uint16 index = p->Recv_uint16(); uint16 index = p->Recv_uint16();
bool self_send = p->Recv_bool(); bool self_send = p->Recv_bool();
p->Recv_string(msg, MAX_TEXT_MSG_LEN); p->Recv_string(msg, NETWORK_CHAT_LENGTH);
ci_to = NetworkFindClientInfoFromIndex(index); ci_to = NetworkFindClientInfoFromIndex(index);
if (ci_to == NULL) return NETWORK_RECV_STATUS_OKAY; if (ci_to == NULL) return NETWORK_RECV_STATUS_OKAY;

2
src/network/network_internal.h
View File

@ -32,8 +32,6 @@
*/ */
//#define NETWORK_SEND_DOUBLE_SEED //#define NETWORK_SEND_DOUBLE_SEED
#define MAX_TEXT_MSG_LEN 1024 /* long long long long sentences :-) */
enum MapPacket { enum MapPacket {
MAP_PACKET_START, MAP_PACKET_START,
MAP_PACKET_NORMAL, MAP_PACKET_NORMAL,

6
src/network/network_server.cpp
View File

@ -509,7 +509,7 @@ DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_CHAT)(NetworkTCPSocketHandler *cs, N
// Data: // Data:
// uint8: ActionID (see network_data.h, NetworkAction) // uint8: ActionID (see network_data.h, NetworkAction)
// uint16: Client-index // uint16: Client-index
// String: Message (max MAX_TEXT_MSG_LEN) // String: Message (max NETWORK_CHAT_LENGTH)
// //
Packet *p = NetworkSend_Init(PACKET_SERVER_CHAT); Packet *p = NetworkSend_Init(PACKET_SERVER_CHAT);
@ -1160,9 +1160,9 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_CHAT)
NetworkAction action = (NetworkAction)p->Recv_uint8(); NetworkAction action = (NetworkAction)p->Recv_uint8();
DestType desttype = (DestType)p->Recv_uint8(); DestType desttype = (DestType)p->Recv_uint8();
int dest = p->Recv_uint16(); int dest = p->Recv_uint16();
char msg[MAX_TEXT_MSG_LEN]; char msg[NETWORK_CHAT_LENGTH];
p->Recv_string(msg, MAX_TEXT_MSG_LEN); p->Recv_string(msg, NETWORK_CHAT_LENGTH);
const NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs); const NetworkClientInfo *ci = DEREF_CLIENT_INFO(cs);
switch (action) { switch (action) {

2
src/network/network_type.h
View File

@ -1,6 +1,6 @@
/* $Id$ */ /* $Id$ */
/** @file network_internal.h Variables and function used internally. */ /** @file network_type.h Types used for networking. */
#ifndef NETWORK_TYPE_H #ifndef NETWORK_TYPE_H
#define NETWORK_TYPE_H #define NETWORK_TYPE_H