BeamMP/BeamMP-Server
1
0
Fork 0
mirror of https://github.com/BeamMP/BeamMP-Server.git synced 2025-07-03 16:25:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

add explanative debug messages to parse errors in GetPidVid

Browse Source
This commit is contained in:
Lion Kortlepel 2022-11-10 18:52:37 +01:00
parent dff94a41be
commit 13a86d3e77
No known key found for this signature in database
GPG Key ID: 4322FF2B4C71259B
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/TServer.cpp
View File

@ -34,18 +34,20 @@ static std::optional<std::pair<int, int>> GetPidVid(const std::string& str) {
if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) { if (pid.find_first_not_of("0123456789") == std::string::npos && vid.find_first_not_of("0123456789") == std::string::npos) {
try { try {
int PID = stoi(pid); int PID = std::stoi(pid);
int VID = stoi(vid); int VID = std::stoi(vid);
return { { PID, VID } }; return { { PID, VID } };
} catch (const std::exception&) { } catch (const std::exception&) {
beammp_debugf("Invalid packet: Could not parse pid/vid from packet, as one or both are not valid numbers: '{}'", str);
return std::nullopt; return std::nullopt;
} }
} }
beammp_debugf("Invalid packet: Could not parse pid/vid from packet: '{}'", str);
return std::nullopt; return std::nullopt;
} }
static std::optional<VehiclePacket> ParseVehiclePacket(const std::string& Packet, const int playerID) { static std::optional<VehiclePacket> ParseVehiclePacket(const std::string& Packet, const int playerID) {
if (Packet.size() < 8) { //2 for code, 3<= for pidvid, 1<= for data, 2 for dividers if (Packet.size() < 8) { // 2 for code, 3<= for pidvid, 1<= for data, 2 for dividers
// invalid packet // invalid packet
return std::nullopt; return std::nullopt;
} }
@ -74,7 +76,7 @@ static std::optional<VehiclePacket> ParseVehiclePacket(const std::string& Packet
std::tie(PID, VID) = MaybePidVid.value(); std::tie(PID, VID) = MaybePidVid.value();
if (PID == playerID) { if (PID == playerID) {
return { {Data, PID, VID} }; //std::vector<char>(Data.begin(), Data.end()) return { { Data, PID, VID } }; // std::vector<char>(Data.begin(), Data.end())
} }
} }
return std::nullopt; return std::nullopt;
@ -231,7 +233,7 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
// V to Y // V to Y
if (Code <= 89 && Code >= 86) { if (Code <= 89 && Code >= 86) {
if (HandleVehicleUpdate(StringPacket, LockedClient->GetID())){ if (HandleVehicleUpdate(StringPacket, LockedClient->GetID())) {
Network.SendToAll(LockedClient.get(), Packet, false, false); Network.SendToAll(LockedClient.get(), Packet, false, false);
} else { } else {
beammp_debugf("Invalid vehicle update packet received from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID()); beammp_debugf("Invalid vehicle update packet received from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());
@ -294,7 +296,7 @@ void TServer::GlobalParser(const std::weak_ptr<TClient>& Client, std::vector<uin
Network.SendToAll(LockedClient.get(), Packet, false, true); Network.SendToAll(LockedClient.get(), Packet, false, true);
return; return;
case 'Z': // position packet case 'Z': // position packet
if (HandlePosition(*LockedClient, StringPacket)){ if (HandlePosition(*LockedClient, StringPacket)) {
Network.SendToAll(LockedClient.get(), Packet, false, false); Network.SendToAll(LockedClient.get(), Packet, false, false);
} else { } else {
beammp_debugf("Invalid vehicle position packet received from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID()); beammp_debugf("Invalid vehicle position packet received from '{}' ({}), ignoring it", LockedClient->GetName(), LockedClient->GetID());