OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Packet headers are not zero-encoded so don't try to zero-decode these in PacketPool.GetType() 

Instead adjusts code with that from Packet.BuildHeader(byte[], ref int, ref int):Header in libomv
This stops packet decoding failures with agent UUIDs that contain 00 in their earlier parts (e.g. b0b0b0b0-0000-0000-0000-000000000211)
Thanks to lkalif for pointing this out.
0.7.6-extended
Justin Clark-Casey (justincc) 2013-08-16 00:58:25 +01:00
parent 7c916ab91c
commit 7d268912f1
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
OpenSim/Region/ClientStack/Linden/UDP/PacketPool.cs
View File

@ -145,39 +145,32 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return packet; return packet;
} }
// private byte[] decoded_header = new byte[10];
private static PacketType GetType(byte[] bytes) private static PacketType GetType(byte[] bytes)
{ {
byte[] decoded_header = new byte[10 + 8];
ushort id; ushort id;
PacketFrequency freq; PacketFrequency freq;
bool isZeroCoded = (bytes[0] & Helpers.MSG_ZEROCODED) != 0;
if ((bytes[0] & Helpers.MSG_ZEROCODED) != 0) if (bytes[6] == 0xFF)
{ {
Helpers.ZeroDecode(bytes, 16, decoded_header); if (bytes[7] == 0xFF)
}
else
{
Buffer.BlockCopy(bytes, 0, decoded_header, 0, 10);
}
if (decoded_header[6] == 0xFF)
{
if (decoded_header[7] == 0xFF)
{ {
id = (ushort) ((decoded_header[8] << 8) + decoded_header[9]);
freq = PacketFrequency.Low; freq = PacketFrequency.Low;
if (isZeroCoded && bytes[8] == 0)
id = bytes[10];
else
id = (ushort)((bytes[8] << 8) + bytes[9]);
} }
else else
{ {
id = decoded_header[7];
freq = PacketFrequency.Medium; freq = PacketFrequency.Medium;
id = bytes[7];
} }
} }
else else
{ {
id = decoded_header[6];
freq = PacketFrequency.High; freq = PacketFrequency.High;
id = bytes[6];
} }
return Packet.GetType(id, freq); return Packet.GetType(id, freq);