fix(network): fix Examine packet parsing

thewakingsands · Dec 5, 2023 · 14a9833 · 14a9833
1 parent 963ce7b
commit 14a9833
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 5 deletions.
diff --git a/Cafe.Matcha/Constant/LogType.cs b/Cafe.Matcha/Constant/LogType.cs
@@ -13,7 +13,7 @@ public enum LogType
         Telemetry,
         ActorControlSelf,
         InvalidPacket,
-
+        RawPacket,
         Debug1,
 #endif
     }

diff --git a/Cafe.Matcha/Network/NetworkMonitor.cs b/Cafe.Matcha/Network/NetworkMonitor.cs
@@ -70,6 +70,7 @@ private void HandleMessage(byte[] message)
                 if (ToMatchaOpcode(BitConverter.ToUInt16(message, 18), out var opcode))
                 {
                     LogIncorrectPacketSize(opcode, message.Length);
+                    Log.Packet(message);
                 }
 #endif
 
@@ -634,12 +635,12 @@ private bool HandleMessageByOpcode(byte[] message)
             }
             else if (opcode == MatchaOpcode.Examine)
             {
-                if (message.Length != 1016)
+                if (message.Length != 1032)
                 {
                     return false;
                 }
 
-                const int offset = 0x40;
+                const int offset = 0x50;
                 const int length = 0x28;
                 for (int slot = 0; slot < 14; ++slot)
                 {

diff --git a/Cafe.Matcha/Utils/Log.cs b/Cafe.Matcha/Utils/Log.cs
@@ -1,10 +1,11 @@
 // Copyright (c) FFCafe. All rights reserved.
 // Licensed under the AGPL-3.0 license. See LICENSE file in the project root for full license information.
 
-using Cafe.Matcha.Constant;
-
 namespace Cafe.Matcha.Utils
 {
+    using System.Text;
+    using Cafe.Matcha.Constant;
+
     internal class Log
     {
         public delegate void EventHandler(LogType type, char level, string message);
@@ -34,6 +35,31 @@ public static void Debug(LogType type, string message)
         {
             Add(type, 'D', message);
         }
+
+        public static void Packet(byte[] byteArray) {
+            StringBuilder hexDump = new StringBuilder();
+            const int lineLength = 16;
+
+            for (int i = 0; i < byteArray.Length; i += lineLength)
+            {
+                hexDump.AppendFormat("{0:X8}: ", i);
+                for (int j = 0; j < lineLength; j++)
+                {
+                    if (i + j >= byteArray.Length)
+                    {
+                        break;
+                    }
+
+                    byte b = byteArray[i + j];
+                    hexDump.Append(b.ToString("X2"));
+                    hexDump.Append(" ");
+                }
+
+                hexDump.AppendLine();
+            }
+
+            Add(LogType.RawPacket, 'D', hexDump.ToString());
+        }
 #endif
     }
 }