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

Add a constant for SERVER_GAME_INFO_EXTENDED max version

Browse Source 
Set max version correctly in QueryNetworkGameSocketHandler::SendGameInfo
This commit is contained in:
Jonathan G Rennison
2021-11-02 22:49:26 +00:00
parent 3cff5e53e4
commit eaf5908a0b
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,4 +96,9 @@ static const uint NETWORK_GRF_NAME_LENGTH = 80; ///< Maxim
*/ */
static const uint NETWORK_MAX_GRF_COUNT = 255; static const uint NETWORK_MAX_GRF_COUNT = 255;
/**
* Maximum version supported in PACKET_SERVER_GAME_INFO_EXTENDED
*/
static const uint8 SERVER_GAME_INFO_EXTENDED_MAX_VERSION = 1;
#endif /* NETWORK_CORE_CONFIG_H */ #endif /* NETWORK_CORE_CONFIG_H */

2
src/network/core/game_info.cpp
View File

@@ -434,7 +434,7 @@ void DeserializeNetworkGameInfoExtended(Packet *p, NetworkGameInfo *info)
static const Date MAX_DATE = ConvertYMDToDate(MAX_YEAR, 11, 31); // December is month 11 static const Date MAX_DATE = ConvertYMDToDate(MAX_YEAR, 11, 31); // December is month 11
const uint8 version = p->Recv_uint8(); const uint8 version = p->Recv_uint8();
if (version > 1) return; // Unknown version if (version > SERVER_GAME_INFO_EXTENDED_MAX_VERSION) return; // Unknown version
NewGRFSerializationType newgrf_serialisation = NST_GRFID_MD5; NewGRFSerializationType newgrf_serialisation = NST_GRFID_MD5;

6
src/network/network_query.cpp
View File

@@ -73,9 +73,9 @@ NetworkRecvStatus QueryNetworkGameSocketHandler::SendGameInfo()
{ {
Packet *p = new Packet(PACKET_CLIENT_GAME_INFO); Packet *p = new Packet(PACKET_CLIENT_GAME_INFO);
p->Send_uint32(FIND_SERVER_EXTENDED_TOKEN); p->Send_uint32(FIND_SERVER_EXTENDED_TOKEN);
p->Send_uint8(PACKET_SERVER_GAME_INFO_EXTENDED); // reply type p->Send_uint8(PACKET_SERVER_GAME_INFO_EXTENDED); // reply type
p->Send_uint16(0); // flags p->Send_uint16(0); // flags
p->Send_uint16(0); // version p->Send_uint16(SERVER_GAME_INFO_EXTENDED_MAX_VERSION); // version
this->SendPacket(p); this->SendPacket(p);
return NETWORK_RECV_STATUS_OKAY; return NETWORK_RECV_STATUS_OKAY;