proper bypass lludp header extra bytes, even if not seen so far; a fe…

…w changes to acks decode
opensim · Jan 10, 2022 · ceb5895 · ceb5895
1 parent fad4427
commit ceb5895
Show file tree

Hide file tree

Showing 7 changed files with 439 additions and 437 deletions.
diff --git a/OpenMetaverse.Tests/PacketTests.cs b/OpenMetaverse.Tests/PacketTests.cs
@@ -134,7 +134,7 @@ public void ToBytesMultiple()
             for (int i = 0; i < splitPackets.Length; i++)
             {
                 byte[] packetData = splitPackets[i];
-                int len = packetData.Length - 1;
+                int len = packetData.Length;
                 DirPlacesReplyPacket packet = (DirPlacesReplyPacket)Packet.BuildPacket(packetData, ref len, packetData);
 
                 Assert.IsTrue(packet.AgentData.AgentID == bigPacket.AgentData.AgentID);

diff --git a/OpenMetaverse/Simulator.cs b/OpenMetaverse/Simulator.cs
@@ -1052,7 +1052,7 @@ protected override void PacketReceived(UDPPacketBuffer buffer)
 
             #region Packet Decoding
 
-            int packetEnd = buffer.DataLength - 1;
+            int packetEnd = buffer.DataLength;
 
             try
             {

diff --git a/OpenMetaverse/_Packets_.cs b/OpenMetaverse/_Packets_.cs
diff --git a/OpenMetaverseTypes/UtilsConversions.cs b/OpenMetaverseTypes/UtilsConversions.cs
@@ -507,6 +507,15 @@ public static int BytesToIntBig(byte[] bytes)
                    bytes[3];
         }
 
+        [MethodImpl(MethodImplOptions.AggressiveInlining)]
+        public static int BytesToIntBig(byte[] bytes, int pos)
+        {
+            return (bytes[pos] << 24) |
+                   (bytes[pos + 1] << 16) |
+                   (bytes[pos + 2] << 8) |
+                   bytes[pos + 3];
+        }
+
         /// <summary>
         /// Convert the first eight bytes of the given array in little endian
         /// ordering to a signed long integer

diff --git a/Programs/GridProxy/GridProxy.cs b/Programs/GridProxy/GridProxy.cs
@@ -1384,7 +1384,7 @@ private void ReceiveFromSim(IAsyncResult ar)
 
                         // interpret the packet according to the SL protocol
                         Packet packet;
-                        int end = length - 1;
+                        int end = length;
 
                         packet = Packet.BuildPacket(receiveBuffer, ref end, zeroBuffer);
 
@@ -1722,7 +1722,7 @@ private void ReceiveFromClient(IAsyncResult ar)
                         if (length != 0)
                         {
                             // interpret the packet according to the SL protocol
-                            int end = length - 1;
+                            int end = length;
                             Packet packet = OpenMetaverse.Packets.Packet.BuildPacket(receiveBuffer, ref end, zeroBuffer);
 
                             //OpenMetaverse.Logger.Log("-> " + packet.Type + " #" + packet.Header.Sequence, Helpers.LogLevel.Debug);

diff --git a/Programs/WinGridProxy/SessionTypes.cs b/Programs/WinGridProxy/SessionTypes.cs
@@ -175,7 +175,7 @@ public override Session Deserialize(byte[] bytes)
             byte[] packetData = map["PacketBytes"].AsBinary();
             this.Length = packetData.Length;
 
-            int packetEnd = packetData.Length - 1;
+            int packetEnd = packetData.Length;
             this.Packet = Packet.BuildPacket(packetData, ref packetEnd, null);
             this.Name = this.Packet.Type.ToString();
             return this;

diff --git a/Programs/mapgenerator/mapgenerator.cs b/Programs/mapgenerator/mapgenerator.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Text;
 
 namespace mapgenerator
 {
@@ -1032,37 +1033,41 @@ static int Main(string[] args)
                 "            return PacketType.Default;" + Environment.NewLine + "        }" + Environment.NewLine);
 
             // Write the Packet.BuildPacket(PacketType) function
-            writer.WriteLine("        public static Packet BuildPacket(PacketType type)");
-            writer.WriteLine("        {");
+            writer.WriteLine("      public static Packet BuildPacket(PacketType type)");
+            writer.WriteLine("      {");
+            writer.WriteLine("          switch(type)");
+            writer.WriteLine("          {");
             foreach (MapPacket packet in protocol.HighMaps)
                 if (packet != null)
-                    writer.WriteLine("            if(type == PacketType." + packet.Name + ") return new " + packet.Name + "Packet();");
+                    writer.WriteLine("              case PacketType." + packet.Name + ": return new " + packet.Name + "Packet();");
+
             foreach (MapPacket packet in protocol.MediumMaps)
                 if (packet != null)
-                    writer.WriteLine("            if(type == PacketType." + packet.Name + ") return new " + packet.Name + "Packet();");
+                    writer.WriteLine("              case PacketType." + packet.Name + ": return new " + packet.Name + "Packet();");
             foreach (MapPacket packet in protocol.LowMaps)
                 if (packet != null)
-                    writer.WriteLine("            if(type == PacketType." + packet.Name + ") return new " + packet.Name + "Packet();");
-            writer.WriteLine("            return null;" + Environment.NewLine);
-            writer.WriteLine("        }");
+                    writer.WriteLine("              case PacketType." + packet.Name + ": return new " + packet.Name + "Packet();");
+            writer.WriteLine("          }");
+            writer.WriteLine("          return null;");
+            writer.WriteLine("      }");
 
             // Write the Packet.BuildPacket() function
             writer.WriteLine(@"
-        public static Packet BuildPacket(byte[] packetBuffer, ref int packetEnd, byte[] zeroBuffer)
+        public static Packet BuildPacket(byte[] packetBuffer, ref int packetLength, byte[] zeroBuffer)
         {
             byte[] bytes;
             int i = 0;
-            Header header = Header.BuildHeader(packetBuffer, ref i, ref packetEnd);
+            Header header = Header.BuildHeader(packetBuffer, ref i, ref packetLength);
             if (header.Zerocoded)
             {
-                packetEnd = Helpers.ZeroDecode(packetBuffer, packetEnd + 1, zeroBuffer) - 1;
+                packetLength = Helpers.ZeroDecode(packetBuffer, packetLength, zeroBuffer);
                 bytes = zeroBuffer;
             }
             else
             {
                 bytes = packetBuffer;
             }
-            Array.Clear(bytes, packetEnd + 1, bytes.Length - packetEnd - 1);
+            //Array.Clear(bytes, packetEnd + 1, bytes.Length - packetEnd - 1);
 
             switch (header.Frequency)
             {
-Original file line number
+Diff line change
@@ Expand Up @@
                 #region Packet Decoding
-                int packetEnd = buffer.DataLength - 1;
+                int packetEnd = buffer.DataLength;
                 try
                 {
@@ Expand Down @@