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

Increase NetPacket size from UInt16 to UInt32

This commit is contained in:
Jérôme Leclercq 2018-09-25 15:51:45 +02:00
parent 974fa07bcb
commit 706a06b506
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Network/NetPacket.hpp
View File

@ -46,10 +46,10 @@ namespace Nz
NetPacket& operator=(const NetPacket&) = delete; NetPacket& operator=(const NetPacket&) = delete;
NetPacket& operator=(NetPacket&& packet); NetPacket& operator=(NetPacket&& packet);
static bool DecodeHeader(const void* data, UInt16* packetSize, UInt16* netCode); static bool DecodeHeader(const void* data, UInt32* packetSize, UInt16* netCode);
static bool EncodeHeader(void* data, UInt16 packetSize, UInt16 netCode); static bool EncodeHeader(void* data, UInt32 packetSize, UInt16 netCode);
static constexpr std::size_t HeaderSize = sizeof(UInt16) + sizeof(UInt16); //< PacketSize + NetCode static constexpr std::size_t HeaderSize = sizeof(UInt32) + sizeof(UInt16); //< PacketSize + NetCode
private: private:
void OnEmptyStream() override; void OnEmptyStream() override;

6
src/Nazara/Network/NetPacket.cpp
View File

@ -45,7 +45,7 @@ namespace Nz
NazaraAssert(m_netCode != NetCode_Invalid, "Invalid NetCode"); NazaraAssert(m_netCode != NetCode_Invalid, "Invalid NetCode");
std::size_t size = m_buffer->GetSize(); std::size_t size = m_buffer->GetSize();
if (!EncodeHeader(m_buffer->GetBuffer(), static_cast<UInt16>(size), m_netCode)) if (!EncodeHeader(m_buffer->GetBuffer(), static_cast<UInt32>(size), m_netCode))
{ {
NazaraError("Failed to encode packet header"); NazaraError("Failed to encode packet header");
return nullptr; return nullptr;
@ -64,7 +64,7 @@ namespace Nz
* \param netCode Packet number * \param netCode Packet number
*/ */
bool NetPacket::DecodeHeader(const void* data, UInt16* packetSize, UInt16* netCode) bool NetPacket::DecodeHeader(const void* data, UInt32* packetSize, UInt16* netCode)
{ {
MemoryView stream(data, HeaderSize); MemoryView stream(data, HeaderSize);
@ -83,7 +83,7 @@ namespace Nz
* \param netCode Packet number * \param netCode Packet number
*/ */
bool NetPacket::EncodeHeader(void* data, UInt16 packetSize, UInt16 netCode) bool NetPacket::EncodeHeader(void* data, UInt32 packetSize, UInt16 netCode)
{ {
MemoryView stream(data, HeaderSize); MemoryView stream(data, HeaderSize);

4
src/Nazara/Network/TcpClient.cpp
View File

@ -244,7 +244,7 @@ namespace Nz
NazaraAssert(m_pendingPacket.received <= NetPacket::HeaderSize, "Received more data than header size"); NazaraAssert(m_pendingPacket.received <= NetPacket::HeaderSize, "Received more data than header size");
if (m_pendingPacket.received >= NetPacket::HeaderSize) if (m_pendingPacket.received >= NetPacket::HeaderSize)
{ {
UInt16 size; UInt32 size;
if (!NetPacket::DecodeHeader(m_pendingPacket.data.GetConstBuffer(), &size, &m_pendingPacket.netcode)) if (!NetPacket::DecodeHeader(m_pendingPacket.data.GetConstBuffer(), &size, &m_pendingPacket.netcode))
{ {
m_lastError = SocketError_Packet; m_lastError = SocketError_Packet;
@ -261,7 +261,7 @@ namespace Nz
// We may have just received the header now // We may have just received the header now
if (m_pendingPacket.headerReceived) if (m_pendingPacket.headerReceived)
{ {
UInt16 packetSize = static_cast<UInt16>(m_pendingPacket.data.GetSize()); //< Total packet size UInt32 packetSize = static_cast<UInt32>(m_pendingPacket.data.GetSize()); //< Total packet size
if (packetSize == 0) if (packetSize == 0)
{ {
// Special case: our packet carry no data // Special case: our packet carry no data

2
src/Nazara/Network/UdpSocket.cpp
View File

@ -182,7 +182,7 @@ namespace Nz
return false; //< No datagram received return false; //< No datagram received
Nz::UInt16 netCode; Nz::UInt16 netCode;
Nz::UInt16 packetSize; Nz::UInt32 packetSize;
if (!NetPacket::DecodeHeader(packet->GetConstData(), &packetSize, &netCode)) if (!NetPacket::DecodeHeader(packet->GetConstData(), &packetSize, &netCode))
{ {
m_lastError = SocketError_Packet; m_lastError = SocketError_Packet;