Merge branch 'htb-throttle'

1 files changed, 33 insertions, 14 deletions

diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs b/OpenSim/Region/ClientStack/LindenUDP/OutgoingPacket.cs
index c45d11f..1a1a1cb 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLUtil.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/OutgoingPacket.cs
@@ -1,4 +1,4 @@
-/*
+/*
  * Copyright (c) Contributors, http://opensimulator.org/
  * See CONTRIBUTORS.TXT for a full list of copyright holders.
  *
@@ -25,27 +25,46 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+using System;
+using OpenSim.Framework;
 using OpenMetaverse;
 
 namespace OpenSim.Region.ClientStack.LindenUDP
 {
-    public class LLUtil
+    /// <summary>
+    /// Holds a reference to the <seealso cref="LLUDPClient"/> this packet is
+    /// destined for, along with the serialized packet data, sequence number
+    /// (if this is a resend), number of times this packet has been resent,
+    /// the time of the last resend, and the throttling category for this
+    /// packet
+    /// </summary>
+    public sealed class OutgoingPacket
     {
+        /// <summary>Client this packet is destined for</summary>
+        public LLUDPClient Client;
+        /// <summary>Packet data to send</summary>
+        public UDPPacketBuffer Buffer;
+        /// <summary>Sequence number of the wrapped packet</summary>
+        public uint SequenceNumber;
+        /// <summary>Number of times this packet has been resent</summary>
+        public int ResendCount;
+        /// <summary>Environment.TickCount when this packet was last sent over the wire</summary>
+        public int TickCount;
+        /// <summary>Category this packet belongs to</summary>
+        public ThrottleOutPacketType Category;
+
         /// <summary>
-        /// Convert a string to bytes suitable for use in an LL UDP packet.
+        /// Default constructor
         /// </summary>
-        /// <param name="s">Truncated to 254 characters if necessary</param>
-        /// <returns></returns>
-        public static byte[] StringToPacketBytes(string s)
+        /// <param name="client">Reference to the client this packet is destined for</param>
+        /// <param name="buffer">Serialized packet data. If the flags or sequence number
+        /// need to be updated, they will be injected directly into this binary buffer</param>
+        /// <param name="category">Throttling category for this packet</param>
+        public OutgoingPacket(LLUDPClient client, UDPPacketBuffer buffer, ThrottleOutPacketType category)
         {
-            // Anything more than 254 will cause libsecondlife to barf
-            // (libsl 1550) adds an \0 on the Utils.StringToBytes conversion if it isn't present
-            if (s.Length > 254)
-            {
-                s = s.Remove(254);
-            } 
-            
-            return Utils.StringToBytes(s);
+            Client = client;
+            Buffer = buffer;
+            Category = category;
         }
     }
 }