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

Fix flags field not being received in Reply_CLIENT_FIND_SERVER_extended

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-11-27 18:46:48 +00:00
parent b1190b32b0
commit a6c5951b2f
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -266,7 +266,7 @@ void NetworkUDPSocketHandler::SendNetworkGameInfo(Packet *p, const NetworkGameIn
* @param p the packet to write the data to * @param p the packet to write the data to
* @param info the NetworkGameInfo struct to serialize * @param info the NetworkGameInfo struct to serialize
*/ */
void NetworkUDPSocketHandler::SendNetworkGameInfoExtended(Packet *p, const NetworkGameInfo *info, uint16 version) void NetworkUDPSocketHandler::SendNetworkGameInfoExtended(Packet *p, const NetworkGameInfo *info, uint16 flags, uint16 version)
{ {
p->Send_uint8(0); // version num p->Send_uint8(0); // version num

2
src/network/core/udp.h
View File

@@ -264,7 +264,7 @@ public:
void ReceivePackets(); void ReceivePackets();
void SendNetworkGameInfo(Packet *p, const NetworkGameInfo *info); void SendNetworkGameInfo(Packet *p, const NetworkGameInfo *info);
void SendNetworkGameInfoExtended(Packet *p, const NetworkGameInfo *info, uint16 version); void SendNetworkGameInfoExtended(Packet *p, const NetworkGameInfo *info, uint16 flags, uint16 version);
void ReceiveNetworkGameInfo(Packet *p, NetworkGameInfo *info); void ReceiveNetworkGameInfo(Packet *p, NetworkGameInfo *info);
void ReceiveNetworkGameInfoExtended(Packet *p, NetworkGameInfo *info); void ReceiveNetworkGameInfoExtended(Packet *p, NetworkGameInfo *info);
}; };

3
src/network/network_udp.cpp
View File

@@ -225,10 +225,11 @@ void ServerNetworkUDPSocketHandler::Receive_CLIENT_FIND_SERVER(Packet *p, Networ
void ServerNetworkUDPSocketHandler::Reply_CLIENT_FIND_SERVER_extended(Packet *p, NetworkAddress *client_addr, NetworkGameInfo *ngi) void ServerNetworkUDPSocketHandler::Reply_CLIENT_FIND_SERVER_extended(Packet *p, NetworkAddress *client_addr, NetworkGameInfo *ngi)
{ {
uint16 flags = p->Recv_uint16();
uint16 version = p->Recv_uint16(); uint16 version = p->Recv_uint16();
Packet packet(PACKET_UDP_EX_SERVER_RESPONSE); Packet packet(PACKET_UDP_EX_SERVER_RESPONSE);
this->SendNetworkGameInfoExtended(&packet, ngi, version); this->SendNetworkGameInfoExtended(&packet, ngi, flags, version);
/* Let the client know that we are here */ /* Let the client know that we are here */
this->SendPacket(&packet, client_addr); this->SendPacket(&packet, client_addr);