aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorJustin Clarke Casey2008-11-06 19:52:06 +0000
committerJustin Clarke Casey2008-11-06 19:52:06 +0000
commit427a80bba550380a05d78fe7895fd9f6891f39ea (patch)
treeea947abe3bf3339a1f27789b0b55be57071ffbb8
parent* Test to ensure that the udp server stays active after receiving a SocketExc... (diff)
downloadopensim-SC_OLD-427a80bba550380a05d78fe7895fd9f6891f39ea.zip
opensim-SC_OLD-427a80bba550380a05d78fe7895fd9f6891f39ea.tar.gz
opensim-SC_OLD-427a80bba550380a05d78fe7895fd9f6891f39ea.tar.bz2
opensim-SC_OLD-427a80bba550380a05d78fe7895fd9f6891f39ea.tar.xz
* test: Add assert checking that the circuit which trigger the socket exception has been closed
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs3
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs2
2 files changed, 4 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
index 148e03f..5fd3619 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLPacketServer.cs
@@ -179,13 +179,14 @@ namespace OpenSim.Region.ClientStack.LindenUDP
179 } 179 }
180 180
181 /// <summary> 181 /// <summary>
182 /// 182 /// Close a client circuit only
183 /// </summary> 183 /// </summary>
184 /// <param name="circuitcode"></param> 184 /// <param name="circuitcode"></param>
185 public virtual void CloseCircuit(uint circuitcode) 185 public virtual void CloseCircuit(uint circuitcode)
186 { 186 {
187 m_networkHandler.RemoveClientCircuit(circuitcode); 187 m_networkHandler.RemoveClientCircuit(circuitcode);
188 188
189 // XXX: Why is this commented out? Possibly because close mechanisms are so tangled right now
189 //m_scene.ClientManager.CloseAllAgents(circuitcode); 190 //m_scene.ClientManager.CloseAllAgents(circuitcode);
190 } 191 }
191 192
diff --git a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
index dc1c63d..a40677e 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/Tests/BasicCircuitTests.cs
@@ -283,6 +283,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP.Tests
283 testLLUDPServer.LoadReceiveWithBeginException(epA); 283 testLLUDPServer.LoadReceiveWithBeginException(epA);
284 testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(2, "packet3"), epB); 284 testLLUDPServer.LoadReceive(BuildTestObjectNamePacket(2, "packet3"), epB);
285 testLLUDPServer.ReceiveData(null); 285 testLLUDPServer.ReceiveData(null);
286
287 Assert.IsFalse(testLLUDPServer.HasCircuit(circuitCodeA));
286 288
287 Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3)); 289 Assert.That(testLLPacketServer.GetTotalPacketsReceived(), Is.EqualTo(3));
288 Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3)); 290 Assert.That(testLLPacketServer.GetPacketsReceivedFor(PacketType.ObjectName), Is.EqualTo(3));