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

* Gave Connectivity some more (manly) love.

afrisby
lbsa71 2007-09-18 21:51:09 +00:00
parent 70d9cec3b5
commit c8f51836b8
1 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,20 +103,19 @@ namespace OpenSim.Region.ClientStack
Packet packet = null; Packet packet = null;
int numBytes; int numBytes;
try try
{ {
numBytes = Server.EndReceiveFrom(result, ref epSender); numBytes = Server.EndReceiveFrom(result, ref epSender);
} }
catch (System.Net.Sockets.SocketException) catch (System.Net.Sockets.SocketException e)
{ {
Console.WriteLine("Remote host Closed connection"); Console.WriteLine("Remote host Closed connection");
this.m_packetServer.CloseCircuit(this.clientCircuits[epSender]);
ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); CloseEndPoint(epSender);
epSender = (EndPoint)ipeSender;
Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); //Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
return; return;
} }
@ -125,10 +124,11 @@ namespace OpenSim.Region.ClientStack
packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer); packet = Packet.BuildPacket(RecvBuffer, ref packetEnd, ZeroBuffer);
// do we already have a circuit for this endpoint // do we already have a circuit for this endpoint
if (this.clientCircuits.ContainsKey(epSender)) uint circuit;
if (clientCircuits.TryGetValue(epSender, out circuit))
{ {
//if so then send packet to the packetserver //if so then send packet to the packetserver
this.m_packetServer.InPacket(this.clientCircuits[epSender], packet); this.m_packetServer.InPacket(circuit, packet);
} }
else if (packet.Type == PacketType.UseCircuitCode) else if (packet.Type == PacketType.UseCircuitCode)
{ {
@ -143,12 +143,21 @@ namespace OpenSim.Region.ClientStack
Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null);
} }
private void CloseEndPoint(EndPoint sender)
{
uint circuit;
if (clientCircuits.TryGetValue(sender, out circuit))
{
m_packetServer.CloseCircuit(circuit);
}
}
protected virtual void AddNewClient(Packet packet) protected virtual void AddNewClient(Packet packet)
{ {
UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet; UseCircuitCodePacket useCircuit = (UseCircuitCodePacket)packet;
this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code); this.clientCircuits.Add(epSender, useCircuit.CircuitCode.Code);
this.PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_authenticateSessionsClass); this.PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_authenticateSessionsClass);
} }
public void ServerListener() public void ServerListener()
@ -206,6 +215,6 @@ namespace OpenSim.Region.ClientStack
} }
} }
} }
} }