Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-28 12:52:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Battle.net/Packets: Added packet name mapping for logging

Browse Source
This commit is contained in:
Shauren
2014-10-12 20:58:25 +02:00
parent 5f2252e863
commit cf521de9cb
10 changed files with 439 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/server/bnetserver/Server/Session.cpp
View File

@@ -17,7 +17,7 @@
#include "AuthCodes.h"
#include "BitStream.h"
#include "PacketFactory.h"
#include "PacketManager.h"
#include "SessionManager.h"
#include "Database/DatabaseEnv.h"
#include "HmacHash.h"
@@ -88,9 +88,9 @@ void Battlenet::Session::_SetVSFields(std::string const& pstr)
LoginDatabase.Execute(stmt);
}
void Battlenet::Session::LogUnhandledPacket(ClientPacket const& packet)
void Battlenet::Session::LogUnhandledPacket(PacketHeader const& header)
{
TC_LOG_DEBUG("session.packets", "%s Received unhandled packet %s", GetClientInfo().c_str(), packet.ToString().c_str());
TC_LOG_DEBUG("session.packets", "%s Received unhandled packet %s", GetClientInfo().c_str(), sPacketManager.GetClientPacketName(header));
}
void Battlenet::Session::HandleLogonRequest(Authentication::LogonRequest const& logonRequest)
@@ -477,6 +477,22 @@ void Battlenet::Session::HandleSocialNetworkCheckConnected(Friends::SocialNetwor
AsyncWrite(socialNetworkCheckConnectedResult);
}
inline std::string PacketToStringHelper(Battlenet::ClientPacket const* packet)
{
if (sLog->ShouldLog("session.packets", LOG_LEVEL_TRACE))
return packet->ToString();
return sPacketManager.GetClientPacketName(packet->GetHeader());
}
inline std::string PacketToStringHelper(Battlenet::ServerPacket const* packet)
{
if (sLog->ShouldLog("session.packets", LOG_LEVEL_TRACE))
return packet->ToString();
return sPacketManager.GetServerPacketName(packet->GetHeader());
}
void Battlenet::Session::ReadHandler()
{
BitStream stream(std::move(GetReadBuffer()));
@@ -498,14 +514,19 @@ void Battlenet::Session::ReadHandler()
return;
}
if (ClientPacket* packet = sPacketFactory.Create(header, stream))
if (ClientPacket* packet = sPacketManager.CreateClientPacket(header, stream))
{
packet->CallHandler(this);
if (packet->WasHandled())
TC_LOG_TRACE("session.packets", "%s Received %s", GetClientInfo().c_str(), packet->ToString().c_str());
if (sPacketManager.IsHandled(header))
TC_LOG_DEBUG("session.packets", "%s Received %s", GetClientInfo().c_str(), PacketToStringHelper(packet).c_str());
packet->CallHandler(this);
delete packet;
}
else if (sPacketManager.GetClientPacketName(header))
{
LogUnhandledPacket(header);
break;
}
else
{
TC_LOG_DEBUG("session.packets", "%s Received unknown %s", GetClientInfo().c_str(), header.ToString().c_str());
@@ -540,7 +561,7 @@ void Battlenet::Session::AsyncWrite(ServerPacket* packet)
return;
}
TC_LOG_TRACE("session.packets", "%s Sending %s", GetClientInfo().c_str(), packet->ToString().c_str());
TC_LOG_DEBUG("session.packets", "%s Sending %s", GetClientInfo().c_str(), PacketToStringHelper(packet).c_str());
packet->Write();