diff options
author | lbsa71 | 2007-09-18 13:29:16 +0000 |
---|---|---|
committer | lbsa71 | 2007-09-18 13:29:16 +0000 |
commit | 70d9cec3b5064d874f8b9622804c964beeac5f0d (patch) | |
tree | 29d4ae5a6082ea509f5c92a50582bd9b365c7a0f /OpenSim/Region/ClientStack/UDPServer.cs | |
parent | * Handlerized ViewerEffect (diff) | |
download | opensim-SC-70d9cec3b5064d874f8b9622804c964beeac5f0d.zip opensim-SC-70d9cec3b5064d874f8b9622804c964beeac5f0d.tar.gz opensim-SC-70d9cec3b5064d874f8b9622804c964beeac5f0d.tar.bz2 opensim-SC-70d9cec3b5064d874f8b9622804c964beeac5f0d.tar.xz |
* Yet some more connectivity restructuring
* We now have CloseAllAgents( circuit ) and CloseAllCircuits( agentId ) for great justice ( but alas, still only closing on one single scene - be brave! )
* Login and ConnectionClosed now eventified and moveified awayified
* Killed off unused NullClientAPI
* Now the client is almost only responsible for its own closing. ( I will get that scene out of there )
* Lookin' good!
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Region/ClientStack/UDPServer.cs | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/OpenSim/Region/ClientStack/UDPServer.cs b/OpenSim/Region/ClientStack/UDPServer.cs index efc9c87..b0b529c 100644 --- a/OpenSim/Region/ClientStack/UDPServer.cs +++ b/OpenSim/Region/ClientStack/UDPServer.cs | |||
@@ -49,7 +49,7 @@ namespace OpenSim.Region.ClientStack | |||
49 | protected IPEndPoint ipeSender; | 49 | protected IPEndPoint ipeSender; |
50 | protected EndPoint epSender; | 50 | protected EndPoint epSender; |
51 | protected AsyncCallback ReceivedData; | 51 | protected AsyncCallback ReceivedData; |
52 | protected PacketServer _packetServer; | 52 | protected PacketServer m_packetServer; |
53 | 53 | ||
54 | protected int listenPort; | 54 | protected int listenPort; |
55 | protected IScene m_localScene; | 55 | protected IScene m_localScene; |
@@ -61,11 +61,11 @@ namespace OpenSim.Region.ClientStack | |||
61 | { | 61 | { |
62 | get | 62 | get |
63 | { | 63 | { |
64 | return _packetServer; | 64 | return m_packetServer; |
65 | } | 65 | } |
66 | set | 66 | set |
67 | { | 67 | { |
68 | _packetServer = value; | 68 | m_packetServer = value; |
69 | } | 69 | } |
70 | } | 70 | } |
71 | 71 | ||
@@ -74,7 +74,7 @@ namespace OpenSim.Region.ClientStack | |||
74 | set | 74 | set |
75 | { | 75 | { |
76 | this.m_localScene = value; | 76 | this.m_localScene = value; |
77 | this._packetServer.LocalScene = this.m_localScene; | 77 | this.m_packetServer.LocalScene = this.m_localScene; |
78 | } | 78 | } |
79 | } | 79 | } |
80 | 80 | ||
@@ -111,7 +111,9 @@ namespace OpenSim.Region.ClientStack | |||
111 | catch (System.Net.Sockets.SocketException) | 111 | catch (System.Net.Sockets.SocketException) |
112 | { | 112 | { |
113 | Console.WriteLine("Remote host Closed connection"); | 113 | Console.WriteLine("Remote host Closed connection"); |
114 | this._packetServer.ConnectionClosed(this.clientCircuits[epSender]); | 114 | |
115 | this.m_packetServer.CloseCircuit(this.clientCircuits[epSender]); | ||
116 | |||
115 | ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); | 117 | ipeSender = new IPEndPoint(IPAddress.Parse("0.0.0.0"), 0); |
116 | epSender = (EndPoint)ipeSender; | 118 | epSender = (EndPoint)ipeSender; |
117 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); | 119 | Server.BeginReceiveFrom(RecvBuffer, 0, RecvBuffer.Length, SocketFlags.None, ref epSender, ReceivedData, null); |
@@ -126,7 +128,7 @@ namespace OpenSim.Region.ClientStack | |||
126 | if (this.clientCircuits.ContainsKey(epSender)) | 128 | if (this.clientCircuits.ContainsKey(epSender)) |
127 | { | 129 | { |
128 | //if so then send packet to the packetserver | 130 | //if so then send packet to the packetserver |
129 | this._packetServer.InPacket(this.clientCircuits[epSender], packet); | 131 | this.m_packetServer.InPacket(this.clientCircuits[epSender], packet); |
130 | } | 132 | } |
131 | else if (packet.Type == PacketType.UseCircuitCode) | 133 | else if (packet.Type == PacketType.UseCircuitCode) |
132 | { | 134 | { |
@@ -170,7 +172,7 @@ namespace OpenSim.Region.ClientStack | |||
170 | 172 | ||
171 | public virtual void RegisterPacketServer(PacketServer server) | 173 | public virtual void RegisterPacketServer(PacketServer server) |
172 | { | 174 | { |
173 | this._packetServer = server; | 175 | this.m_packetServer = server; |
174 | } | 176 | } |
175 | 177 | ||
176 | public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)//EndPoint packetSender) | 178 | public virtual void SendPacketTo(byte[] buffer, int size, SocketFlags flags, uint circuitcode)//EndPoint packetSender) |