Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 01:15:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Core/NetworkIO: Restored world packet compression

Browse Source
This commit is contained in:
Shauren
2014-07-21 18:54:48 +02:00
parent 3b32053c59
commit 4f6db255a2
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/server/game/Server/WorldSocket.cpp
View File

@@ -201,16 +201,24 @@ void WorldSocket::AsyncWrite(WorldPacket const& packet)
if (sPacketLog->CanLogPacket())
sPacketLog->LogPacket(packet, SERVER_TO_CLIENT);
TC_LOG_TRACE("network.opcode", "S->C: %s %s", (_worldSession ? _worldSession->GetPlayerInfo() : GetRemoteIpAddress()).c_str(), GetOpcodeNameForLogging(packet.GetOpcode()).c_str());
WorldPacket* pkt = &packet;
WorldPacket buff; // Empty buffer used in case packet should be compressed
if (_worldSession && packet.size() > 0x400)
{
buff.Compress(_worldSession->GetCompressionStream(), pkt);
pkt = &buff;
}
ServerPktHeader header(packet.size() + 2, packet.GetOpcode());
TC_LOG_TRACE("network.opcode", "S->C: %s %s", (_worldSession ? _worldSession->GetPlayerInfo() : GetRemoteIpAddress()).c_str(), GetOpcodeNameForLogging(pkt->GetOpcode()).c_str());
ServerPktHeader header(pkt->size() + 2, pkt->GetOpcode());
_authCrypt.EncryptSend((uint8*)header.header, header.getHeaderLength());
auto data = new char[header.getHeaderLength() + packet.size()];
auto data = new char[header.getHeaderLength() + pkt->size()];
std::memcpy(data, (char*)header.header, header.getHeaderLength());
if (!packet.empty())
std::memcpy(data + header.getHeaderLength(), (char const*)packet.contents(), packet.size());
if (!pkt->empty())
std::memcpy(data + header.getHeaderLength(), (char const*)pkt->contents(), pkt->size());
// Use a shared_ptr here to prevent leaking memory after the async operation has completed
std::shared_ptr<char> buffer(data, [=](char* _b)
@@ -220,7 +228,7 @@ void WorldSocket::AsyncWrite(WorldPacket const& packet)
auto self(shared_from_this());
boost::asio::async_write(_socket, boost::asio::buffer(buffer.get(), header.getHeaderLength() + packet.size()), [this, self, buffer](boost::system::error_code error, std::size_t /*length*/)
boost::asio::async_write(_socket, boost::asio::buffer(buffer.get(), header.getHeaderLength() + pkt->size()), [this, self, buffer](boost::system::error_code error, std::size_t /*length*/)
{
if (error)
{