From 6d5248441d914231af36e4a378a270513b54b1f0 Mon Sep 17 00:00:00 2001 From: Adam Frisby Date: Sat, 8 Nov 2008 16:09:15 +0000 Subject: * Implementing first of the 0.6 IClientAPI Changes * Introducing IClientCore - this will be the key replacement for IClientAPI in the long run, it has a very minimal set of methods designed to allow you to access specialist API's. * See https://lists.berlios.de/pipermail/opensim-dev/2008-September/003049.html for the early discussion on this. --- .../Region/ClientStack/LindenUDP/LLClientView.cs | 51 +++++++++++++++++----- 1 file changed, 39 insertions(+), 12 deletions(-) (limited to 'OpenSim/Region/ClientStack/LindenUDP') diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs index d0f057e..ff11dff 100644 --- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs @@ -37,6 +37,7 @@ using OpenMetaverse; using OpenMetaverse.Packets; using log4net; using OpenSim.Framework; +using OpenSim.Framework.Client; using OpenSim.Framework.Communications.Cache; using OpenSim.Framework.Statistics; using OpenSim.Region.Interfaces; @@ -51,34 +52,25 @@ namespace OpenSim.Region.ClientStack.LindenUDP /// Handles new client connections /// Constructor takes a single Packet and authenticates everything /// - public class LLClientView : IClientAPI + public class LLClientView : IClientAPI, IClientCore { private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); - // ~ClientView() - // { - // m_log.Info("[CLIENT]: LLClientView destructor called"); - // } - /* static variables */ public static SynchronizeClientHandler SynchronizeClient; /* private variables */ private readonly UUID m_sessionId; private readonly UUID m_secureSessionId = UUID.Zero; - //private AgentAssetUpload UploadAssets; private int m_debugPacketLevel; private readonly AssetCache m_assetCache; - // private InventoryCache m_inventoryCache; private int m_cachedTextureSerial; private Timer m_clientPingTimer; private bool m_clientBlocked; private int m_probesWithNoIngressPackets; - //private int m_lastPacketsReceived = 0; - //private byte[] ZeroOutBuffer = new byte[4096]; private readonly UUID m_agentId; private readonly uint m_circuitCode; @@ -553,7 +545,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_PacketHandler.Clear(); m_clientPingTimer = new Timer(5000); - m_clientPingTimer.Elapsed += new ElapsedEventHandler(CheckClientConnectivity); + m_clientPingTimer.Elapsed += CheckClientConnectivity; m_clientPingTimer.Enabled = true; } @@ -608,7 +600,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP protected virtual bool ProcessPacketMethod(Packet packet) { bool result = false; - bool found = false; + bool found; PacketMethod method; if (m_packetHandlers.TryGetValue(packet.Type, out method)) { @@ -7676,5 +7668,40 @@ namespace OpenSim.Region.ClientStack.LindenUDP KillPacket kp = new KillPacket(); OutPacket(kp, ThrottleOutPacketType.Task | ThrottleOutPacketType.LowPriority); } + + #region IClientCore + + private readonly Dictionary m_clientInterfaces = new Dictionary(); + + /// + /// Register an interface on this client, should only be called in the constructor. + /// + /// + /// + protected void RegisterInterface(T iface) + { + lock(m_clientInterfaces) + { + m_clientInterfaces.Add(typeof(T), iface); + } + } + + public bool TryGet(out T iface) + { + if (m_clientInterfaces.ContainsKey(typeof(T))) + { + iface = (T)m_clientInterfaces[typeof(T)]; + return true; + } + iface = default(T); + return false; + } + + public T Get() + { + return (T)m_clientInterfaces[typeof(T)]; + } + + #endregion } } -- cgit v1.1