Simplified LLUDPClientCollection from three collections down to one. This will prevent any potential problems from inconsistency between the internal collections
parent
3a04d706c9
commit
56a27c37d3
|
@ -119,6 +119,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
|
|
||||||
#region Properties
|
#region Properties
|
||||||
|
|
||||||
|
public LLUDPClient UDPClient { get { return m_udpClient; } }
|
||||||
public UUID SecureSessionId { get { return m_secureSessionId; } }
|
public UUID SecureSessionId { get { return m_secureSessionId; } }
|
||||||
public IScene Scene { get { return m_scene; } }
|
public IScene Scene { get { return m_scene; } }
|
||||||
public UUID SessionId { get { return m_sessionId; } }
|
public UUID SessionId { get { return m_sessionId; } }
|
||||||
|
@ -504,7 +505,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
+ "Any further actions taken will not be processed.\n"
|
+ "Any further actions taken will not be processed.\n"
|
||||||
+ "Please relog", true);
|
+ "Please relog", true);
|
||||||
|
|
||||||
m_udpServer.SendPacket(m_agentId, packet, ThrottleOutPacketType.Unknown, false);
|
OutPacket(packet, ThrottleOutPacketType.Unknown);
|
||||||
|
|
||||||
// There may be a better way to do this. Perhaps kick? Not sure this propogates notifications to
|
// There may be a better way to do this. Perhaps kick? Not sure this propogates notifications to
|
||||||
// listeners yet, though.
|
// listeners yet, though.
|
||||||
|
|
|
@ -40,14 +40,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
{
|
{
|
||||||
#region IComparers
|
#region IComparers
|
||||||
|
|
||||||
private sealed class UUIDComparer : IComparer<UUID>
|
|
||||||
{
|
|
||||||
public int Compare(UUID x, UUID y)
|
|
||||||
{
|
|
||||||
return x.Guid.CompareTo(y.Guid);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private sealed class IPEndPointComparer : IComparer<IPEndPoint>
|
private sealed class IPEndPointComparer : IComparer<IPEndPoint>
|
||||||
{
|
{
|
||||||
public int Compare(IPEndPoint x, IPEndPoint y)
|
public int Compare(IPEndPoint x, IPEndPoint y)
|
||||||
|
@ -60,91 +52,46 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
|
|
||||||
#endregion IComparers
|
#endregion IComparers
|
||||||
|
|
||||||
private ImmutableMap<UUID, LLUDPClient> m_dict1;
|
private ImmutableMap<IPEndPoint, LLUDPClient> m_dict;
|
||||||
private ImmutableMap<IPEndPoint, LLUDPClient> m_dict2;
|
|
||||||
private LLUDPClient[] m_array;
|
|
||||||
|
|
||||||
public UDPClientCollection()
|
public UDPClientCollection()
|
||||||
{
|
{
|
||||||
m_dict1 = new ImmutableMap<UUID, LLUDPClient>(new UUIDComparer());
|
m_dict = new ImmutableMap<IPEndPoint, LLUDPClient>(new IPEndPointComparer());
|
||||||
m_dict2 = new ImmutableMap<IPEndPoint, LLUDPClient>(new IPEndPointComparer());
|
|
||||||
m_array = new LLUDPClient[0];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Add(UUID key1, IPEndPoint key2, LLUDPClient value)
|
public void Add(IPEndPoint key, LLUDPClient value)
|
||||||
{
|
{
|
||||||
m_dict1 = m_dict1.Add(key1, value);
|
m_dict = m_dict.Add(key, value);
|
||||||
m_dict2 = m_dict2.Add(key2, value);
|
|
||||||
|
|
||||||
// Copy the array by hand
|
|
||||||
LLUDPClient[] oldArray = m_array;
|
|
||||||
int oldLength = oldArray.Length;
|
|
||||||
LLUDPClient[] newArray = new LLUDPClient[oldLength + 1];
|
|
||||||
|
|
||||||
for (int i = 0; i < oldLength; i++)
|
|
||||||
newArray[i] = oldArray[i];
|
|
||||||
newArray[oldLength] = value;
|
|
||||||
|
|
||||||
m_array = newArray;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Remove(UUID key1, IPEndPoint key2)
|
public void Remove(IPEndPoint key)
|
||||||
{
|
{
|
||||||
m_dict1 = m_dict1.Delete(key1);
|
m_dict = m_dict.Delete(key);
|
||||||
m_dict2 = m_dict2.Delete(key2);
|
|
||||||
|
|
||||||
LLUDPClient[] oldArray = m_array;
|
|
||||||
int oldLength = oldArray.Length;
|
|
||||||
|
|
||||||
// Copy the array by hand
|
|
||||||
|
|
||||||
LLUDPClient[] newArray = new LLUDPClient[oldLength - 1];
|
|
||||||
int j = 0;
|
|
||||||
|
|
||||||
for (int i = 0; i < oldLength; i++)
|
|
||||||
{
|
|
||||||
if (oldArray[i].AgentID != key1)
|
|
||||||
newArray[j++] = oldArray[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
m_array = newArray;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void Clear()
|
public void Clear()
|
||||||
{
|
{
|
||||||
m_dict1 = new ImmutableMap<UUID, LLUDPClient>(new UUIDComparer());
|
m_dict = new ImmutableMap<IPEndPoint, LLUDPClient>(new IPEndPointComparer());
|
||||||
m_dict2 = new ImmutableMap<IPEndPoint, LLUDPClient>(new IPEndPointComparer());
|
|
||||||
m_array = new LLUDPClient[0];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public int Count
|
public int Count
|
||||||
{
|
{
|
||||||
get { return m_array.Length; }
|
get { return m_dict.Count; }
|
||||||
}
|
|
||||||
|
|
||||||
public bool ContainsKey(UUID key)
|
|
||||||
{
|
|
||||||
return m_dict1.ContainsKey(key);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool ContainsKey(IPEndPoint key)
|
public bool ContainsKey(IPEndPoint key)
|
||||||
{
|
{
|
||||||
return m_dict2.ContainsKey(key);
|
return m_dict.ContainsKey(key);
|
||||||
}
|
|
||||||
|
|
||||||
public bool TryGetValue(UUID key, out LLUDPClient value)
|
|
||||||
{
|
|
||||||
return m_dict1.TryGetValue(key, out value);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public bool TryGetValue(IPEndPoint key, out LLUDPClient value)
|
public bool TryGetValue(IPEndPoint key, out LLUDPClient value)
|
||||||
{
|
{
|
||||||
return m_dict2.TryGetValue(key, out value);
|
return m_dict.TryGetValue(key, out value);
|
||||||
}
|
}
|
||||||
|
|
||||||
public void ForEach(Action<LLUDPClient> action)
|
public void ForEach(Action<LLUDPClient> action)
|
||||||
{
|
{
|
||||||
Parallel.ForEach<LLUDPClient>(m_array, action);
|
Parallel.ForEach<LLUDPClient>(m_dict.Values, action);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -181,22 +181,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
return x == m_location;
|
return x == m_location;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void RemoveClient(IClientAPI client)
|
public void RemoveClient(LLUDPClient udpClient)
|
||||||
{
|
{
|
||||||
m_scene.ClientManager.Remove(client.CircuitCode);
|
m_log.Debug("[LLUDPSERVER]: Removing LLUDPClient for " + udpClient.ClientAPI.Name);
|
||||||
client.Close(false);
|
|
||||||
|
|
||||||
LLUDPClient udpClient;
|
m_scene.ClientManager.Remove(udpClient.CircuitCode);
|
||||||
if (clients.TryGetValue(client.AgentId, out udpClient))
|
udpClient.ClientAPI.Close(false);
|
||||||
{
|
|
||||||
m_log.Debug("[LLUDPSERVER]: Removing LLUDPClient for " + client.Name);
|
|
||||||
udpClient.Shutdown();
|
udpClient.Shutdown();
|
||||||
clients.Remove(client.AgentId, udpClient.RemoteEndPoint);
|
clients.Remove(udpClient.RemoteEndPoint);
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
m_log.Warn("[LLUDPSERVER]: Failed to remove LLUDPClient for " + client.Name);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void BroadcastPacket(Packet packet, ThrottleOutPacketType category, bool sendToPausedAgents, bool allowSplitting)
|
public void BroadcastPacket(Packet packet, ThrottleOutPacketType category, bool sendToPausedAgents, bool allowSplitting)
|
||||||
|
@ -230,15 +222,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SendPacket(UUID agentID, Packet packet, ThrottleOutPacketType category, bool allowSplitting)
|
|
||||||
{
|
|
||||||
LLUDPClient client;
|
|
||||||
if (clients.TryGetValue(agentID, out client))
|
|
||||||
SendPacket(client, packet, category, allowSplitting);
|
|
||||||
else
|
|
||||||
m_log.Warn("[LLUDPSERVER]: Attempted to send a packet to unknown agentID " + agentID);
|
|
||||||
}
|
|
||||||
|
|
||||||
public void SendPacket(LLUDPClient client, Packet packet, ThrottleOutPacketType category, bool allowSplitting)
|
public void SendPacket(LLUDPClient client, Packet packet, ThrottleOutPacketType category, bool allowSplitting)
|
||||||
{
|
{
|
||||||
// CoarseLocationUpdate packets cannot be split in an automated way
|
// CoarseLocationUpdate packets cannot be split in an automated way
|
||||||
|
@ -391,7 +374,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
{
|
{
|
||||||
m_log.Warn("[LLUDPSERVER]: Ack timeout, disconnecting " + client.ClientAPI.Name);
|
m_log.Warn("[LLUDPSERVER]: Ack timeout, disconnecting " + client.ClientAPI.Name);
|
||||||
|
|
||||||
RemoveClient(client.ClientAPI);
|
RemoveClient(client);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -647,23 +630,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
private void AddClient(uint circuitCode, UUID agentID, UUID sessionID, IPEndPoint remoteEndPoint, AuthenticateResponse sessionInfo)
|
private void AddClient(uint circuitCode, UUID agentID, UUID sessionID, IPEndPoint remoteEndPoint, AuthenticateResponse sessionInfo)
|
||||||
{
|
{
|
||||||
// Create the LLUDPClient
|
// Create the LLUDPClient
|
||||||
LLUDPClient client = new LLUDPClient(this, m_throttleRates, m_throttle, circuitCode, agentID, remoteEndPoint);
|
LLUDPClient udpClient = new LLUDPClient(this, m_throttleRates, m_throttle, circuitCode, agentID, remoteEndPoint);
|
||||||
|
|
||||||
// Create the LLClientView
|
// Create the LLClientView
|
||||||
LLClientView clientApi = new LLClientView(remoteEndPoint, m_scene, this, client, sessionInfo, agentID, sessionID, circuitCode);
|
LLClientView clientApi = new LLClientView(remoteEndPoint, m_scene, this, udpClient, sessionInfo, agentID, sessionID, circuitCode);
|
||||||
clientApi.OnViewerEffect += m_scene.ClientManager.ViewerEffectHandler;
|
clientApi.OnViewerEffect += m_scene.ClientManager.ViewerEffectHandler;
|
||||||
clientApi.OnLogout += LogoutHandler;
|
clientApi.OnLogout += LogoutHandler;
|
||||||
clientApi.OnConnectionClosed += RemoveClient;
|
clientApi.OnConnectionClosed +=
|
||||||
|
delegate(IClientAPI client)
|
||||||
|
{ if (client is LLClientView) RemoveClient(((LLClientView)client).UDPClient); };
|
||||||
|
|
||||||
// Start the IClientAPI
|
// Start the IClientAPI
|
||||||
m_scene.ClientManager.Add(circuitCode, clientApi);
|
m_scene.ClientManager.Add(circuitCode, clientApi);
|
||||||
clientApi.Start();
|
clientApi.Start();
|
||||||
|
|
||||||
// Give LLUDPClient a reference to IClientAPI
|
// Give LLUDPClient a reference to IClientAPI
|
||||||
client.ClientAPI = clientApi;
|
udpClient.ClientAPI = clientApi;
|
||||||
|
|
||||||
// Add the new client to our list of tracked clients
|
// Add the new client to our list of tracked clients
|
||||||
clients.Add(agentID, client.RemoteEndPoint, client);
|
clients.Add(udpClient.RemoteEndPoint, udpClient);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void AcknowledgePacket(LLUDPClient client, uint ack, int currentTime, bool fromResend)
|
private void AcknowledgePacket(LLUDPClient client, uint ack, int currentTime, bool fromResend)
|
||||||
|
@ -798,7 +783,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
|
||||||
private void LogoutHandler(IClientAPI client)
|
private void LogoutHandler(IClientAPI client)
|
||||||
{
|
{
|
||||||
client.SendLogoutPacket();
|
client.SendLogoutPacket();
|
||||||
RemoveClient(client);
|
if (client is LLClientView)
|
||||||
|
RemoveClient(((LLClientView)client).UDPClient);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue