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

Merge branch 'avination' into ubitwork

avinationmerge
UbitUmarov 2012-07-15 23:00:28 +01:00
parent 2606484e45 b130dcea21
commit 0baa1b557a
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -701,10 +701,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
// UseCircuitCode handling // UseCircuitCode handling
if (packet.Type == PacketType.UseCircuitCode) if (packet.Type == PacketType.UseCircuitCode)
{ {
lock (m_pendingCache)
{
if (m_pendingCache.Contains(address))
return;
m_pendingCache.AddOrUpdate(address, new Queue<UDPPacketBuffer>(), 60);
}
object[] array = new object[] { buffer, packet }; object[] array = new object[] { buffer, packet };
lock (m_pendingCache)
m_pendingCache.AddOrUpdate(address, new Queue<UDPPacketBuffer>(), 60);
Util.FireAndForget(HandleUseCircuitCode, array); Util.FireAndForget(HandleUseCircuitCode, array);
return; return;
@ -718,10 +724,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP
{ {
Queue<UDPPacketBuffer> queue; Queue<UDPPacketBuffer> queue;
if (m_pendingCache.TryGetValue(address, out queue)) if (m_pendingCache.TryGetValue(address, out queue))
{
m_log.DebugFormat("[LLUDPSERVER]: Enqueued a {0} packet into the pending queue", packet.Type);
queue.Enqueue(buffer); queue.Enqueue(buffer);
}
else
{
m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
}
} }
// m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
return; return;
} }
@ -964,10 +976,15 @@ namespace OpenSim.Region.ClientStack.LindenUDP
lock (m_pendingCache) lock (m_pendingCache)
{ {
if (!m_pendingCache.TryGetValue(remoteEndPoint, out queue)) if (!m_pendingCache.TryGetValue(remoteEndPoint, out queue))
{
m_log.DebugFormat("[LLUDPSERVER]: Client created but no pending queue present");
return; return;
}
m_pendingCache.Remove(remoteEndPoint); m_pendingCache.Remove(remoteEndPoint);
} }
m_log.DebugFormat("[LLUDPSERVER]: Client created, processing pending queue, {0} entries", queue.Count);
// Reinject queued packets // Reinject queued packets
while(queue.Count > 0) while(queue.Count > 0)
{ {