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

Fix mishandling of PACKET_SERVER_MAP_BEGIN queuing at server

Browse Source 
This could result in broken packet framing in the TCP stream
This commit is contained in:
Jonathan G Rennison
2021-05-21 00:58:24 +01:00
parent 7c706923f8
commit 7677d2d01a
3 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/network/core/tcp.cpp
View File

@@ -67,12 +67,28 @@ void NetworkTCPSocketHandler::SendPacket(std::unique_ptr<Packet> packet)
* if the OS-network-buffer is full)
* @param packet the packet to send
*/
void NetworkTCPSocketHandler::SendPrependPacket(std::unique_ptr<Packet> packet)
void NetworkTCPSocketHandler::SendPrependPacket(std::unique_ptr<Packet> packet, int queue_after_packet_type)
{
assert(packet != nullptr);
packet->PrepareToSend();
if (queue_after_packet_type >= 0) {
for (auto iter = this->packet_queue.begin(); iter != this->packet_queue.end(); ++iter) {
if ((*iter)->GetPacketType() == queue_after_packet_type) {
++iter;
this->packet_queue.insert(iter, std::move(packet));
return;
}
}
}
/* The very first packet in the queue may be partially written out, so cannot be replaced.
* If the queue is non-empty, swap packet with the first packet in the queue.
* The insert the packet (either the incoming packet or the previous first packet) at the front. */
if (!this->packet_queue.empty()) {
packet.swap(this->packet_queue.front());
}
this->packet_queue.push_front(std::move(packet));
}

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

@@ -44,7 +44,7 @@ public:
NetworkRecvStatus CloseConnection(bool error = true) override;
void SendPacket(std::unique_ptr<Packet> packet);
void SendPrependPacket(std::unique_ptr<Packet> packet);
void SendPrependPacket(std::unique_ptr<Packet> packet, int queue_after_packet_type);
void SendPacket(Packet *packet)
{