sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Network/ENetHost: Fix compression callbacks

This commit is contained in:
Jérôme Leclercq 2017-10-06 14:04:36 +02:00
parent f42be919e6
commit 1f48ec4099
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Nazara/Network/ENetHost.cpp
View File

@ -201,7 +201,7 @@ namespace Nz
{ {
m_serviceTime = GetElapsedMilliseconds(); m_serviceTime = GetElapsedMilliseconds();
SendOutgoingCommands(nullptr, 0); SendOutgoingCommands(nullptr, false);
} }
int ENetHost::Service(ENetEvent* event, UInt32 timeout) int ENetHost::Service(ENetEvent* event, UInt32 timeout)
@ -526,7 +526,7 @@ namespace Nz
if (!m_compressor) if (!m_compressor)
return false; return false;
std::size_t newSize = m_compressor->Decompress(peer, m_receivedData, m_receivedDataLength, m_packetData[1].data() + headerSize, m_packetData[1].size() - headerSize); std::size_t newSize = m_compressor->Decompress(peer, m_receivedData + headerSize, m_receivedDataLength - headerSize, m_packetData[1].data() + headerSize, m_packetData[1].size() - headerSize);
if (newSize == 0 || newSize > m_packetData[1].size() - headerSize) if (newSize == 0 || newSize > m_packetData[1].size() - headerSize)
return false; return false;
@ -1041,7 +1041,7 @@ namespace Nz
std::size_t compressedSize = 0; std::size_t compressedSize = 0;
if (m_compressor) if (m_compressor)
{ {
compressedSize = m_compressor->Compress(currentPeer, &m_buffers[1], m_bufferCount, m_packetSize - sizeof(ENetProtocolHeader), m_packetData[1].data(), m_packetData[1].size()); compressedSize = m_compressor->Compress(currentPeer, &m_buffers[1], m_bufferCount - 1, m_packetSize - sizeof(ENetProtocolHeader), m_packetData[1].data(), m_packetData[1].size());
if (compressedSize > 0) if (compressedSize > 0)
m_headerFlags |= ENetProtocolHeaderFlag_Compressed; m_headerFlags |= ENetProtocolHeaderFlag_Compressed;
} }
@ -1181,6 +1181,8 @@ namespace Nz
buffer.data = &command; buffer.data = &command;
buffer.dataLength = commandSize; buffer.dataLength = commandSize;
m_packetSize += buffer.dataLength;
command = outgoingCommand->command; command = outgoingCommand->command;
if (outgoingCommand->packet) if (outgoingCommand->packet)