From e288b2456faf621b8f5a5a33431c8349bab984fc Mon Sep 17 00:00:00 2001 From: truelight Date: Tue, 30 Oct 2007 11:29:01 +0000 Subject: (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 ;) --- src/network/core/config.h | 1 + src/network/network.h | 4 ++-- src/network/network_client.cpp | 2 +- src/network/network_server.cpp | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/network/core/config.h b/src/network/core/config.h index d8dbdb274..6fcbf7da2 100644 --- a/src/network/core/config.h +++ b/src/network/core/config.h @@ -27,6 +27,7 @@ enum { 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_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_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' diff --git a/src/network/network.h b/src/network/network.h index 513c77539..d582dbd68 100644 --- a/src/network/network.h +++ b/src/network/network.h @@ -71,7 +71,7 @@ struct NetworkClientInfo { PlayerID client_playas; // As which player is this client playing (PlayerID) uint32 client_ip; // IP-address of the client (so he can be banned) 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 { @@ -127,7 +127,7 @@ VARDEF char _network_player_name[NETWORK_CLIENT_NAME_LENGTH]; VARDEF char _network_default_ip[NETWORK_HOSTNAME_LENGTH]; 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_max; // To where we may go with our clients diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp index 7f7566963..d7f7a7ee8 100644 --- a/src/network/network_client.cpp +++ b/src/network/network_client.cpp @@ -341,7 +341,7 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CLIENT_INFO) uint16 index = p->Recv_uint16(); PlayerID playas = (Owner)p->Recv_uint8(); 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(unique_id, sizeof(unique_id)); diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp index 5cb176a62..386c243cc 100644 --- a/src/network/network_server.cpp +++ b/src/network/network_server.cpp @@ -619,7 +619,7 @@ DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_NEWGRFS_CHECKED) DEF_SERVER_RECEIVE_COMMAND(PACKET_CLIENT_JOIN) { char name[NETWORK_CLIENT_NAME_LENGTH]; - char unique_id[NETWORK_NAME_LENGTH]; + char unique_id[NETWORK_UNIQUE_ID_LENGTH]; NetworkClientInfo *ci; PlayerID playas; NetworkLanguage client_lang; -- cgit v1.2.3-70-g09d2