aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/ClientStack
diff options
context:
space:
mode:
authorJeff Ames2008-09-09 01:26:48 +0000
committerJeff Ames2008-09-09 01:26:48 +0000
commitfae34bb10cfa10702faf5c19d8c8517faa018cb5 (patch)
tree2001f24703b010957254dbb49ef5e222ff30b84d /OpenSim/Region/ClientStack
parentFix state xxx within state xxx itself triggering a state "change" to (diff)
downloadopensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.zip
opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.gz
opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.bz2
opensim-SC-fae34bb10cfa10702faf5c19d8c8517faa018cb5.tar.xz
Update svn properties, formatting cleanup.
Diffstat (limited to 'OpenSim/Region/ClientStack')
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs14
-rw-r--r--OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs18
2 files changed, 16 insertions, 16 deletions
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 356dee8..3c860a9 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -115,7 +115,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
115 protected UUID m_activeGroupID = UUID.Zero; 115 protected UUID m_activeGroupID = UUID.Zero;
116 protected string m_activeGroupName = String.Empty; 116 protected string m_activeGroupName = String.Empty;
117 protected ulong m_activeGroupPowers = 0; 117 protected ulong m_activeGroupPowers = 0;
118 protected Dictionary<UUID,ulong> m_groupPowers = new Dictionary<UUID, ulong>(); 118 protected Dictionary<UUID,ulong> m_groupPowers = new Dictionary<UUID, ulong>();
119 119
120 /* Instantiated Designated Event Delegates */ 120 /* Instantiated Designated Event Delegates */
121 //- used so we don't create new objects for each incoming packet and then toss it out later */ 121 //- used so we don't create new objects for each incoming packet and then toss it out later */
@@ -302,7 +302,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
302 get { return m_activeGroupPowers; } 302 get { return m_activeGroupPowers; }
303 } 303 }
304 304
305 public ulong GetGroupPowers(UUID groupID) 305 public ulong GetGroupPowers(UUID groupID)
306 { 306 {
307 if (m_groupPowers.ContainsKey(groupID)) 307 if (m_groupPowers.ContainsKey(groupID))
308 return m_groupPowers[groupID]; 308 return m_groupPowers[groupID];
@@ -645,7 +645,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
645 protected virtual void ClientLoop() 645 protected virtual void ClientLoop()
646 { 646 {
647 m_log.Info("[CLIENT]: Entered main packet processing loop"); 647 m_log.Info("[CLIENT]: Entered main packet processing loop");
648 648
649 while (true) 649 while (true)
650 { 650 {
651 LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue(); 651 LLQueItem nextPacket = m_PacketHandler.PacketQueue.Dequeue();
@@ -683,10 +683,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
683 if (m_PacketHandler.PacketsReceived == m_inPacketsChecked) 683 if (m_PacketHandler.PacketsReceived == m_inPacketsChecked)
684 { 684 {
685 // no packet came in since the last time we checked... 685 // no packet came in since the last time we checked...
686 686
687 m_probesWithNoIngressPackets++; 687 m_probesWithNoIngressPackets++;
688 if ((m_probesWithNoIngressPackets > 30 && !m_clientBlocked) // agent active 688 if ((m_probesWithNoIngressPackets > 30 && !m_clientBlocked) // agent active
689 || (m_probesWithNoIngressPackets > 90 && m_clientBlocked)) // agent paused 689 || (m_probesWithNoIngressPackets > 90 && m_clientBlocked)) // agent paused
690 { 690 {
691 m_clientPingTimer.Enabled = false; 691 m_clientPingTimer.Enabled = false;
692 692
@@ -709,7 +709,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
709 { 709 {
710 // Something received in the meantime - we can reset the counters 710 // Something received in the meantime - we can reset the counters
711 m_probesWithNoIngressPackets = 0; 711 m_probesWithNoIngressPackets = 0;
712 // ... and store the current number of packets received to find out if another one got in on the next cycle 712 // ... and store the current number of packets received to find out if another one got in on the next cycle
713 m_inPacketsChecked = m_PacketHandler.PacketsReceived; 713 m_inPacketsChecked = m_PacketHandler.PacketsReceived;
714 } 714 }
715 715
@@ -749,7 +749,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
749 // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(m_cirpack.m_circuitCode.m_sessionId, m_cirpack.m_circuitCode.ID, m_cirpack.m_circuitCode.Code); 749 // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(m_cirpack.m_circuitCode.m_sessionId, m_cirpack.m_circuitCode.ID, m_cirpack.m_circuitCode.Code);
750 AuthenticateResponse sessionInfo = 750 AuthenticateResponse sessionInfo =
751 m_authenticateSessionsHandler.AuthenticateSession(m_sessionId, m_agentId, m_circuitCode); 751 m_authenticateSessionsHandler.AuthenticateSession(m_sessionId, m_agentId, m_circuitCode);
752 752
753 if (!sessionInfo.Authorised) 753 if (!sessionInfo.Authorised)
754 { 754 {
755 //session/circuit not authorised 755 //session/circuit not authorised
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
index 206216e..52a74e7 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLUDPServer.cs
@@ -58,12 +58,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
58 protected byte[] RecvBuffer = new byte[4096]; 58 protected byte[] RecvBuffer = new byte[4096];
59 protected byte[] ZeroBuffer = new byte[8192]; 59 protected byte[] ZeroBuffer = new byte[8192];
60 protected IPEndPoint ipeSender; 60 protected IPEndPoint ipeSender;
61 61
62 /// <value> 62 /// <value>
63 /// The endpoint of a sender of a particular packet. The port is continually changed by the various socket receive methods 63 /// The endpoint of a sender of a particular packet. The port is continually changed by the various socket receive methods
64 /// </value> 64 /// </value>
65 protected EndPoint epSender; 65 protected EndPoint epSender;
66 66
67 protected EndPoint epProxy; 67 protected EndPoint epProxy;
68 protected int proxyPortOffset; 68 protected int proxyPortOffset;
69 protected AsyncCallback ReceivedData; 69 protected AsyncCallback ReceivedData;
@@ -75,7 +75,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
75 protected IPAddress listenIP = IPAddress.Parse("0.0.0.0"); 75 protected IPAddress listenIP = IPAddress.Parse("0.0.0.0");
76 protected IScene m_localScene; 76 protected IScene m_localScene;
77 protected AssetCache m_assetCache; 77 protected AssetCache m_assetCache;
78 78
79 /// <value> 79 /// <value>
80 /// Manages authentication for agent circuits 80 /// Manages authentication for agent circuits
81 /// </value> 81 /// </value>
@@ -260,12 +260,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP
260 { 260 {
261 ret = clientCircuits.TryGetValue(epSender, out circuit); 261 ret = clientCircuits.TryGetValue(epSender, out circuit);
262 } 262 }
263 263
264 if (ret) 264 if (ret)
265 { 265 {
266 //if so then send packet to the packetserver 266 //if so then send packet to the packetserver
267 //m_log.DebugFormat("[UDPSERVER]: For endpoint {0} got packet {1}", epSender, packet.Type); 267 //m_log.DebugFormat("[UDPSERVER]: For endpoint {0} got packet {1}", epSender, packet.Type);
268 268
269 m_packetServer.InPacket(circuit, packet); 269 m_packetServer.InPacket(circuit, packet);
270 } 270 }
271 else if (packet.Type == PacketType.UseCircuitCode) 271 else if (packet.Type == PacketType.UseCircuitCode)
@@ -358,8 +358,8 @@ namespace OpenSim.Region.ClientStack.LindenUDP
358 return; 358 return;
359 359
360 UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet; 360 UseCircuitCodePacket useCircuit = (UseCircuitCodePacket) packet;
361 361
362 m_log.DebugFormat("[CLIENT]: Adding new circuit for agent {0}, circuit code {1}", useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code); 362 m_log.DebugFormat("[CLIENT]: Adding new circuit for agent {0}, circuit code {1}", useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code);
363 363
364 lock (clientCircuits) 364 lock (clientCircuits)
365 { 365 {
@@ -386,10 +386,10 @@ namespace OpenSim.Region.ClientStack.LindenUDP
386 386
387 if (!PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_circuitManager, epProxy)) 387 if (!PacketServer.AddNewClient(epSender, useCircuit, m_assetCache, m_circuitManager, epProxy))
388 m_log.ErrorFormat( 388 m_log.ErrorFormat(
389 "[CLIENT]: A circuit already existed for agent {0}, circuit {1}", 389 "[CLIENT]: A circuit already existed for agent {0}, circuit {1}",
390 useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code); 390 useCircuit.CircuitCode.ID, useCircuit.CircuitCode.Code);
391 } 391 }
392 392
393 PacketPool.Instance.ReturnPacket(packet); 393 PacketPool.Instance.ReturnPacket(packet);
394 } 394 }
395 395