From 2c804dd34a58ff9702bd1ab2cab30f6a61503638 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Mon, 9 Sep 2019 18:22:37 +0200 Subject: Protocol: Use logical outgoing packet types. --- src/Protocol/ProtocolRecognizer.cpp | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'src/Protocol/ProtocolRecognizer.cpp') diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp index a8d8b4cf5..9bfa0f105 100644 --- a/src/Protocol/ProtocolRecognizer.cpp +++ b/src/Protocol/ProtocolRecognizer.cpp @@ -281,7 +281,7 @@ void cProtocolRecognizer::SendDisconnect(const AString & a_Reason) else { AString Message = Printf("{\"text\":\"%s\"}", EscapeString(a_Reason).c_str()); - cPacketizer Pkt(*this, 0x00); // Disconnect packet (in login state) + cPacketizer Pkt(*this, pktDisconnectDuringLogin); Pkt.WriteString(Message); } } @@ -1196,6 +1196,25 @@ void cProtocolRecognizer::SendPacket(cPacketizer & a_Pkt) +UInt32 cProtocolRecognizer::GetPacketID(ePacketType a_PacketType) +{ + switch (a_PacketType) + { + case pktDisconnectDuringLogin: return 0x00; + case pktStatusResponse: return 0x00; + case pktPingResponse: return 0x01; + default: + { + ASSERT(!"cProtocolRecognizer::GetPacketID() called for an unhandled packet"); + return 0; + } + } +} + + + + + void cProtocolRecognizer::HandlePacketStatusRequest(void) { cServer * Server = cRoot::Get()->GetServer(); @@ -1233,7 +1252,7 @@ void cProtocolRecognizer::HandlePacketStatusRequest(void) Json::FastWriter Writer; AString Response = Writer.write(ResponseValue); - cPacketizer Pkt(*this, 0x00); // Response packet + cPacketizer Pkt(*this, pktStatusResponse); Pkt.WriteString(Response); } @@ -1249,6 +1268,6 @@ void cProtocolRecognizer::HandlePacketStatusPing() return; } - cPacketizer Pkt(*this, 0x01); // Pong packet + cPacketizer Pkt(*this, pktPingResponse); Pkt.WriteBEInt64(Timestamp); } -- cgit v1.2.3