ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-05 00:46:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Committing ahzz's patch #619 - Description:

Browse Source 
Patch provided by Openlifegrid.com 
Adds locks around clientCircuits and clientCircuits_reverse Adds existance check on adding to clientCircuits for clients resending UseCircuit packet.
Adds locks around Clientmanager.m_clients for add/remove/tryGet calls
This commit is contained in:
Teravus Ovares
2008-02-18 21:24:34 +00:00
parent 056f3dca2c
commit d0b218f667
2 changed files with 48 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
OpenSim/Region/ClientStack/UDPServer.cs
View File

@@ -311,9 +311,12 @@ namespace OpenSim.Region.ClientStack
private void CloseEndPoint(EndPoint sender)
{
uint circuit;
if (clientCircuits.TryGetValue(sender, out circuit))
lock (clientCircuits)
{
m_packetServer.CloseCircuit(circuit);
if (clientCircuits.TryGetValue(sender, out circuit))
{
m_packetServer.CloseCircuit(circuit);
}
}
}
@@ -322,12 +325,17 @@ namespace OpenSim.Region.ClientStack
UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet;
lock (clientCircuits)
{
clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
if (!clientCircuits.ContainsKey(epSender))
clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
else
m_log.Error("[UDPSERVER]: clientCircuits already contans entry for user " + useCircuit.CircuitCode.Code.ToString() + ". NOT adding.");
}
lock (clientCircuits_reverse)
{
if (!clientCircuits_reverse.ContainsKey(useCircuit.CircuitCode.Code))
clientCircuits_reverse.Add(useCircuit.CircuitCode.Code, epSender);
clientCircuits_reverse.Add(useCircuit.CircuitCode.Code, epSender);
else
m_log.Error("[UDPSERVER]: clientCurcuits_reverse already contains entry for user " + useCircuit.CircuitCode.Code.ToString() + ". NOT adding.");
}
PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_authenticateSessionsClass);
@@ -380,22 +388,28 @@ namespace OpenSim.Region.ClientStack
{
// find the endpoint for this circuit
EndPoint sendto = null;
if (clientCircuits_reverse.TryGetValue(circuitcode, out sendto))
lock (clientCircuits_reverse)
{
//we found the endpoint so send the packet to it
Server.SendTo(buffer, size, flags, sendto);
if (clientCircuits_reverse.TryGetValue(circuitcode, out sendto))
{
//we found the endpoint so send the packet to it
Server.SendTo(buffer, size, flags, sendto);
}
}
}
public virtual void RemoveClientCircuit(uint circuitcode)
{
EndPoint sendto = null;
if (clientCircuits_reverse.TryGetValue(circuitcode, out sendto))
lock (clientCircuits_reverse)
{
clientCircuits.Remove(sendto);
if (clientCircuits_reverse.TryGetValue(circuitcode, out sendto))
{
clientCircuits.Remove(sendto);
clientCircuits_reverse.Remove(circuitcode);
clientCircuits_reverse.Remove(circuitcode);
}
}
}
}