From bd6e69b97c0d62eafd65ce6079675ad43a26309e Mon Sep 17 00:00:00 2001 From: MW Date: Wed, 16 May 2007 16:01:01 +0000 Subject: [PATCH] Yet more cleanup/refactoring --- .../SimClient.PacketHandlers.cs | 7 +++ OpenSim.RegionServer/SimClient.cs | 52 ++++++++++++------- OpenSim.RegionServer/UDPServer.cs | 2 + ServiceManager/ServiceManager.csproj | 33 +++++++----- 4 files changed, 61 insertions(+), 33 deletions(-) diff --git a/OpenSim.RegionServer/SimClient.PacketHandlers.cs b/OpenSim.RegionServer/SimClient.PacketHandlers.cs index f4de974c0e..bc498984a4 100644 --- a/OpenSim.RegionServer/SimClient.PacketHandlers.cs +++ b/OpenSim.RegionServer/SimClient.PacketHandlers.cs @@ -20,6 +20,13 @@ namespace OpenSim { public partial class SimClient { + protected virtual void RegisterLocalPacketHandlers() + { + this.AddLocalPacketHandler(PacketType.LogoutRequest, this.Logout); + this.AddLocalPacketHandler(PacketType.AgentCachedTexture, this.AgentTextureCached); + this.AddLocalPacketHandler(PacketType.MultipleObjectUpdate, this.MultipleObjUpdate); + } + protected virtual bool Logout(SimClient simClient, Packet packet) { OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ProcessInPacket() - Got a logout request"); diff --git a/OpenSim.RegionServer/SimClient.cs b/OpenSim.RegionServer/SimClient.cs index 81da10e848..5bd098b5be 100644 --- a/OpenSim.RegionServer/SimClient.cs +++ b/OpenSim.RegionServer/SimClient.cs @@ -109,8 +109,8 @@ namespace OpenSim m_sandboxMode = sandboxMode; m_child = child; m_regionData = regionDat; - - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"OpenSimClient.cs - Started up new client thread to handle incoming request"); + + OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs - Started up new client thread to handle incoming request"); cirpack = initialcirpack; userEP = remoteEP; if (m_gridServer.GetName() == "Remote") @@ -135,16 +135,10 @@ namespace OpenSim ClientThread.Start(); } - protected virtual void RegisterLocalPacketHandlers() - { - this.AddLocalPacketHandler(PacketType.LogoutRequest, this.Logout); - this.AddLocalPacketHandler(PacketType.AgentCachedTexture, this.AgentTextureCached); - this.AddLocalPacketHandler(PacketType.MultipleObjectUpdate, this.MultipleObjUpdate); - } - + # region Client Methods public void UpgradeClient() { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"SimClient.cs:UpgradeClient() - upgrading child to full agent"); + OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - upgrading child to full agent"); this.m_child = false; this.m_world.RemoveViewerAgent(this); if (!this.m_sandboxMode) @@ -157,7 +151,7 @@ namespace OpenSim public void DowngradeClient() { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"SimClient.cs:UpgradeClient() - changing full agent to child"); + OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "SimClient.cs:UpgradeClient() - changing full agent to child"); this.m_child = true; this.m_world.RemoveViewerAgent(this); this.m_world.AddViewerAgent(this); @@ -188,7 +182,9 @@ namespace OpenSim m_networkServer.RemoveClientCircuit(this.CircuitCode); this.ClientThread.Abort(); } + #endregion + # region Packet Handling public static bool AddPacketHandler(PacketType packetType, PacketMethod handler) { bool result = false; @@ -242,6 +238,10 @@ namespace OpenSim return result; } + # endregion + + # region Low Level Packet Methods + private void ack_pack(Packet Pack) { if (Pack.Header.Reliable) @@ -276,7 +276,7 @@ namespace OpenSim { if ((now - packet.TickCount > RESEND_TIMEOUT) && (!packet.Header.Resent)) { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Resending " + packet.Type.ToString() + " packet, " + + OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Resending " + packet.Type.ToString() + " packet, " + (now - packet.TickCount) + "ms have passed"); packet.Header.Resent = true; @@ -295,7 +295,7 @@ namespace OpenSim if (PendingAcks.Count > 250) { // FIXME: Handle the odd case where we have too many pending ACKs queued up - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE,"Too many ACKs queued up!"); + OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.VERBOSE, "Too many ACKs queued up!"); return; } @@ -327,6 +327,10 @@ namespace OpenSim ResendUnacked(); } + # endregion + + #region Packet Queue Processing + protected virtual void ProcessOutPacket(Packet Pack) { // Keep track of when this packet was sent out @@ -417,7 +421,7 @@ namespace OpenSim } catch (Exception) { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM,"OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread"); + OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.MEDIUM, "OpenSimClient.cs:ProcessOutPacket() - WARNING: Socket exception occurred on connection " + userEP.ToString() + " - killing thread"); ClientThread.Abort(); } @@ -478,7 +482,7 @@ namespace OpenSim protected virtual void ClientLoop() { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"OpenSimClient.cs:ClientLoop() - Entered loop"); + OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:ClientLoop() - Entered loop"); while (true) { QueItem nextPacket = PacketQueue.Dequeue(); @@ -495,9 +499,13 @@ namespace OpenSim } } + #endregion + + # region Setup + protected virtual void InitNewClient() { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); + OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.LOW, "OpenSimClient.cs:InitNewClient() - Adding viewer agent to world"); m_world.AddViewerAgent(this); world.Entity tempent = m_world.Entities[this.AgentID]; @@ -507,17 +515,17 @@ namespace OpenSim protected virtual void AuthUser() { - // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code); + // AuthenticateResponse sessionInfo = m_gridServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code); AuthenticateResponse sessionInfo = this.m_networkServer.AuthenticateSession(cirpack.CircuitCode.SessionID, cirpack.CircuitCode.ID, cirpack.CircuitCode.Code); if (!sessionInfo.Authorised) { //session/circuit not authorised - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString()); + OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - New user request denied to " + userEP.ToString()); ClientThread.Abort(); } else { - OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL,"OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString()); + OpenSim.Framework.Console.MainConsole.Instance.WriteLine(OpenSim.Framework.Console.LogPriority.NORMAL, "OpenSimClient.cs:AuthUser() - Got authenticated connection from " + userEP.ToString()); //session is authorised this.AgentID = cirpack.CircuitCode.ID; this.SessionID = cirpack.CircuitCode.SessionID; @@ -539,9 +547,10 @@ namespace OpenSim ClientLoop(); } } + # endregion #region Inventory Creation - private void SetupInventory(AuthenticateResponse sessionInfo) + private void SetupInventory(AuthenticateResponse sessionInfo) { AgentInventory inventory = null; if (sessionInfo.LoginInfo.InventoryFolder != null) @@ -630,6 +639,8 @@ namespace OpenSim } #endregion + #region Nested Classes + public class QueItem { public QueItem() @@ -639,5 +650,6 @@ namespace OpenSim public Packet Packet; public bool Incoming; } + #endregion } } diff --git a/OpenSim.RegionServer/UDPServer.cs b/OpenSim.RegionServer/UDPServer.cs index 12f35abbc6..0fd3cdb3ea 100644 --- a/OpenSim.RegionServer/UDPServer.cs +++ b/OpenSim.RegionServer/UDPServer.cs @@ -81,6 +81,8 @@ namespace OpenSim this.user_accounts = accounts; this.m_console = console; PacketServer packetServer = new PacketServer(this); + + //set up delegate for authenticate sessions this.AuthenticateHandler = new AuthenticateSessionHandler(this.m_gridServers.GridServer.AuthenticateSession); } diff --git a/ServiceManager/ServiceManager.csproj b/ServiceManager/ServiceManager.csproj index f703ef1daa..ac118c3f1f 100644 --- a/ServiceManager/ServiceManager.csproj +++ b/ServiceManager/ServiceManager.csproj @@ -1,4 +1,4 @@ - + Local 8.0.50727 @@ -6,7 +6,8 @@ {E141F4EE-0000-0000-0000-000000000000} Debug AnyCPU - + + ServiceManager @@ -15,9 +16,11 @@ IE50 false Exe - + + ServiceManager - + + @@ -28,7 +31,8 @@ TRACE;DEBUG - + + True 4096 False @@ -37,7 +41,8 @@ False False 4 - + + False @@ -46,7 +51,8 @@ TRACE - + + False 4096 True @@ -55,18 +61,19 @@ False False 4 - + + - + System.dll False - + System.ServiceProcess.dll False - + System.Xml.dll False @@ -75,7 +82,7 @@ - Code + Component @@ -85,4 +92,4 @@ - + \ No newline at end of file