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

Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork 

Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
avinationmerge
ubit 2012-07-16 00:34:51 +02:00
parent 13e1635e4d 15a1ad393c
commit 911ca5b806
1 changed files with 36 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -698,9 +698,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
#region Packet to Client Mapping #region Packet to Client Mapping
// If there is already a client for this endpoint, don't process UseCircuitCode
IClientAPI client = null;
if (!m_scene.TryGetClient(address, out client))
{
// UseCircuitCode handling // UseCircuitCode handling
if (packet.Type == PacketType.UseCircuitCode) if (packet.Type == PacketType.UseCircuitCode)
{ {
// And if there is a UseCircuitCode pending, also drop it
lock (m_pendingCache) lock (m_pendingCache)
{ {
if (m_pendingCache.Contains(address)) if (m_pendingCache.Contains(address))
@ -715,33 +720,39 @@ namespace OpenSim.Region.ClientStack.LindenUDP
return; return;
} }
}
// Determine which agent this packet came from // If this is a pending connection, enqueue, don't process yet
IClientAPI client; lock (m_pendingCache)
if (!m_scene.TryGetClient(address, out client) || !(client is LLClientView))
{ {
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
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);
======= =======
lock (m_pendingCache) lock (m_pendingCache)
{ =======
Queue<UDPPacketBuffer> queue; Queue<UDPPacketBuffer> queue;
if (m_pendingCache.TryGetValue(address, out queue)) if (m_pendingCache.TryGetValue(address, out queue))
>>>>>>> 15a1ad393c3748c5c911beac981945a9bd8b200d
{ {
m_log.DebugFormat("[LLUDPSERVER]: Enqueued a {0} packet into the pending queue", packet.Type); //m_log.DebugFormat("[LLUDPSERVER]: Enqueued a {0} packet into the pending queue", packet.Type);
queue.Enqueue(buffer); queue.Enqueue(buffer);
} return;
else
{
m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
} }
} }
<<<<<<< HEAD
<<<<<<< HEAD <<<<<<< HEAD
// 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);
>>>>>>> 2606484e45138adef289386509b1e27552a32aee >>>>>>> 2606484e45138adef289386509b1e27552a32aee
======= =======
>>>>>>> 0baa1b557af20af3590737dc04294a9bdc8e8728 >>>>>>> 0baa1b557af20af3590737dc04294a9bdc8e8728
=======
// Determine which agent this packet came from
if (client == null || !(client is LLClientView))
{
//m_log.Debug("[LLUDPSERVER]: Received a " + packet.Type + " packet from an unrecognized source: " + address + " in " + m_scene.RegionInfo.RegionName);
>>>>>>> 15a1ad393c3748c5c911beac981945a9bd8b200d
return; return;
} }