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

Thank you, Kiryu for a patch to fix out of sync error in UDP server 

in the file UDPServer.cs. Submitted by Jeff Ames via Mantis#200
afrisby
Charles Krinke 2007-12-17 16:39:11 +00:00
parent 94d8976140
commit e7170496be
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ namespace OpenSim.Region.ClientStack
public class UDPServer : ClientStackNetworkHandler public class UDPServer : ClientStackNetworkHandler
{ {
protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>(); protected Dictionary<EndPoint, uint> clientCircuits = new Dictionary<EndPoint, uint>();
protected Dictionary<uint, EndPoint> clientCircuits_reverse = new Dictionary<uint, EndPoint>();
public Socket Server; public Socket Server;
protected IPEndPoint ServerIncoming; protected IPEndPoint ServerIncoming;
protected byte[] RecvBuffer = new byte[4096]; protected byte[] RecvBuffer = new byte[4096];
@ -176,6 +177,7 @@ namespace OpenSim.Region.ClientStack
{ {
UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet; UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet;
clientCircuits.Add(epSender, useCircuit.CircuitCode.Code); clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
clientCircuits_reverse.Add(useCircuit.CircuitCode.Code, epSender);
PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_authenticateSessionsClass); PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_authenticateSessionsClass);
} }
@ -208,15 +210,7 @@ namespace OpenSim.Region.ClientStack
{ {
// find the endpoint for this circuit // find the endpoint for this circuit
EndPoint sendto = null; EndPoint sendto = null;
foreach (KeyValuePair<EndPoint, uint> p in clientCircuits) if (clientCircuits_reverse.TryGetValue(circuitcode, out sendto))
{
if (p.Value == circuitcode)
{
sendto = p.Key;
break;
}
}
if (sendto != null)
{ {
//we found the endpoint so send the packet to it //we found the endpoint so send the packet to it
Server.SendTo(buffer, size, flags, sendto); Server.SendTo(buffer, size, flags, sendto);
@ -225,13 +219,11 @@ namespace OpenSim.Region.ClientStack
public virtual void RemoveClientCircuit(uint circuitcode) public virtual void RemoveClientCircuit(uint circuitcode)
{ {
foreach (KeyValuePair<EndPoint, uint> p in clientCircuits) EndPoint sendto = null;
if (clientCircuits_reverse.TryGetValue(circuitcode, out sendto))
{ {
if (p.Value == circuitcode) clientCircuits.Remove(sendto);
{ clientCircuits_reverse.Remove(circuitcode);
clientCircuits.Remove(p.Key);
break;
}
} }
} }
} }