From 79cf25d2570e00b5f68b06c4304a2477bfe22c40 Mon Sep 17 00:00:00 2001 From: CheshireCaat Date: Sat, 25 Jan 2020 09:40:24 +0300 Subject: [PATCH] Reformat MTProto.Serializers Fix naming for string serializer Fix naming for bytes serializer Remove unused method - VectorToString --- TLSharp.Core/Auth/Step1_PQRequest.cs | 2 +- TLSharp.Core/Auth/Step2_DHExchange.cs | 14 ++++++------ TLSharp.Core/Auth/Step3_CompleteDHExchange.cs | 8 +++---- TLSharp.Core/MTProto/Serializers.cs | 22 +++++-------------- TLSharp.Core/Network/MtProtoSender.cs | 6 ++--- TLSharp.Core/Session.cs | 8 +++---- 6 files changed, 25 insertions(+), 35 deletions(-) diff --git a/TLSharp.Core/Auth/Step1_PQRequest.cs b/TLSharp.Core/Auth/Step1_PQRequest.cs index 8d61d9a..f1e45b5 100644 --- a/TLSharp.Core/Auth/Step1_PQRequest.cs +++ b/TLSharp.Core/Auth/Step1_PQRequest.cs @@ -65,7 +65,7 @@ namespace TLSharp.Core.Auth var serverNonce = binaryReader.ReadBytes(16); - byte[] pqbytes = Serializers.Bytes.read(binaryReader); + byte[] pqbytes = Serializers.Bytes.Read(binaryReader); var pq = new BigInteger(1, pqbytes); var vectorId = binaryReader.ReadInt32(); diff --git a/TLSharp.Core/Auth/Step2_DHExchange.cs b/TLSharp.Core/Auth/Step2_DHExchange.cs index 53b8016..a0dbe5a 100644 --- a/TLSharp.Core/Auth/Step2_DHExchange.cs +++ b/TLSharp.Core/Auth/Step2_DHExchange.cs @@ -36,9 +36,9 @@ namespace TLSharp.Core.Auth using (BinaryWriter pqInnerDataWriter = new BinaryWriter(pqInnerData)) { pqInnerDataWriter.Write(0x83c95aec); // pq_inner_data - Serializers.Bytes.write(pqInnerDataWriter, pq.ToByteArrayUnsigned()); - Serializers.Bytes.write(pqInnerDataWriter, pqPair.Min.ToByteArrayUnsigned()); - Serializers.Bytes.write(pqInnerDataWriter, pqPair.Max.ToByteArrayUnsigned()); + Serializers.Bytes.Write(pqInnerDataWriter, pq.ToByteArrayUnsigned()); + Serializers.Bytes.Write(pqInnerDataWriter, pqPair.Min.ToByteArrayUnsigned()); + Serializers.Bytes.Write(pqInnerDataWriter, pqPair.Max.ToByteArrayUnsigned()); pqInnerDataWriter.Write(nonce); pqInnerDataWriter.Write(serverNonce); pqInnerDataWriter.Write(newNonce); @@ -69,10 +69,10 @@ namespace TLSharp.Core.Auth reqDHParamsWriter.Write(0xd712e4be); // req_dh_params reqDHParamsWriter.Write(nonce); reqDHParamsWriter.Write(serverNonce); - Serializers.Bytes.write(reqDHParamsWriter, pqPair.Min.ToByteArrayUnsigned()); - Serializers.Bytes.write(reqDHParamsWriter, pqPair.Max.ToByteArrayUnsigned()); + Serializers.Bytes.Write(reqDHParamsWriter, pqPair.Min.ToByteArrayUnsigned()); + Serializers.Bytes.Write(reqDHParamsWriter, pqPair.Max.ToByteArrayUnsigned()); reqDHParamsWriter.Write(targetFingerprint); - Serializers.Bytes.write(reqDHParamsWriter, ciphertext); + Serializers.Bytes.Write(reqDHParamsWriter, ciphertext); reqDhParamsBytes = reqDHParams.ToArray(); } @@ -126,7 +126,7 @@ namespace TLSharp.Core.Auth } */ - encryptedAnswer = Serializers.Bytes.read(responseReader); + encryptedAnswer = Serializers.Bytes.Read(responseReader); return new Step2_Response() { diff --git a/TLSharp.Core/Auth/Step3_CompleteDHExchange.cs b/TLSharp.Core/Auth/Step3_CompleteDHExchange.cs index 8ba8f5a..e59d3a2 100644 --- a/TLSharp.Core/Auth/Step3_CompleteDHExchange.cs +++ b/TLSharp.Core/Auth/Step3_CompleteDHExchange.cs @@ -62,8 +62,8 @@ namespace TLSharp.Core.Auth // logger.debug("valid server nonce"); g = dhInnerDataReader.ReadInt32(); - dhPrime = new BigInteger(1, Serializers.Bytes.read(dhInnerDataReader)); - ga = new BigInteger(1, Serializers.Bytes.read(dhInnerDataReader)); + dhPrime = new BigInteger(1, Serializers.Bytes.Read(dhInnerDataReader)); + ga = new BigInteger(1, Serializers.Bytes.Read(dhInnerDataReader)); int serverTime = dhInnerDataReader.ReadInt32(); timeOffset = serverTime - (int)(Convert.ToInt64((DateTime.UtcNow - new DateTime(1970, 1, 1)).TotalMilliseconds) / 1000); @@ -88,7 +88,7 @@ namespace TLSharp.Core.Auth clientDhInnerDataWriter.Write(nonce); clientDhInnerDataWriter.Write(serverNonce); clientDhInnerDataWriter.Write((long)0); // TODO: retry_id - Serializers.Bytes.write(clientDhInnerDataWriter, gb.ToByteArrayUnsigned()); + Serializers.Bytes.Write(clientDhInnerDataWriter, gb.ToByteArrayUnsigned()); using (MemoryStream clientDhInnerDataWithHash = new MemoryStream()) { @@ -121,7 +121,7 @@ namespace TLSharp.Core.Auth setClientDhParamsWriter.Write(0xf5045f1f); setClientDhParamsWriter.Write(nonce); setClientDhParamsWriter.Write(serverNonce); - Serializers.Bytes.write(setClientDhParamsWriter, clientDhInnerDataEncryptedBytes); + Serializers.Bytes.Write(setClientDhParamsWriter, clientDhInnerDataEncryptedBytes); setclientDhParamsBytes = setClientDhParams.ToArray(); } diff --git a/TLSharp.Core/MTProto/Serializers.cs b/TLSharp.Core/MTProto/Serializers.cs index bd46ffe..9ee658a 100644 --- a/TLSharp.Core/MTProto/Serializers.cs +++ b/TLSharp.Core/MTProto/Serializers.cs @@ -9,7 +9,7 @@ namespace TLSharp.Core.MTProto public static class Bytes { - public static byte[] read(BinaryReader binaryReader) + public static byte[] Read(BinaryReader binaryReader) { byte firstByte = binaryReader.ReadByte(); int len, padding; @@ -33,7 +33,7 @@ namespace TLSharp.Core.MTProto return data; } - public static BinaryWriter write(BinaryWriter binaryWriter, byte[] data) + public static BinaryWriter Write(BinaryWriter binaryWriter, byte[] data) { int padding; if (data.Length < 254) @@ -73,26 +73,16 @@ namespace TLSharp.Core.MTProto public static class String { - public static string read(BinaryReader reader) + public static string Read(BinaryReader reader) { - byte[] data = Bytes.read(reader); + byte[] data = Bytes.Read(reader); return Encoding.UTF8.GetString(data, 0, data.Length); } - public static BinaryWriter write(BinaryWriter writer, string str) + public static BinaryWriter Write(BinaryWriter writer, string str) { - return Bytes.write(writer, Encoding.UTF8.GetBytes(str)); + return Bytes.Write(writer, Encoding.UTF8.GetBytes(str)); } } - - public static string VectorToString(List list) - { - string[] tokens = new string[list.Count]; - for (int i = 0; i < list.Count; i++) - { - tokens[i] = list[i].ToString(); - } - return "[" + System.String.Join(", ", tokens) + "]"; - } } } diff --git a/TLSharp.Core/Network/MtProtoSender.cs b/TLSharp.Core/Network/MtProtoSender.cs index e3efabf..243e447 100644 --- a/TLSharp.Core/Network/MtProtoSender.cs +++ b/TLSharp.Core/Network/MtProtoSender.cs @@ -238,7 +238,7 @@ namespace TLSharp.Core.Network private bool HandleGzipPacked(ulong messageId, int sequence, BinaryReader messageReader, TeleSharp.TL.TLMethod request) { uint code = messageReader.ReadUInt32(); - byte[] packedData = GZipStream.UncompressBuffer(Serializers.Bytes.read(messageReader)); + byte[] packedData = GZipStream.UncompressBuffer(Serializers.Bytes.Read(messageReader)); using (MemoryStream packedStream = new MemoryStream(packedData, false)) using (BinaryReader compressedReader = new BinaryReader(packedStream)) { @@ -276,7 +276,7 @@ namespace TLSharp.Core.Network if (innerCode == 0x2144ca19) { // rpc_error int errorCode = messageReader.ReadInt32(); - string errorMessage = Serializers.String.read(messageReader); + string errorMessage = Serializers.String.Read(messageReader); if (errorMessage.StartsWith("FLOOD_WAIT_")) { @@ -327,7 +327,7 @@ namespace TLSharp.Core.Network try { // gzip_packed - byte[] packedData = Serializers.Bytes.read(messageReader); + byte[] packedData = Serializers.Bytes.Read(messageReader); using (var ms = new MemoryStream()) { using (var packedStream = new MemoryStream(packedData, false)) diff --git a/TLSharp.Core/Session.cs b/TLSharp.Core/Session.cs index 8ec8adc..9d32892 100644 --- a/TLSharp.Core/Session.cs +++ b/TLSharp.Core/Session.cs @@ -106,7 +106,7 @@ namespace TLSharp.Core writer.Write(Salt); writer.Write(LastMessageId); writer.Write(TimeOffset); - Serializers.String.write(writer, DataCenter.Address); + Serializers.String.Write(writer, DataCenter.Address); writer.Write(DataCenter.Port); if (TLUser != null) @@ -120,7 +120,7 @@ namespace TLSharp.Core writer.Write(0); } - Serializers.Bytes.write(writer, AuthKey.Data); + Serializers.Bytes.Write(writer, AuthKey.Data); return stream.ToArray(); } @@ -136,7 +136,7 @@ namespace TLSharp.Core var salt = reader.ReadUInt64(); var lastMessageId = reader.ReadInt64(); var timeOffset = reader.ReadInt32(); - var serverAddress = Serializers.String.read(reader); + var serverAddress = Serializers.String.Read(reader); var port = reader.ReadInt32(); var isAuthExsist = reader.ReadInt32() == 1; @@ -148,7 +148,7 @@ namespace TLSharp.Core TLUser = (TLUser)ObjectUtils.DeserializeObject(reader); } - var authData = Serializers.Bytes.read(reader); + var authData = Serializers.Bytes.Read(reader); var defaultDataCenter = new DataCenter (serverAddress, port); return new Session(store)