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

avoid duplicated udpbuffer free that may still happen

master
UbitUmarov 2020-03-04 22:39:44 +00:00
parent 8728e4cf2f
commit 1df06f459a
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
View File

@ -4831,11 +4831,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// because we are requeuing the list of updates. They will be resent in new packets // because we are requeuing the list of updates. They will be resent in new packets
// with the most recent state and priority. // with the most recent state and priority.
m_udpClient.NeedAcks.Remove(oPacket.SequenceNumber); m_udpClient.NeedAcks.Remove(oPacket.SequenceNumber);
if(oPacket.Buffer == null) if (oPacket.Buffer == null)
return; return;
m_udpClient.FreeUDPBuffer(oPacket.Buffer);
// Count this as a resent packet since we are going to requeue all of the updates contained in it // Count this as a resent packet since we are going to requeue all of the updates contained in it
Interlocked.Increment(ref m_udpClient.PacketsResent); Interlocked.Increment(ref m_udpClient.PacketsResent);

3
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
View File

@ -1188,8 +1188,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
SyncSend(buffer); SyncSend(buffer);
// Keep track of when this packet was sent out (right now) // Keep track of when this packet was sent out (right now)
int enow = Environment.TickCount & Int32.MaxValue; Interlocked.Exchange(ref outgoingPacket.TickCount, Environment.TickCount & Int32.MaxValue);
Interlocked.Exchange(ref outgoingPacket.TickCount, enow);
if (outgoingPacket.UnackedMethod == null) if (outgoingPacket.UnackedMethod == null)
FreeUDPBuffer(buffer); FreeUDPBuffer(buffer);

6
OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs
View File

@ -192,6 +192,7 @@ namespace OpenMetaverse
m_udpBuffersPool[m_udpBuffersPoolPtr] = null; m_udpBuffersPool[m_udpBuffersPoolPtr] = null;
m_udpBuffersPoolPtr--; m_udpBuffersPoolPtr--;
buf.RemoteEndPoint = remoteEndpoint; buf.RemoteEndPoint = remoteEndpoint;
buf.DataLength = 0;
return buf; return buf;
} }
} }
@ -202,10 +203,13 @@ namespace OpenMetaverse
{ {
lock (m_udpBuffersPoolLock) lock (m_udpBuffersPoolLock)
{ {
if(buf.DataLength < 0)
return; // avoid duplicated free that may still happen
if (m_udpBuffersPoolPtr < 999) if (m_udpBuffersPoolPtr < 999)
{ {
buf.RemoteEndPoint = null; buf.RemoteEndPoint = null;
buf.DataLength = 0; buf.DataLength = -1;
m_udpBuffersPoolPtr++; m_udpBuffersPoolPtr++;
m_udpBuffersPool[m_udpBuffersPoolPtr] = buf; m_udpBuffersPool[m_udpBuffersPoolPtr] = buf;
} }

2
OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs
View File

@ -215,7 +215,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
if (m_packets.TryGetValue(pendingRemove, out OutgoingPacket removedPacket)) if (m_packets.TryGetValue(pendingRemove, out OutgoingPacket removedPacket))
{ {
m_packets.Remove(pendingRemove); m_packets.Remove(pendingRemove);
if (removedPacket != null) if (removedPacket != null && removedPacket.Buffer != null)
{ {
// Update stats // Update stats
Interlocked.Add(ref removedPacket.Client.UnackedBytes, -removedPacket.Buffer.DataLength); Interlocked.Add(ref removedPacket.Client.UnackedBytes, -removedPacket.Buffer.DataLength);