mereg from other branch

Apps/ClientConsoleApp/Program.cs

@@ -19,10 +19,15 @@ namespace ClientConsoleApp
 
         static void Main(string[] args)
         {
-            System.Threading.Thread.Sleep(2000);
+            Thread.Sleep(2000);
             Console.WriteLine("Hello World!");
 
-            var client = GetTlgClient().Result;
+            //var tcpClient = new TcpClient();
+            //tcpClient.Connect(new IPEndPoint(IPAddress.Parse("127.0.0.1"), 5000));
+            //TestTcpClient(tcpClient);
+            //TestTcpClient(tcpClient);
+
+            TelegramClient client = GetTlgClient().Result;
             var normalizedNumber = NumberToSendMessage.StartsWith("+") ?
                 NumberToSendMessage.Substring(1, NumberToSendMessage.Length - 1) :
                 NumberToSendMessage;
@@ -86,10 +91,8 @@ namespace ClientConsoleApp
 
         }
 
-        private static void TestTcpClient()
+        private static void TestTcpClient(TcpClient tcpClient)
         {
-            var tcpClient = new TcpClient();
-            tcpClient.Connect(new IPEndPoint(IPAddress.Parse("127.0.0.1"), 5000));
             if (tcpClient.Connected)
             {
                 using (var memoryStream = new MemoryStream())
@@ -108,8 +111,7 @@ namespace ClientConsoleApp
                 }
             }
 
-            System.Threading.Thread.Sleep(20000);
+            Thread.Sleep(5000);
-
         }
     }
 }

Apps/TlgListenerApplication/Program.cs

@@ -9,6 +9,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Ionic.Crc;
 using TLSharp.Core.Auth;
+using TLSharp.Core.MTProto;
 using TLSharp.Core.MTProto.Crypto;
 using TLSharp.Core.Network;
 using TLSharp.Core.Utils;
@@ -59,16 +60,141 @@ namespace TlgListenerApplication
             }
         }
 
-
+        private static void ProcessRequest(TcpListener tcpListener)
-        private static void ProcessRequestBySocket(TcpListener tcpListener)
         {
-            Console.WriteLine("Processing socket...");
+            Console.WriteLine("Processing...");
-            var socketClient = tcpListener.AcceptSocket();
+            var tcpClient = tcpListener.AcceptTcpClient();
+            var netStream = tcpClient.GetStream();
+
+            //var getingCounter = 0;
+            //while (true)
+            //{
+            //    if (!netStream.DataAvailable)
+            //        continue;
+            //    Console.WriteLine("Get data " + ++getingCounter);
+            //}
+
+            while (tcpClient.Connected)
+            {
+                System.Threading.Thread.Sleep(100);
+                if (!netStream.DataAvailable) continue;
 
                 byte[] nonceFromClient = new byte[16];
+                uint responseCode = 0;
+                const uint step1Constructor = 0x60469778;
+                const uint step2Constructor = 0xd712e4be;
 
-            var bytes = new byte[socketClient.ReceiveBufferSize];
+                if (netStream.CanRead)
-            socketClient.Receive(bytes);
+                {
+                    var bytes = new byte[tcpClient.ReceiveBufferSize];
+                    netStream.Read(bytes, 0, (int)tcpClient.ReceiveBufferSize);
+                    var tcpMessage = TcpMessage.Decode(bytes);
+                    var binaryReader = new BinaryReader(new MemoryStream(tcpMessage.Body, false));
+                    var a = binaryReader.ReadInt64();
+                    var msgId = binaryReader.ReadInt64();
+                    var datalength = binaryReader.ReadInt32();
+                    var data = binaryReader.ReadBytes(datalength);
+
+                    var binaryReader2 = new BinaryReader(new MemoryStream(data, false));
+
+                    responseCode = binaryReader2.ReadUInt32();
+                    Console.WriteLine("Request code: " + responseCode);
+                    if (responseCode == step1Constructor)//---Step1_PQRequest
+                    {
+                        nonceFromClient = binaryReader2.ReadBytes(16);
+                    }
+                    else if (responseCode == step2Constructor)//---Step1_PQRequest
+                    {
+                        nonceFromClient = binaryReader2.ReadBytes(16);
+                    }
+
+                    //var obj = new Step1_PQRequest().FromBytes(data);
+                    //var rr = FromByteArray<Step1_PQRequest>(data);
+
+                    //var binaryReader = new BinaryReader(netStream);
+                    //var a = binaryReader.ReadInt64();
+                    //var b = binaryReader.ReadInt32();
+                    //var c = binaryReader.ReadInt32();
+                    //var d = binaryReader.ReadInt32();
+
+                    //Console.WriteLine("This is what the host returned to you: " + returndata);
+                }
+
+                if (netStream.CanWrite)
+                {
+                   
+                    var fingerprint = StringToByteArray("216be86c022bb4c3");
+
+                    byte[] outputdata = null;
+                    if (responseCode == step1Constructor)
+                    {
+                        var nonce = new byte[16];
+                        new Random().NextBytes(nonce);
+                        outputdata = new Step1_Response()
+                        {
+                            Pq = new BigInteger(1, BitConverter.GetBytes(880)),
+                            ServerNonce = nonceFromClient,
+                            Nonce = nonce,
+                            Fingerprints = new List<byte[]>() { fingerprint }
+                        }.ToBytes();
+                    }
+                    else if (responseCode == step2Constructor)
+                    {
+                        var newnonce = new byte[32];
+                        new Random().NextBytes(newnonce);
+
+                        byte[] answer;
+                        var hashsum = Encoding.UTF8.GetBytes("asdfghjklmnbvcxzasdf");
+                        const uint innerCode = 0xb5890dba;
+                        AESKeyData key = AES.GenerateKeyDataFromNonces(nonceFromClient, newnonce);
+                        using (var memoryStream = new MemoryStream())
+                        {
+                            using (var binaryWriter = new BinaryWriter(memoryStream))
+                            {
+                                binaryWriter.Write(hashsum);
+                                binaryWriter.Write(innerCode);
+                                binaryWriter.Write(nonceFromClient);
+                                binaryWriter.Write(newnonce);
+                                binaryWriter.Write(123456789);
+                                Serializers.Bytes.write(binaryWriter, new BigInteger(1, BitConverter.GetBytes(777)).ToByteArrayUnsigned());
+                                Serializers.Bytes.write(binaryWriter, new BigInteger(1, BitConverter.GetBytes(888)).ToByteArrayUnsigned());
+                                answer = memoryStream.ToArray();
+                            }
+                        }
+
+                        outputdata = new Step2_Response()
+                        {
+                            ServerNonce = nonceFromClient,
+                            Nonce = newnonce,
+                            NewNonce = newnonce,
+                            EncryptedAnswer = AES.EncryptAES(key, answer)
+                        }.ToBytes();
+                    }
+
+                    var bytes = PrepareToSend(outputdata);
+                    var datatosend = Encode(bytes, 11);
+                    netStream.Write(datatosend, 0, datatosend.Length);
+                }
+                else
+                {
+                    Console.WriteLine("You cannot write data to this stream.");
+                    tcpClient.Close();
+                    netStream.Close();
+                }
+            }
+        }
+
+        private static void ProcessRequestSocket(TcpListener tcpListener)
+        {
+            Console.WriteLine("Processing...");
+            var tcpClient = tcpListener.AcceptSocket();
+
+            var bytes = new byte[tcpClient.ReceiveBufferSize];
+            var countbyte = tcpClient.Receive(bytes);
+
+            return;
+
+            byte[] nonceFromClient = new byte[16];
             var tcpMessage = TcpMessage.Decode(bytes);
             var binaryReader = new BinaryReader(new MemoryStream(tcpMessage.Body, false));
             var a = binaryReader.ReadInt64();
@@ -88,67 +214,6 @@ namespace TlgListenerApplication
             var nonce = new byte[16];
             new Random().NextBytes(nonce);
 
-            var fingerprint = StringToByteArray("216be86c022bb4c3");
-
-            var step1 = new Step1_Response()
-            {
-                Pq = new BigInteger(1, BitConverter.GetBytes(880)),
-                ServerNonce = nonceFromClient,
-                Nonce = nonce,
-                Fingerprints = new List<byte[]>() { fingerprint }
-            };
-            var bytestosend = PrepareToSend(step1.ToBytes());
-            var datatosend = Encode(bytestosend, 11);
-            socketClient.Send(datatosend);
-        }
-
-        private static void ProcessRequest(TcpListener tcpListener)
-        {
-            Console.WriteLine("Processing...");
-            var tcpClient = tcpListener.AcceptTcpClient();
-
-            var netStream = tcpClient.GetStream();
-            if (netStream.DataAvailable)
-            {
-                byte[] nonceFromClient = new byte[16];
-                if (netStream.CanRead)
-                {
-                    var bytes = new byte[tcpClient.ReceiveBufferSize];
-                    netStream.Read(bytes, 0, (int)tcpClient.ReceiveBufferSize);
-                    var tcpMessage = TcpMessage.Decode(bytes);
-                    var binaryReader = new BinaryReader(new MemoryStream(tcpMessage.Body, false));
-                    //var a = binaryReader.ReadInt64();
-                    var msgId = binaryReader.ReadInt64();
-                    var datalength = binaryReader.ReadInt32();
-                    var data = binaryReader.ReadBytes(datalength);
-
-                    var binaryReader2 = new BinaryReader(new MemoryStream(data, false));
-                    const int responseConstructorNumber = 0x60469778;
-                    var responseCode = binaryReader2.ReadInt32();
-                    Console.WriteLine("Request code: " + responseCode);
-                    if (responseCode == responseConstructorNumber)//---Step1_PQRequest
-                    {
-                        nonceFromClient = binaryReader2.ReadBytes(16);
-                    }
-
-                    //var obj = new Step1_PQRequest().FromBytes(data);
-                    //var rr = FromByteArray<Step1_PQRequest>(data);
-
-                    //var binaryReader = new BinaryReader(netStream);
-                    //var a = binaryReader.ReadInt64();
-                    //var b = binaryReader.ReadInt32();
-                    //var c = binaryReader.ReadInt32();
-                    //var d = binaryReader.ReadInt32();
-
-
-                    //Console.WriteLine("This is what the host returned to you: " + returndata);
-                }
-
-                if (netStream.CanWrite)
-                {
-                    var nonce = new byte[16];
-                    new Random().NextBytes(nonce);
-
             var fingerprint = StringToByteArray("216be86c022bb4c3");
             //var rr = BitConverter.ToString(fingerprint).Replace("-", "");
 
@@ -159,18 +224,12 @@ namespace TlgListenerApplication
                 Nonce = nonce,
                 Fingerprints = new List<byte[]>() { fingerprint }
             };
-                    var bytes = PrepareToSend(step1.ToBytes());
+            var bytes1 = PrepareToSend(step1.ToBytes());
-                    var datatosend = Encode(bytes, 11);
+            var datatosend = Encode(bytes1, 11);
             //Byte[] sendBytes = Encoding.UTF8.GetBytes("Is anybody there?");
-                    netStream.Write(datatosend, 0, datatosend.Length);
+            tcpClient.Send(datatosend, SocketFlags.Truncated);
-                }
+
-                else
+            //tcpClient.Close();
-                {
-                    Console.WriteLine("You cannot write data to this stream.");
-                    netStream.Close();
-                    tcpClient.Close();
-                }
-            }
         }
 
         public static async Task<TcpMessage> Receieve(TcpClient tcpClient)

TLSharp.Core/Auth/Step2_DHExchange.cs

@@ -12,6 +12,25 @@ namespace TLSharp.Core.Auth
         public byte[] ServerNonce { get; set; }
         public byte[] NewNonce { get; set; }
         public byte[] EncryptedAnswer { get; set; }
+
+        public byte[] ToBytes()
+        {
+            new Random().NextBytes(Nonce);
+            const uint constructorNumber = 0xd0e8075c;
+
+            using (var memoryStream = new MemoryStream())
+            {
+                using (var binaryWriter = new BinaryWriter(memoryStream))
+                {
+                    binaryWriter.Write(constructorNumber);
+                    binaryWriter.Write(ServerNonce);
+                    binaryWriter.Write(Nonce);
+                    binaryWriter.Write(EncryptedAnswer);
+
+                    return memoryStream.ToArray();
+                }
+            }
+        }
     }
 
     public class Step2_DHExchange

TLSharp.Core/Network/TcpTransport.cs

@@ -18,8 +18,7 @@ namespace TLSharp.Core.Network
             {
                 _tcpClient = new TcpClient();
 
-                var ipAddress = IPAddress.Parse(address);
+                _tcpClient.Connect(IPAddress.Parse(address), port);
-                _tcpClient.Connect(ipAddress, port);
             }
             else
                 _tcpClient = handler(address, port);
@@ -38,6 +37,9 @@ namespace TLSharp.Core.Network
 
         public async Task<TcpMessage> Receieve()
         {
+            if (!_tcpClient.Connected)
+                throw new InvalidOperationException("Client not connected to server.");
+
             var stream = _tcpClient.GetStream();
 
             var packetLengthBytes = new byte[4];