mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #15124 from ZehMatt/fuzzer-fixes 

Small network fixes
This commit is contained in:
ζeh Matt 2021-07-30 11:26:58 -07:00 committed by GitHub
parent 43b7c3a204 dd2ffec14b
commit 07bfe11847
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/openrct2/network/NetworkBase.cpp
View File

@ -49,6 +49,10 @@ static int32_t _pickup_peep_old_x = LOCATION_NULL;
// with uint16_t and needs some spare room for other data in the packet.
static constexpr uint32_t CHUNK_SIZE = 1024 * 63;
// If data is sent fast enough it would halt the entire server, process only a maximum amount.
// This limit is per connection, the current value was determined by tests with fuzzing.
static constexpr uint32_t MaxPacketsPerUpdate = 100;
# include "../Cheats.h"
# include "../ParkImporter.h"
# include "../Version.h"
@ -1654,8 +1658,11 @@ void NetworkBase::Server_Send_EVENT_PLAYER_DISCONNECTED(const char* playerName,
bool NetworkBase::ProcessConnection(NetworkConnection& connection)
{
NetworkReadPacket packetStatus;
uint32_t countProcessed = 0;
do
{
countProcessed++;
packetStatus = connection.ReadPacket();
switch (packetStatus)
{
@ -1681,7 +1688,7 @@ bool NetworkBase::ProcessConnection(NetworkConnection& connection)
// could not read anything from socket
break;
}
} while (packetStatus == NetworkReadPacket::Success);
} while (packetStatus == NetworkReadPacket::Success && countProcessed < MaxPacketsPerUpdate);
if (!connection.ReceivedPacketRecently())
{
@ -1698,13 +1705,21 @@ bool NetworkBase::ProcessConnection(NetworkConnection& connection)
void NetworkBase::ProcessPacket(NetworkConnection& connection, NetworkPacket& packet)
{
const auto& handlerList = GetMode() == NETWORK_MODE_SERVER ? server_command_handlers : client_command_handlers;
auto it = handlerList.find(packet.GetCommand());
if (it != handlerList.end())
{
auto commandHandler = it->second;
if (connection.AuthStatus == NetworkAuth::Ok || !packet.CommandRequiresAuth())
{
(this->*commandHandler)(connection, packet);
try
{
(this->*commandHandler)(connection, packet);
}
catch (const std::exception& ex)
{
log_verbose("Exception during packet processing: %s", ex.what());
}
}
}