diff --git a/OpenSim/Region/ClientStack/Linden/UDP/IncomingPacket.cs b/OpenSim/Region/ClientStack/Linden/UDP/IncomingPacket.cs deleted file mode 100644 index e22670b3a9..0000000000 --- a/OpenSim/Region/ClientStack/Linden/UDP/IncomingPacket.cs +++ /dev/null @@ -1,63 +0,0 @@ -/* - * Copyright (c) Contributors, http://opensimulator.org/ - * See CONTRIBUTORS.TXT for a full list of copyright holders. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * * Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * * Neither the name of the OpenSimulator Project nor the - * names of its contributors may be used to endorse or promote products - * derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY - * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES - * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; - * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - */ - -using System; -using OpenSim.Framework; -using OpenMetaverse; -using OpenMetaverse.Packets; - -namespace OpenSim.Region.ClientStack.LindenUDP -{ - /// - /// Holds a reference to a and a - /// for incoming packets - /// - public sealed class IncomingPacket - { - /// Client this packet came from - public LLClientView Client; - - /// Packet data that has been received - public Packet Packet; - - /// - /// No arg constructor. - /// - public IncomingPacket() {} - - /// - /// Constructor - /// - /// Reference to the client this packet came from - /// Packet data - public IncomingPacket(LLClientView client, Packet packet) - { - Client = client; - Packet = packet; - } - } -} diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs index cc1e71bb85..9e357c4ead 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs @@ -715,7 +715,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public bool AddLocalPacketHandler(PacketType packetType, PacketMethod handler, bool doAsync) { lock (m_packetHandlers) - return m_packetHandlers.TryAdd(packetType, new PacketProcessor() { method = handler, Async = doAsync}); + return m_packetHandlers.TryAdd(packetType, new PacketProcessor(handler, doAsync)); } [MethodImpl(MethodImplOptions.AggressiveInlining)] @@ -884,7 +884,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP bool isEstateManager = m_scene.Permissions.IsEstateManager(m_agentId); // go by oficial path uint regionFlags = GetRegionFlags(); - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(RegionHandshakeHeader, 0, buf.Data, 0, 11); // inline zeroencode @@ -987,7 +987,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_thisAgentUpdateArgs.lastUpdateTS = 0; m_thisAgentUpdateArgs.ControlFlags = 0; - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] bdata = buf.Data; //setup header @@ -1038,7 +1038,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendChatMessage(string message, byte chattype, Vector3 fromPos, string fromName, UUID sourceID, UUID ownerID, byte sourcetype, byte audible) { - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; //setup header @@ -1095,7 +1095,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (!m_scene.Permissions.CanInstantMessage(fromAgentID, toAgentID)) return; - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; //setup header @@ -1187,7 +1187,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendGenericMessage(string method, UUID invoice, List message) { - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; //setup header @@ -1236,7 +1236,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, null, false, true); m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task); - UDPPacketBuffer newbuf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer newbuf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(data, 0, newbuf.Data, 0, countpos); buf = newbuf; data = buf.Data; @@ -1257,7 +1257,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendGenericMessage(string method, UUID invoice, List message) { - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; //setup header @@ -1307,7 +1307,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task, null, false, true); m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task); - UDPPacketBuffer newbuf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer newbuf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(data, 0, newbuf.Data, 0, countpos); buf = newbuf; data = buf.Data; @@ -1639,7 +1639,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP int numberPatchs = map.Length / 2; - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; Buffer.BlockCopy(TerrainPacketHeader, 0, data, 0, 7); @@ -1675,7 +1675,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Land); // start another - buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); data = buf.Data; Buffer.BlockCopy(TerrainPacketHeader, 0, data, 0, 7); @@ -1866,7 +1866,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendMapItemReply(mapItemReply[] replies, uint mapitemtype, uint flags) { - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; //setup header and agentinfo block @@ -1907,7 +1907,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP else { // prepare next packet - UDPPacketBuffer newbuf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer newbuf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(data, 0, newbuf.Data, 0, 34); // copy the block we already did @@ -1970,7 +1970,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP needSizes = true; } - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; //setup header and agentinfo block @@ -2013,7 +2013,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP else { // prepare next packet - UDPPacketBuffer newbuf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer newbuf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(data, 0, newbuf.Data, 0, 30); // copy the block we already did @@ -2797,7 +2797,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendTaskInventory(UUID taskID, short serial, byte[] fileName) { - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; //setup header @@ -2825,7 +2825,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendXferPacket(ulong xferID, uint packet, byte[] XferData, int XferDataOffset, int XferDatapktLen, bool isTaskInventory) { - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; //setup header @@ -2873,7 +2873,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendAbortXferPacket(ulong xferID) { - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; //setup header @@ -2922,7 +2922,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendAvatarPickerReply(UUID QueryID, List users) { - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; //setup header @@ -2968,7 +2968,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP m_udpServer.SendUDPPacket(m_udpClient, buf, ThrottleOutPacketType.Task); if (u < users.Count - 1) { - UDPPacketBuffer newbuf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer newbuf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] newdata = newbuf.Data; Buffer.BlockCopy(data, 0, newdata, 0, 42); buf = newbuf; @@ -4383,7 +4383,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendAppearance(UUID targetID, byte[] visualParams, byte[] textureEntry, float hover) { // doing post zero encode, because odds of beeing bad are not that low - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(AvatarAppearanceHeader, 0, buf.Data, 0, 10); byte[] data = buf.Data; int pos = 10; @@ -4435,7 +4435,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { // m_log.DebugFormat("[LLCLIENTVIEW]: Sending animations for {0} to {1}", sourceAgentId, Name); - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; //setup header Buffer.BlockCopy(AvatarAnimationHeader, 0, data, 0, 7); @@ -4536,7 +4536,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (ent is not ScenePresence && ent is not SceneObjectPart) return; - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(objectUpdateHeader, 0, buf.Data, 0, 7); LLUDPZeroEncoder zc = new(buf.Data); @@ -4561,7 +4561,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (ent is null) return; - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); //setup header and regioninfo block Buffer.BlockCopy(terseUpdateHeader, 0, buf.Data, 0, 7); @@ -4621,7 +4621,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP //bool doprey = m_courseLocationPrey != UUID.Zero; - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(CoarseLocationUpdateHeader, 0, buf.Data, 0, 8); byte[] data = buf.Data; @@ -5111,7 +5111,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { //List tau = new List(30); - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(objectUpdateHeader, 0, buf.Data, 0, 7); LLUDPZeroEncoder zc = new(buf.Data); @@ -5152,7 +5152,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP else { // we need more packets - UDPPacketBuffer newbuf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer newbuf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(buf.Data, 0, newbuf.Data, 0, countposition); // start is the same buf.Data[countposition] = (byte)count; @@ -5203,7 +5203,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { //List tau = new List(30); - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; Buffer.BlockCopy(CompressedObjectHeader, 0, data, 0, 7); @@ -5247,7 +5247,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP else { // we need more packets - UDPPacketBuffer newbuf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer newbuf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(buf.Data, 0, newbuf.Data, 0, countposition); // start is the same buf.Data[countposition] = (byte)count; @@ -5295,7 +5295,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (objectUpdateProbes is not null) { - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; Buffer.BlockCopy(ObjectUpdateCachedHeader, 0, data, 0, 7); @@ -5344,7 +5344,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP if (pos > (LLUDPServer.MAXPAYLOAD - 13)) { // we need more packets - UDPPacketBuffer newbuf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer newbuf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(data, 0, newbuf.Data, 0, countposition); // start is the same data[countposition] = (byte)count; @@ -5375,7 +5375,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP int blocks = terseUpdates.Count; //List tau = new List(30); - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); //setup header and regioninfo block Buffer.BlockCopy(terseUpdateHeader, 0, buf.Data, 0, 7); @@ -5413,7 +5413,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP else if (blocks > 0) { // we need more packets - UDPPacketBuffer newbuf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer newbuf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(buf.Data, 0, newbuf.Data, 0, COUNTINDEX); // start is the same // copy what we done in excess int extralen = pos - lastpos; @@ -5469,7 +5469,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP int count = sop.GetAnimations(out UUID[] ids, out int[] seqs); - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; //setup header @@ -5537,7 +5537,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP continue; } - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] dataptr = buf.Data; //setup header @@ -5893,7 +5893,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP public void SendSimStats(SimStats stats) { - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); byte[] data = buf.Data; //setup header @@ -6047,7 +6047,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP int blocks = objectPropertiesUpdates.Count; //List tau = new List(30); - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(ObjectPropertyUpdateHeader, 0, buf.Data, 0, 8); LLUDPZeroEncoder zc = new(buf.Data); @@ -6075,7 +6075,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP else if (blocks > 0) { // we need more packets - UDPPacketBuffer newbuf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer newbuf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(buf.Data, 0, newbuf.Data, 0, countposition); // start is the same buf.Data[countposition] = (byte)count; @@ -6118,7 +6118,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { foreach (EntityUpdate eu in objectPropertiesFamilyUpdates) { - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); Buffer.BlockCopy(ObjectFamilyUpdateHeader, 0, buf.Data, 0, 8); LLUDPZeroEncoder zc = new(buf.Data); @@ -13242,15 +13242,12 @@ namespace OpenSim.Region.ClientStack.LindenUDP logPacket = false; if (logPacket) - m_log.DebugFormat( - "[CLIENT]: PACKET IN from {0} ({1}) in {2} - {3}", - Name, SceneAgent.IsChildAgent ? "child" : "root ", Scene.Name, packet.Type); + m_log.Debug( + $"[CLIENT]: PACKET IN from {Name} ({(SceneAgent.IsChildAgent ? "child" : "root")}) in {Scene.Name} - {packet.Type}"); } if (!ProcessPacketMethod(packet)) - m_log.WarnFormat( - "[CLIENT]: Unhandled packet {0} from {1} ({2}) in {3}. Ignoring.", - packet.Type, Name, SceneAgent.IsChildAgent ? "child" : "root ", Scene.Name); + m_log.Warn($"[CLIENT]: ignoring unhandled packet {packet.Type} from {Name} ({(SceneAgent.IsChildAgent ? "child" : "root")}) in {m_scene.Name}"); } private static PrimitiveBaseShape GetShapeFromAddPacket(ObjectAddPacket addPacket) @@ -13396,10 +13393,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { lock (m_clientInterfaces) { - if (!m_clientInterfaces.ContainsKey(typeof(T))) - { - m_clientInterfaces.Add(typeof(T), iface); - } + m_clientInterfaces.TryAdd(typeof(T), iface); } } @@ -13645,28 +13639,16 @@ namespace OpenSim.Region.ClientStack.LindenUDP OutPacket(pack, ThrottleOutPacketType.Task); } - public struct PacketProcessor + public readonly struct PacketProcessor(PacketMethod m, bool doasync ) { - /// - /// Packet handling method. - /// - public PacketMethod method; - - /// - /// Should this packet be handled asynchronously? - /// - public bool Async; + public readonly PacketMethod method = m; + public readonly bool Async = doasync; } - private struct StaticPacketProcessor + private readonly struct StaticPacketProcessor(StaticPacketMethod m, bool doasync) { - public StaticPacketMethod method; - public bool Async; - public StaticPacketProcessor(StaticPacketMethod m, bool a) - { - method = m; - Async = a; - } + public readonly StaticPacketMethod method = m; + public readonly bool Async = doasync; } public void SendAvatarInterestsReply(UUID avatarID, uint wantMask, string wantText, uint skillsMask, string skillsText, string languages) @@ -13737,7 +13719,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { if (p is ScenePresence sp) { - UDPPacketBuffer buf = m_udpServer.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); + UDPPacketBuffer buf = OpenSimUDPBase.GetNewUDPBuffer(m_udpClient.RemoteEndPoint); //setup header and regioninfo block Buffer.BlockCopy(terseUpdateHeader, 0, buf.Data, 0, 7); diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs index 58399476fb..01206c771d 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPClient.cs @@ -779,11 +779,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP return 0; } - public void FreeUDPBuffer(UDPPacketBuffer buf) - { - m_udpServer.FreeUDPBuffer(buf); - } - /// /// Converts a integer to a /// flag value diff --git a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs index d097f7a624..73beef3853 100755 --- a/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs @@ -31,7 +31,6 @@ using System.Collections.Concurrent; using System.Diagnostics; using System.IO; using System.Net; -using System.Net.Sockets; using System.Reflection; using System.Threading; using log4net; @@ -43,7 +42,6 @@ using OpenSim.Region.Framework.Scenes; using OpenSim.Region.Framework.Interfaces; using OpenMetaverse; using Mono.Addins; -using TokenBucket = OpenSim.Region.ClientStack.LindenUDP.TokenBucket; namespace OpenSim.Region.ClientStack.LindenUDP @@ -326,8 +324,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP protected int m_pausedAckTimeout = 0; protected bool m_disableFacelights = false; - public Socket Server { get { return null; } } - /// /// Record how many packets have been resent /// @@ -1194,9 +1190,9 @@ namespace OpenSim.Region.ClientStack.LindenUDP headerLen += buffer.Data[5]; if (bufferLen < headerLen) { -// m_log.WarnFormat( -// "[LLUDPSERVER]: Dropping packet with malformed header received from {0} in {1}", -// buffer.RemoteEndPoint, m_scene.RegionInfo.RegionName); + //m_log.WarnFormat( + // "[LLUDPSERVER]: Dropping packet with malformed header received from {0} in {1}", + // buffer.RemoteEndPoint, m_scene.RegionInfo.RegionName); RecordMalformedInboundPacket(endPoint); FreeUDPBuffer(buffer); return; // Malformed header @@ -1221,7 +1217,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP catch (Exception e) { if (IncomingMalformedPacketCount < 100) - m_log.DebugFormat("[LLUDPSERVER]: Dropped malformed packet: " + e.ToString()); + m_log.Debug("[LLUDPSERVER]: Dropped malformed packet: " + e.ToString()); } // Fail-safe check @@ -1432,10 +1428,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP #endregion Ping Check Handling - IncomingPacket incomingPacket; - - incomingPacket = new IncomingPacket((LLClientView)client, packet); - packetInbox.Add(incomingPacket); + packetInbox.Add(new IncomingPacket((LLClientView)client, packet)); } #region BinaryStats @@ -1778,26 +1771,28 @@ namespace OpenSim.Region.ClientStack.LindenUDP Scene.ThreadAlive(1); try { - packetInbox.TryTake(out IncomingPacket incomingPacket, 4500); - - if (incomingPacket != null && IsRunningInbound) + if (packetInbox.TryTake(out IncomingPacket incomingPacket, 4500) && IsRunningInbound) { - ProcessInPacket(incomingPacket); - incomingPacket = null; + if (incomingPacket.Client.IsActive) + { + incomingPacket.Client.ProcessInPacket(incomingPacket.Packet); + IncomingPacketsProcessed++; + } } } - /* catch (ThreadAbortException) { - Thread.ResetAbort(); + // If something is trying to abort the packet processing thread, take that as a hint that it's time to shut down + m_log.Info("[LLUDPSERVER]: Caught a thread abort, shutting down the LLUDP server"); + Stop(); } - */ - catch (Exception ex) + catch (Exception e) { - m_log.Error("[LLUDPSERVER]: Error in the incoming packet handler loop: " + ex.Message, ex); + // Don't let a failure in an individual client thread crash the whole sim. + m_log.Error($"[LLUDPSERVER]: IncomingPacketHandler threw ", e); } - Watchdog.UpdateThread(); + Watchdog.UpdateThread(); } if (packetInbox.Count > 0) @@ -1947,38 +1942,6 @@ namespace OpenSim.Region.ClientStack.LindenUDP #endregion - protected void ProcessInPacket(IncomingPacket incomingPacket) - { - Packet packet = incomingPacket.Packet; - LLClientView client = incomingPacket.Client; - - if(!client.IsActive) - return; - - try - { - // Process this packet - client.ProcessInPacket(packet); - } - catch(ThreadAbortException) - { - // If something is trying to abort the packet processing thread, take that as a hint that it's time to shut down - m_log.Info("[LLUDPSERVER]: Caught a thread abort, shutting down the LLUDP server"); - Stop(); - } - catch(Exception e) - { - // Don't let a failure in an individual client thread crash the whole sim. - m_log.Error( - string.Format( - "[LLUDPSERVER]: Client packet handler for {0} for packet {1} threw ", - client.Name,packet.Type), - e); - } - - IncomingPacketsProcessed++; - } - protected void LogoutHandler(IClientAPI client) { client.SendLogoutPacket(); diff --git a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs index b1a37b971a..74593d9a52 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/OpenSimUDPBase.cs @@ -26,16 +26,24 @@ */ using System; -using System.Collections.Concurrent; using System.Net; using System.Net.Sockets; -using System.Threading; using log4net; using OpenSim.Framework; -using OpenSim.Framework.Monitoring; +using OpenMetaverse; +using OpenMetaverse.Packets; -namespace OpenMetaverse +namespace OpenSim.Region.ClientStack.LindenUDP { + public readonly struct IncomingPacket(LLClientView client, Packet packet) + { + /// Client this packet came from + public readonly LLClientView Client = client; + + /// Packet data that has been received + public readonly Packet Packet = packet; + } + /// /// Base UDP server /// @@ -126,7 +134,7 @@ namespace OpenMetaverse try { m_udpSocket.Close(); } catch { } } - public UDPPacketBuffer GetNewUDPBuffer(IPEndPoint remoteEndpoint) + public static UDPPacketBuffer GetNewUDPBuffer(IPEndPoint remoteEndpoint) { lock (m_udpBuffersPoolLock) { @@ -143,7 +151,7 @@ namespace OpenMetaverse return new UDPPacketBuffer(remoteEndpoint); } - public void FreeUDPBuffer(UDPPacketBuffer buf) + public static void FreeUDPBuffer(UDPPacketBuffer buf) { lock (m_udpBuffersPoolLock) { @@ -257,6 +265,7 @@ namespace OpenMetaverse IsRunningInbound = false; m_udpSocket.Close(); + m_udpSocket = null; } } diff --git a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs index db937021df..9681981b55 100644 --- a/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs +++ b/OpenSim/Region/ClientStack/Linden/UDP/UnackedPacketCollection.cs @@ -219,8 +219,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { // Update stats Interlocked.Add(ref removedPacket.Client.UnackedBytes, -removedPacket.Buffer.DataLength); - - removedPacket.Client.FreeUDPBuffer(removedPacket.Buffer); + OpenSimUDPBase.FreeUDPBuffer(removedPacket.Buffer); removedPacket.Buffer = null; } } @@ -247,7 +246,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP { Interlocked.Add(ref ackedPacket.Client.UnackedBytes, -ackedPacket.Buffer.DataLength); - ackedPacket.Client.FreeUDPBuffer(ackedPacket.Buffer); + OpenSimUDPBase.FreeUDPBuffer(ackedPacket.Buffer); ackedPacket.Buffer = null; } // As with other network applications, assume that an acknowledged packet is an