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

Attempt to address Mantis #1905, #1909 

Prevent re-sequencing of resent packets. Thanks, ckrinke, for
catching that, it is what was happening.
0.6.0-stable
Melanie Thielker 2008-08-10 16:37:45 +00:00
parent 5acfc79c50
commit 9b7e66ceda
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
OpenSim/Region/ClientStack/LindenUDP/LLPacketHandler.cs
View File

@ -240,6 +240,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return; return;
} }
packet.Header.Sequence = 0;
lock (m_NeedAck) lock (m_NeedAck)
{ {
DropResend(id); DropResend(id);
@ -724,18 +726,21 @@ namespace OpenSim.Region.ClientStack.LindenUDP
packet.TickCount = System.Environment.TickCount; packet.TickCount = System.Environment.TickCount;
// Assign sequence number here to prevent out of order packets // Assign sequence number here to prevent out of order packets
packet.Header.Sequence = NextPacketSequenceNumber(); if(packet.Header.Sequence == 0)
{
packet.Header.Sequence = NextPacketSequenceNumber();
lock (m_NeedAck) lock (m_NeedAck)
{ {
// We want to see that packet arrive if it's reliable // We want to see that packet arrive if it's reliable
if (packet.Header.Reliable) if (packet.Header.Reliable)
{ {
m_UnackedBytes += packet.ToBytes().Length; m_UnackedBytes += packet.ToBytes().Length;
m_NeedAck[packet.Header.Sequence] = new AckData(packet, m_NeedAck[packet.Header.Sequence] = new AckData(packet,
item.Identifier); item.Identifier);
} }
} }
}
// Actually make the byte array and send it // Actually make the byte array and send it
try try