1
0
Fork 0

(svn r11357) -Fix: NetworkUniqueID could be 80 chars, while the max size we generate is 32. So reduce the size a bit. Pointed out by dihedral, so give him a big hug ;)

release/0.6
truelight 2007-10-30 11:29:01 +00:00
parent 0204f501df
commit e288b2456f
4 changed files with 5 additions and 4 deletions

View File

@ -27,6 +27,7 @@ enum {
NETWORK_NAME_LENGTH = 80, ///< The maximum length of the server name and map name, in bytes including '\0' NETWORK_NAME_LENGTH = 80, ///< The maximum length of the server name and map name, in bytes including '\0'
NETWORK_HOSTNAME_LENGTH = 80, ///< The maximum length of the host name, in bytes including '\0' NETWORK_HOSTNAME_LENGTH = 80, ///< The maximum length of the host name, in bytes including '\0'
NETWORK_UNIQUE_ID_LENGTH = 33, ///< The maximum length of the unique id of the clients, in bytes including '\0'
NETWORK_REVISION_LENGTH = 15, ///< The maximum length of the revision, in bytes including '\0' NETWORK_REVISION_LENGTH = 15, ///< The maximum length of the revision, in bytes including '\0'
NETWORK_PASSWORD_LENGTH = 20, ///< The maximum length of the password, in bytes including '\0' NETWORK_PASSWORD_LENGTH = 20, ///< The maximum length of the password, 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_PLAYERS_LENGTH = 200, ///< The maximum length for the list of players that controls a company, in bytes including '\0'

View File

@ -71,7 +71,7 @@ struct NetworkClientInfo {
PlayerID client_playas; // As which player is this client playing (PlayerID) PlayerID client_playas; // As which player is this client playing (PlayerID)
uint32 client_ip; // IP-address of the client (so he can be banned) uint32 client_ip; // IP-address of the client (so he can be banned)
Date join_date; // Gamedate the player has joined Date join_date; // Gamedate the player has joined
char unique_id[NETWORK_NAME_LENGTH]; // Every play sends an unique id so we can indentify him char unique_id[NETWORK_UNIQUE_ID_LENGTH]; // Every play sends an unique id so we can indentify him
}; };
enum NetworkJoinStatus { enum NetworkJoinStatus {
@ -127,7 +127,7 @@ VARDEF char _network_player_name[NETWORK_CLIENT_NAME_LENGTH];
VARDEF char _network_default_ip[NETWORK_HOSTNAME_LENGTH]; VARDEF char _network_default_ip[NETWORK_HOSTNAME_LENGTH];
VARDEF uint16 _network_own_client_index; VARDEF uint16 _network_own_client_index;
VARDEF char _network_unique_id[NETWORK_NAME_LENGTH]; // Our own unique ID VARDEF char _network_unique_id[NETWORK_UNIQUE_ID_LENGTH]; // Our own unique ID
VARDEF uint32 _frame_counter_server; // The frame_counter of the server, if in network-mode VARDEF uint32 _frame_counter_server; // The frame_counter of the server, if in network-mode
VARDEF uint32 _frame_counter_max; // To where we may go with our clients VARDEF uint32 _frame_counter_max; // To where we may go with our clients

View File

@ -341,7 +341,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CLIENT_INFO)
uint16 index = p->Recv_uint16(); uint16 index = p->Recv_uint16();
PlayerID playas = (Owner)p->Recv_uint8(); PlayerID playas = (Owner)p->Recv_uint8();
char name[NETWORK_NAME_LENGTH]; char name[NETWORK_NAME_LENGTH];
char unique_id[NETWORK_NAME_LENGTH]; char unique_id[NETWORK_UNIQUE_ID_LENGTH];
p->Recv_string(name, sizeof(name)); p->Recv_string(name, sizeof(name));
p->Recv_string(unique_id, sizeof(unique_id)); p->Recv_string(unique_id, sizeof(unique_id));

View File

@ -619,7 +619,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_NEWGRFS_CHECKED)
DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_JOIN) DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_JOIN)
{ {
char name[NETWORK_CLIENT_NAME_LENGTH]; char name[NETWORK_CLIENT_NAME_LENGTH];
char unique_id[NETWORK_NAME_LENGTH]; char unique_id[NETWORK_UNIQUE_ID_LENGTH];
NetworkClientInfo *ci; NetworkClientInfo *ci;
PlayerID playas; PlayerID playas;
NetworkLanguage client_lang; NetworkLanguage client_lang;