Merge pull request WowLegacyCore#32 from ratkosrb/cypher_proxy

Updates

HermesProxy/VersionChecker.cs

@@ -29,7 +29,56 @@ static LegacyVersion()
             UpdateFieldDictionary = new Dictionary<Type, SortedList<int, UpdateFieldInfo>>();
             UpdateFieldNameDictionary = new Dictionary<Type, Dictionary<string, int>>();
             if (!LoadUFDictionariesInto(UpdateFieldDictionary, UpdateFieldNameDictionary))
-                Log.Print(LogType.Error, "Could not load update fields for current server version.");
+                Log.Print(LogType.Error, "Could not load update fields for current legacy version.");
+            if (!LoadOpcodeDictionaries())
+                Log.Print(LogType.Error, "Could not load opcodes for current legacy version.");
+        }
+
+        private static readonly Dictionary<uint, Opcode> CurrentToUniversalOpcodeDictionary = new();
+        private static readonly Dictionary<Opcode, uint> UniversalToCurrentOpcodeDictionary = new();
+
+        private static bool LoadOpcodeDictionaries()
+        {
+            Type enumType = Opcodes.GetOpcodesEnumForVersion(Build);
+            if (enumType == null)
+                return false;
+
+            foreach (var item in Enum.GetValues(enumType))
+            {
+                string oldOpcodeName = Enum.GetName(enumType, item);
+                Opcode universalOpcode = Opcodes.GetUniversalOpcode(oldOpcodeName);
+                if (universalOpcode == Opcode.MSG_NULL_ACTION &&
+                    oldOpcodeName != "MSG_NULL_ACTION")
+                {
+                    Log.Print(LogType.Error, $"Opcode {oldOpcodeName} is missing from the universal opcode enum!");
+                    continue;
+                }
+
+                CurrentToUniversalOpcodeDictionary.Add((uint)item, universalOpcode);
+                UniversalToCurrentOpcodeDictionary.Add(universalOpcode, (uint)item);
+            }
+
+            if (CurrentToUniversalOpcodeDictionary.Count < 1)
+                return false;
+
+            Log.Print(LogType.Server, $"Loaded {CurrentToUniversalOpcodeDictionary.Count} legacy opcodes.");
+            return true;
+        }
+
+        public static Opcode GetUniversalOpcode(uint opcode)
+        {
+            Opcode universalOpcode;
+            if (CurrentToUniversalOpcodeDictionary.TryGetValue(opcode, out universalOpcode))
+                return universalOpcode;
+            return Opcode.MSG_NULL_ACTION;
+        }
+
+        public static uint GetCurrentOpcode(Opcode universalOpcode)
+        {
+            uint opcode;
+            if (UniversalToCurrentOpcodeDictionary.TryGetValue(universalOpcode, out opcode))
+                return opcode;
+            return 0;
         }
 
         private static readonly Dictionary<Type, SortedList<int, UpdateFieldInfo>> UpdateFieldDictionary;
@@ -284,7 +333,56 @@ static ModernVersion()
             UpdateFieldDictionary = new Dictionary<Type, SortedList<int, UpdateFieldInfo>>();
             UpdateFieldNameDictionary = new Dictionary<Type, Dictionary<string, int>>();
             if (!LoadUFDictionariesInto(UpdateFieldDictionary, UpdateFieldNameDictionary))
-                Log.Print(LogType.Error, "Could not load update fields for current server version.");
+                Log.Print(LogType.Error, "Could not load update fields for current modern version.");
+            if (!LoadOpcodeDictionaries())
+                Log.Print(LogType.Error, "Could not load opcodes for current modern version.");
+        }
+
+        private static readonly Dictionary<uint, Opcode> CurrentToUniversalOpcodeDictionary = new();
+        private static readonly Dictionary<Opcode, uint> UniversalToCurrentOpcodeDictionary = new();
+
+        private static bool LoadOpcodeDictionaries()
+        {
+            Type enumType = Opcodes.GetOpcodesEnumForVersion(Build);
+            if (enumType == null)
+                return false;
+
+            foreach (var item in Enum.GetValues(enumType))
+            {
+                string oldOpcodeName = Enum.GetName(enumType, item);
+                Opcode universalOpcode = Opcodes.GetUniversalOpcode(oldOpcodeName);
+                if (universalOpcode == Opcode.MSG_NULL_ACTION &&
+                    oldOpcodeName != "MSG_NULL_ACTION")
+                {
+                    Log.Print(LogType.Error, $"Opcode {oldOpcodeName} is missing from the universal opcode enum!");
+                    continue;
+                }
+
+                CurrentToUniversalOpcodeDictionary.Add((uint)item, universalOpcode);
+                UniversalToCurrentOpcodeDictionary.Add(universalOpcode, (uint)item);
+            }
+
+            if (CurrentToUniversalOpcodeDictionary.Count < 1)
+                return false;
+
+            Log.Print(LogType.Server, $"Loaded {CurrentToUniversalOpcodeDictionary.Count} modern opcodes.");
+            return true;
+        }
+
+        public static Opcode GetUniversalOpcode(uint opcode)
+        {
+            Opcode universalOpcode;
+            if (CurrentToUniversalOpcodeDictionary.TryGetValue(opcode, out universalOpcode))
+                return universalOpcode;
+            return Opcode.MSG_NULL_ACTION;
+        }
+
+        public static uint GetCurrentOpcode(Opcode universalOpcode)
+        {
+            uint opcode;
+            if (UniversalToCurrentOpcodeDictionary.TryGetValue(universalOpcode, out opcode))
+                return opcode;
+            return 0;
         }
 
         private static readonly Dictionary<Type, SortedList<int, UpdateFieldInfo>> UpdateFieldDictionary;

HermesProxy/World/Client/PacketHandlers/MovementHandler.cs

@@ -466,7 +466,7 @@ void HandleMonsterMove(WorldPacket packet)
 
             bool isTaxiFlight = (hasTaxiFlightFlags &&
                                 (GetSession().GameState.IsWaitingForTaxiStart ||
-                                 GetSession().GameState.CurrentPlayerCreateTime == packet.GetReceivedTime()) &&
+                                 Math.Abs(packet.GetReceivedTime() - GetSession().GameState.CurrentPlayerCreateTime) <= 1000) &&
                                  GetSession().GameState.CurrentPlayerGuid == guid);
 
             if (isTaxiFlight)

HermesProxy/World/Client/PacketHandlers/UpdateHandler.cs

@@ -1,4 +1,6 @@
-using Framework.GameMath;
+//#define DEBUG_UPDATES
+
+using Framework.GameMath;
 using Framework.Logging;
 using Framework.Util;
 using HermesProxy.Enums;
@@ -344,17 +346,18 @@ private string GetIndexString(params object[] values)
                 });
         }
 
-        private const bool DebugUpdates = false;
         private void PrintString(string txt, params object[] indexes)
         {
-            if (DebugUpdates)
-                Console.WriteLine("{0}{1}", GetIndexString(indexes), txt);
+#if DEBUG_UPDATES
+            Console.WriteLine("{0}{1}", GetIndexString(indexes), txt);
+#endif
         }
 
         private T PrintValue<T>(string name, T obj, params object[] indexes)
         {
-            if (DebugUpdates)
-                Console.WriteLine("{0}{1}: {2}", GetIndexString(indexes), name, obj);
+#if DEBUG_UPDATES
+            Console.WriteLine("{0}{1}: {2}", GetIndexString(indexes), name, obj);
+#endif
             return obj;
         }
 

HermesProxy/World/Client/WorldClient.cs

@@ -185,7 +185,7 @@ private void ReceiveCallback(IAsyncResult AR)
                     }
 
                     WorldPacket packet = new WorldPacket(buffer);
-                    packet.SetReceiveTime(Time.UnixTime);
+                    packet.SetReceiveTime(Environment.TickCount);
                     HandlePacket(packet);
                 }
                 else
@@ -241,7 +241,7 @@ private void SendPacket(WorldPacket packet)
                 header.Opcode = packet.GetOpcode();
                 header.Write(buffer);
 
-                Log.Print(LogType.Debug, $"Sending opcode {Opcodes.GetOpcodeNameForVersion(header.Opcode, Settings.ServerBuild)} ({header.Opcode}) with size {header.Size}.");
+                Log.Print(LogType.Debug, $"Sending opcode {LegacyVersion.GetUniversalOpcode(header.Opcode)} ({header.Opcode}) with size {header.Size}.");
 
                 byte[] headerArray = buffer.GetData();
                 if (_worldCrypt != null)

HermesProxy/World/Enums/Opcodes.cs

@@ -44,52 +44,41 @@ public static ClientVersionBuild GetOpcodesDefiningBuild(ClientVersionBuild vers
             }
             return ClientVersionBuild.Zero;
         }
-        public static uint GetOpcodeValueForVersion(Opcode opcode, ClientVersionBuild version)
+
+        public static Type GetOpcodesEnumForVersion(ClientVersionBuild version)
         {
             switch (GetOpcodesDefiningBuild(version))
             {
                 case ClientVersionBuild.V1_12_1_5875:
-                    return FindOpcodeValueInEnum<V1_12_1_5875.Opcode>(opcode.ToString());
+                    return typeof(V1_12_1_5875.Opcode);
                 case ClientVersionBuild.V2_4_3_8606:
-                    return FindOpcodeValueInEnum<V2_4_3_8606.Opcode>(opcode.ToString());
+                    return typeof(V2_4_3_8606.Opcode);
                 case ClientVersionBuild.V3_3_5a_12340:
-                    return FindOpcodeValueInEnum<V3_3_5_12340.Opcode>(opcode.ToString());
+                    return typeof(V3_3_5_12340.Opcode);
                 case ClientVersionBuild.V2_5_2_39570:
-                    return FindOpcodeValueInEnum<V2_5_2_39570.Opcode>(opcode.ToString());
+                    return typeof(V2_5_2_39570.Opcode);
             }
-            return 0;
+            return null;
         }
 
-        public static uint GetOpcodeValueForVersion(string opcode, ClientVersionBuild version)
+        public static uint GetOpcodeValueForVersion(Opcode opcode, ClientVersionBuild version)
         {
-            switch (GetOpcodesDefiningBuild(version))
-            {
-                case ClientVersionBuild.V1_12_1_5875:
-                    return FindOpcodeValueInEnum<V1_12_1_5875.Opcode>(opcode);
-                case ClientVersionBuild.V2_4_3_8606:
-                    return FindOpcodeValueInEnum<V2_4_3_8606.Opcode>(opcode);
-                case ClientVersionBuild.V3_3_5a_12340:
-                    return FindOpcodeValueInEnum<V3_3_5_12340.Opcode>(opcode);
-                case ClientVersionBuild.V2_5_2_39570:
-                    return FindOpcodeValueInEnum<V2_5_2_39570.Opcode>(opcode);
-            }
+            return GetOpcodeValueForVersion(opcode.ToString(), version);
+        }
+
+        public static uint GetOpcodeValueForVersion(string opcodeName, ClientVersionBuild version)
+        {
+            object opcode;
+            if (Enum.TryParse(GetOpcodesEnumForVersion(version), opcodeName, out opcode))
+                return (uint)opcode;
+
             return 0;
         }
 
         public static string GetOpcodeNameForVersion(uint opcode, ClientVersionBuild version)
         {
-            switch (GetOpcodesDefiningBuild(version))
-            {
-                case ClientVersionBuild.V1_12_1_5875:
-                    return FindOpcodeNameInEnum<V1_12_1_5875.Opcode>(opcode);
-                case ClientVersionBuild.V2_4_3_8606:
-                    return FindOpcodeNameInEnum<V2_4_3_8606.Opcode>(opcode);
-                case ClientVersionBuild.V3_3_5a_12340:
-                    return FindOpcodeNameInEnum<V3_3_5_12340.Opcode>(opcode);
-                case ClientVersionBuild.V2_5_2_39570:
-                    return FindOpcodeNameInEnum<V2_5_2_39570.Opcode>(opcode);
-            }
-            return "UNKNOWN";
+            Type enumType = GetOpcodesEnumForVersion(version);
+            return Enum.ToObject(enumType, opcode).ToString();
         }
 
         public static Opcode GetUniversalOpcode(uint opcode, ClientVersionBuild version)
@@ -100,11 +89,10 @@ public static Opcode GetUniversalOpcode(uint opcode, ClientVersionBuild version)
 
         public static Opcode GetUniversalOpcode(string name)
         {
-            foreach (var item in Enum.GetValues(typeof(Opcode)))
-            {
-                if (Enum.GetName(typeof(Opcode), item) == name)
-                    return (Opcode)item;
-            }
+            object opcode;
+            if (Enum.TryParse(typeof(Opcode), name, out opcode))
+                return (Opcode)opcode;
+
             return Opcode.MSG_NULL_ACTION;
         }
 
@@ -129,7 +117,7 @@ private static string FindOpcodeNameInEnum<T>(uint value) where T : System.Enum
         }
     }
 
-    public enum Opcode
+    public enum Opcode : uint
     {
         /* Generic opcode enumeration
         * Every opcode _name_ should be here (any version)
@@ -3235,6 +3223,7 @@ public enum Opcode
         SMSG_UNKNOWN_8,
         SMSG_UNLEARNED_SPELLS,
         SMSG_UNLOAD_CHILD_MAP,
+        SMSG_UPDATE_AADC_STATUS_RESPONSE,
         SMSG_UPDATE_ACCOUNT_DATA,
         SMSG_UPDATE_ACCOUNT_DATA_COMPLETE,
         SMSG_UPDATE_ACTION_BUTTONS,

HermesProxy/World/Packet.cs

@@ -42,7 +42,7 @@ public void Dispose()
         public uint GetOpcode() { return _worldPacket.GetOpcode(); }
         public Opcode GetUniversalOpcode()
         {
-            return Opcodes.GetUniversalOpcode(GetOpcode(), Framework.Settings.ClientBuild);
+            return ModernVersion.GetUniversalOpcode(GetOpcode());
         }
 
         public void LogPacket(ref SniffFile sniffFile)
@@ -67,7 +67,7 @@ protected ServerPacket(Opcode universalOpcode)
         {
             connectionType = ConnectionType.Realm;
 
-            uint opcode = Opcodes.GetOpcodeValueForVersion(universalOpcode, Framework.Settings.ClientBuild);
+            uint opcode = ModernVersion.GetCurrentOpcode(universalOpcode);
             System.Diagnostics.Trace.Assert(opcode != 0);
             _worldPacket = new WorldPacket(opcode);
         }
@@ -76,7 +76,7 @@ protected ServerPacket(Opcode universalOpcode, ConnectionType type = ConnectionT
         {
             connectionType = type;
 
-            uint opcode = Opcodes.GetOpcodeValueForVersion(universalOpcode, Framework.Settings.ClientBuild);
+            uint opcode = ModernVersion.GetCurrentOpcode(universalOpcode);
             System.Diagnostics.Trace.Assert(opcode != 0);
             _worldPacket = new WorldPacket(opcode);
         }
@@ -93,7 +93,7 @@ public uint GetOpcode()
         }
         public Opcode GetUniversalOpcode()
         {
-            return Opcodes.GetUniversalOpcode(GetOpcode(), Framework.Settings.ClientBuild);
+            return ModernVersion.GetUniversalOpcode(GetOpcode());
         }
 
         public byte[] GetData()
@@ -143,7 +143,7 @@ public WorldPacket(uint opcode = 0)
 
         public WorldPacket(Opcode opcode)
         {
-            this.opcode = Opcodes.GetOpcodeValueForVersion(opcode, Framework.Settings.ServerBuild);
+            this.opcode = LegacyVersion.GetCurrentOpcode(opcode);
             System.Diagnostics.Trace.Assert(this.opcode != 0);
         }
 
@@ -305,7 +305,10 @@ public void WriteBytes(WorldPacket data)
         public uint GetOpcode() { return opcode; }
         public Opcode GetUniversalOpcode(bool isModern)
         {
-            return Opcodes.GetUniversalOpcode(GetOpcode(), isModern ? Framework.Settings.ClientBuild : Framework.Settings.ServerBuild);
+            if (isModern)
+                return ModernVersion.GetUniversalOpcode(GetOpcode());
+            else
+                return LegacyVersion.GetUniversalOpcode(GetOpcode());
         }
 
         public long GetReceivedTime() { return m_receivedTime; }