1.8 Protocol: Fixed problems with no-payload packets.
This commit is contained in:
parent
a518a83c25
commit
aeabc4ff6b
@ -1711,7 +1711,7 @@ void cProtocol180::AddReceivedData(const char * a_Data, size_t a_Size)
|
|||||||
m_ReceivedData.ResetRead();
|
m_ReceivedData.ResetRead();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
cByteBuffer bb(PacketLen);
|
cByteBuffer bb(PacketLen + 1);
|
||||||
VERIFY(m_ReceivedData.ReadToByteBuffer(bb, (int)PacketLen));
|
VERIFY(m_ReceivedData.ReadToByteBuffer(bb, (int)PacketLen));
|
||||||
m_ReceivedData.CommitRead();
|
m_ReceivedData.CommitRead();
|
||||||
|
|
||||||
@ -1726,9 +1726,6 @@ void cProtocol180::AddReceivedData(const char * a_Data, size_t a_Size)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write one NUL extra, so that we can detect over-reads
|
|
||||||
bb.Write("\0", 1);
|
|
||||||
|
|
||||||
UInt32 PacketType;
|
UInt32 PacketType;
|
||||||
if (!bb.ReadVarInt(PacketType))
|
if (!bb.ReadVarInt(PacketType))
|
||||||
{
|
{
|
||||||
@ -1736,6 +1733,9 @@ void cProtocol180::AddReceivedData(const char * a_Data, size_t a_Size)
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Write one NUL extra, so that we can detect over-reads
|
||||||
|
bb.Write("\0", 1);
|
||||||
|
|
||||||
// Log the packet info into the comm log file:
|
// Log the packet info into the comm log file:
|
||||||
if (g_ShouldLogCommIn)
|
if (g_ShouldLogCommIn)
|
||||||
{
|
{
|
||||||
@ -1743,7 +1743,7 @@ void cProtocol180::AddReceivedData(const char * a_Data, size_t a_Size)
|
|||||||
bb.ReadAll(PacketData);
|
bb.ReadAll(PacketData);
|
||||||
bb.ResetRead();
|
bb.ResetRead();
|
||||||
bb.ReadVarInt(PacketType);
|
bb.ReadVarInt(PacketType);
|
||||||
ASSERT(PacketData.size() > 0);
|
ASSERT(PacketData.size() > 0); // We have written an extra NUL, so there had to be at least one byte read
|
||||||
PacketData.resize(PacketData.size() - 1);
|
PacketData.resize(PacketData.size() - 1);
|
||||||
AString PacketDataHex;
|
AString PacketDataHex;
|
||||||
CreateHexDump(PacketDataHex, PacketData.data(), PacketData.size(), 16);
|
CreateHexDump(PacketDataHex, PacketData.data(), PacketData.size(), 16);
|
||||||
@ -1777,7 +1777,8 @@ void cProtocol180::AddReceivedData(const char * a_Data, size_t a_Size)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bb.GetReadableSpace() != 0)
|
// The packet should have 1 byte left in the buffer - the NUL we had added
|
||||||
|
if (bb.GetReadableSpace() != 1)
|
||||||
{
|
{
|
||||||
// Read more or less than packet length, report as error
|
// Read more or less than packet length, report as error
|
||||||
LOGWARNING("Protocol 1.8: Wrong number of bytes read for packet 0x%x, state %d. Read " SIZE_T_FMT " bytes, packet contained %u bytes",
|
LOGWARNING("Protocol 1.8: Wrong number of bytes read for packet 0x%x, state %d. Read " SIZE_T_FMT " bytes, packet contained %u bytes",
|
||||||
|
Loading…
Reference in New Issue
Block a user