Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2026-11-04 02:47:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(master): a server list's outdated flags are read all or none

Browse Source 
A list cut short inside the flags was read as if complete; an older master's list, which has none, still
reads. The test checks every cut.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Aaron Kimbrell
2026-09-30 06:32:35 -05:00
parent ebe77ee45c
commit 951edfdde2
2 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dNet/MasterPackets.cpp
View File

@@ -297,7 +297,9 @@ namespace MasterPackets {
VALIDATE_READ(bitStream.Read(endpoint.port)); VALIDATE_READ(bitStream.Read(endpoint.port));
VALIDATE_READ(bitStream.Read(endpoint.host)); VALIDATE_READ(bitStream.Read(endpoint.host));
} }
if (bitStream.GetNumberOfUnreadBits() >= instances.size() * 8) { // Each world's outdated flag, when the master is new enough to send them: all of them or none
if (bitStream.GetNumberOfUnreadBits() > 0) {
if (bitStream.GetNumberOfUnreadBits() < instances.size() * 8) return false;
for (auto& instance : instances) VALIDATE_READ(bitStream.Read(instance.outdated)); for (auto& instance : instances) VALIDATE_READ(bitStream.Read(instance.outdated));
} }
return true; return true;

11
tests/dGameTests/dNetTests/MasterPacketsTests.cpp
View File

@@ -426,7 +426,16 @@ TEST(MasterPacketsTests, ServerListMatchesLegacy) {
EXPECT_EQ(copy.endpoints[i].port, 3000 + i); EXPECT_EQ(copy.endpoints[i].port, 3000 + i);
EXPECT_EQ(copy.endpoints[i].host.string, i == 2 ? "192.168.1.20" : "localhost"); EXPECT_EQ(copy.endpoints[i].host.string, i == 2 ? "192.168.1.20" : "localhost");
} }
ExpectTruncatedFails(response); // Cut short anywhere it fails, except exactly before the outdated flags (an older master's list), which reads
RakNet::BitStream full;
response.Serialize(full);
const auto olderMaster = full.GetNumberOfBitsUsed() - static_cast<uint32_t>(count) * 8;
for (uint32_t bits = 0; bits < full.GetNumberOfBitsUsed(); bits++) {
RakNet::BitStream prefix;
prefix.WriteBits(full.GetData(), bits, false);
MasterPackets::ServerListResponse cut;
EXPECT_EQ(cut.Deserialize(prefix), bits == olderMaster && count > 0) << "read from only " << bits << " bits";
}
} }
} }