[7968] In packet compression use real writed data size. Author: VladimirMangos
--HG-- branch : trunk
This commit is contained in:
@@ -105,7 +105,7 @@ void UpdateData::Compress(void* dst, uint32 *dst_size, void* src, int src_size)
|
|||||||
|
|
||||||
bool UpdateData::BuildPacket(WorldPacket *packet)
|
bool UpdateData::BuildPacket(WorldPacket *packet)
|
||||||
{
|
{
|
||||||
ByteBuffer buf(m_data.size() + 10 + m_outOfRangeGUIDs.size()*8);
|
ByteBuffer buf(4+(m_outOfRangeGUIDs.empty() ? 0 : 1+4+9*m_outOfRangeGUIDs.size())+m_data.wpos());
|
||||||
|
|
||||||
buf << (uint32) (!m_outOfRangeGUIDs.empty() ? m_blockCount + 1 : m_blockCount);
|
buf << (uint32) (!m_outOfRangeGUIDs.empty() ? m_blockCount + 1 : m_blockCount);
|
||||||
|
|
||||||
@@ -124,15 +124,14 @@ bool UpdateData::BuildPacket(WorldPacket *packet)
|
|||||||
|
|
||||||
packet->clear();
|
packet->clear();
|
||||||
|
|
||||||
size_t pSize = buf.size();
|
size_t pSize = buf.wpos(); // use real used data size
|
||||||
|
|
||||||
if (pSize > 100 ) // compress large packets
|
if (pSize > 100 ) // compress large packets
|
||||||
{
|
{
|
||||||
packet->resize(pSize * 1.1f + 16);
|
uint32 destsize = pSize;
|
||||||
|
packet->resize( destsize + sizeof(uint32) );
|
||||||
|
|
||||||
packet->put<uint32>(0, pSize);
|
packet->put<uint32>(0, pSize);
|
||||||
|
|
||||||
uint32 destsize = pSize;
|
|
||||||
Compress(const_cast<uint8*>(packet->contents()) + sizeof(uint32), &destsize, (void*)buf.contents(), pSize);
|
Compress(const_cast<uint8*>(packet->contents()) + sizeof(uint32), &destsize, (void*)buf.contents(), pSize);
|
||||||
if (destsize == 0)
|
if (destsize == 0)
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -311,7 +311,7 @@ class ByteBuffer
|
|||||||
}
|
}
|
||||||
void append(const ByteBuffer& buffer)
|
void append(const ByteBuffer& buffer)
|
||||||
{
|
{
|
||||||
if(buffer.size()) append(buffer.contents(),buffer.wpos());
|
if(buffer.wpos()) append(buffer.contents(),buffer.wpos());
|
||||||
}
|
}
|
||||||
|
|
||||||
void appendPackGUID(uint64 guid)
|
void appendPackGUID(uint64 guid)
|
||||||
|
|||||||
Reference in New Issue
Block a user