Address Login client packet changes for 12.40.10030

jo3bingham · jo3bingham · commit f71c0b76ef50 · 2020-07-22T11:21:17.000-04:00
diff --git a/TibiaAPI/Network/ClientPackets/Login.cs b/TibiaAPI/Network/ClientPackets/Login.cs
@@ -12,6 +12,7 @@ public class Login : ClientPacket
 
         public string CharacterName { get; set; }
         public string SessionKey { get; set; }
+        public string Version { get; set; }
 
         public uint ChallengeTimeStamp { get; set; }
         public uint ClientVersion { get; set; }
@@ -36,10 +37,10 @@ public override void ParseFromNetworkMessage(NetworkMessage message)
             ClientType = message.ReadUInt16();
             ProtocolVersion = message.ReadUInt16();
             ClientVersion = message.ReadUInt32();
+            Version = message.ReadString();
             DatRevision = message.ReadUInt16();
             ClientPreviewState = message.ReadByte();
 
-            var rsaStartPosition = message.Position;
             if (message.ReadByte() != 0)
             {
                 throw new Exception("[ClientPackets.Login.ParseFromNetworkMessage] RSA decryption failed.");
@@ -68,6 +69,7 @@ public override void AppendToNetworkMessage(NetworkMessage message)
             message.Write(ClientType);
             message.Write(ProtocolVersion);
             message.Write(ClientVersion);
+            message.Write(Version);
             message.Write(DatRevision);
             message.Write(ClientPreviewState);
             message.Write((byte)0); // Start RSA block.
diff --git a/TibiaAPI/Network/Connection.cs b/TibiaAPI/Network/Connection.cs
@@ -792,8 +792,10 @@ private void BeginReceiveClientCallback(IAsyncResult ar)
                 var protocol = (int)ar.AsyncState;
                 if (protocol == 0)
                 {
-                    _rsa.OpenTibiaDecrypt(_clientInMessage, 18);
-                    _clientInMessage.Seek(18, SeekOrigin.Begin);
+                    var rsaStartIndex = _client.VersionNumber >= 124010030 ? 31 : 18;
+
+                    _rsa.OpenTibiaDecrypt(_clientInMessage, rsaStartIndex);
+                    _clientInMessage.Seek(rsaStartIndex, SeekOrigin.Begin);
                     if (_clientInMessage.ReadByte() != 0)
                     {
                         throw new Exception("[Connection.BeginReceiveClientCallback] RSA decryption failed.");
@@ -817,13 +819,13 @@ private void BeginReceiveClientCallback(IAsyncResult ar)
 
                     if (string.IsNullOrEmpty(_loginWebService))
                     {
-                        _rsa.TibiaEncrypt(_clientInMessage, 18);
+                        _rsa.TibiaEncrypt(_clientInMessage, rsaStartIndex);
                     }
                     else
                     {
                         // If the user supplied a login web service address,
                         // it's safe to assume it's an Open-Tibia server.
-                        _rsa.OpenTibiaEncrypt(_clientInMessage, 18);
+                        _rsa.OpenTibiaEncrypt(_clientInMessage, rsaStartIndex);
                     }
 
                     SendToServer(_clientInMessage.GetData());

Original file line number	Diff line number	Diff line change
`@@ -792,8 +792,10 @@ private void BeginReceiveClientCallback(IAsyncResult ar)`
`792`	`792`	`var protocol = (int)ar.AsyncState;`
`793`	`793`	`if (protocol == 0)`
`794`	`794`	`{`
`795`		`- _rsa.OpenTibiaDecrypt(_clientInMessage, 18);`
`796`		`- _clientInMessage.Seek(18, SeekOrigin.Begin);`
	`795`	`+ var rsaStartIndex = _client.VersionNumber >= 124010030 ? 31 : 18;`
	`796`	`+`
	`797`	`+ _rsa.OpenTibiaDecrypt(_clientInMessage, rsaStartIndex);`
	`798`	`+ _clientInMessage.Seek(rsaStartIndex, SeekOrigin.Begin);`
`797`	`799`	`if (_clientInMessage.ReadByte() != 0)`
`798`	`800`	`{`
`799`	`801`	`throw new Exception("[Connection.BeginReceiveClientCallback] RSA decryption failed.");`
`@@ -817,13 +819,13 @@ private void BeginReceiveClientCallback(IAsyncResult ar)`
`817`	`819`
`818`	`820`	`if (string.IsNullOrEmpty(_loginWebService))`
`819`	`821`	`{`
`820`		`- _rsa.TibiaEncrypt(_clientInMessage, 18);`
	`822`	`+ _rsa.TibiaEncrypt(_clientInMessage, rsaStartIndex);`
`821`	`823`	`}`
`822`	`824`	`else`
`823`	`825`	`{`
`824`	`826`	`// If the user supplied a login web service address,`
`825`	`827`	`// it's safe to assume it's an Open-Tibia server.`
`826`		`- _rsa.OpenTibiaEncrypt(_clientInMessage, 18);`
	`828`	`+ _rsa.OpenTibiaEncrypt(_clientInMessage, rsaStartIndex);`
`827`	`829`	`}`
`828`	`830`
`829`	`831`	`SendToServer(_clientInMessage.GetData());`