From fa7c1b3f374fb9fc88d29457d134f668f939937f Mon Sep 17 00:00:00 2001 From: goingfine Date: Wed, 26 Apr 2023 19:15:35 +0330 Subject: [PATCH 1/4] support old export format in import --- windows/Classes/Config/ScanResults.cs | 14 +++++++++++++- windows/WinCFScan.csproj | 2 +- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/windows/Classes/Config/ScanResults.cs b/windows/Classes/Config/ScanResults.cs index 91d65cf1..1d11617a 100644 --- a/windows/Classes/Config/ScanResults.cs +++ b/windows/Classes/Config/ScanResults.cs @@ -75,7 +75,14 @@ public bool loadPlain() string plainString = File.ReadAllText(resultsFileName); long DLDelay = 0, UPDelay = 0; string ip; - foreach(var line in plainString.Split(Environment.NewLine)) + + var lines = plainString.Split(Environment.NewLine); + + if (lines.Length == 1 ) { // support old format: LF only + lines = plainString.Split("\n"); + } + + foreach (var line in lines) { ip = line; // DL UP IP @@ -89,6 +96,11 @@ public bool loadPlain() long.TryParse(splited[1], out UPDelay); ip = splited[2]; } + else if(splited.Length == 2) // old format, dl only + { + long.TryParse(splited[0], out DLDelay); + ip = splited[1]; + } } if(IPAddressExtensions.isValidIPAddress(ip)) diff --git a/windows/WinCFScan.csproj b/windows/WinCFScan.csproj index ccd1d8a1..28d3202d 100644 --- a/windows/WinCFScan.csproj +++ b/windows/WinCFScan.csproj @@ -6,7 +6,7 @@ enable true enable - 1.1.* + 1.2.* false AnyCPU;x86 WinCFScan.ico From 8e5e98dce66136cc0f487ac251cc23a697312088 Mon Sep 17 00:00:00 2001 From: goingfine Date: Wed, 10 May 2023 16:49:04 +0330 Subject: [PATCH 2/4] added option for NO-Fronting test --- windows/Classes/Checker/AbstractChecker.cs | 5 ++ windows/Classes/Checker/CheckIPWorking.cs | 6 ++- windows/Classes/ScanEngine.cs | 3 +- windows/frmMain.Designer.cs | 55 +++++++++++++--------- windows/frmMain.cs | 35 ++++++++++++-- 5 files changed, 75 insertions(+), 29 deletions(-) diff --git a/windows/Classes/Checker/AbstractChecker.cs b/windows/Classes/Checker/AbstractChecker.cs index 670c776e..9078bdbc 100644 --- a/windows/Classes/Checker/AbstractChecker.cs +++ b/windows/Classes/Checker/AbstractChecker.cs @@ -67,5 +67,10 @@ public enum CheckType UPLOAD, BOTH } + public enum FrontingType + { + YES, + NO + } } diff --git a/windows/Classes/Checker/CheckIPWorking.cs b/windows/Classes/Checker/CheckIPWorking.cs index fae6f8b2..7bdb713c 100644 --- a/windows/Classes/Checker/CheckIPWorking.cs +++ b/windows/Classes/Checker/CheckIPWorking.cs @@ -31,9 +31,10 @@ internal class CheckIPWorking private bool isDiagnosing = false; public bool isV2rayExecutionSuccess = false; public CheckType checkType { get; private set; } + public FrontingType frontingType { get; private set; } private CheckResultStatus checkResultStatus; - public CheckIPWorking(string ip, ScanSpeed dlTargetSpeed, ScanSpeed upTargetSpeed, CustomConfigInfo scanConfig, CheckType checkType, int checkTimeout, bool isDiagnosing = false) + public CheckIPWorking(string ip, ScanSpeed dlTargetSpeed, ScanSpeed upTargetSpeed, CustomConfigInfo scanConfig, CheckType checkType, FrontingType frontingType, int checkTimeout, bool isDiagnosing = false) { this.ip = ip; port = getPortByIP(); @@ -44,6 +45,7 @@ public CheckIPWorking(string ip, ScanSpeed dlTargetSpeed, ScanSpeed upTargetSpee this.checkTimeout = checkTimeout; this.isDiagnosing = isDiagnosing; this.checkType = checkType; + this.frontingType = frontingType; checkResultStatus = new CheckResultStatus(checkType); } @@ -58,7 +60,7 @@ public bool check() Tools.logStep("IP: " + ip, isDiagnosing); // first of all quick test on fronting domain through cloudflare - bool frontingSuccess = checkFronting(); + bool frontingSuccess = frontingType == FrontingType.YES || isDiagnosing ? checkFronting() : true; if (frontingSuccess || isDiagnosing) // on diagnosing we will always test v2ray { diff --git a/windows/Classes/ScanEngine.cs b/windows/Classes/ScanEngine.cs index 29da03d8..90fedb99 100644 --- a/windows/Classes/ScanEngine.cs +++ b/windows/Classes/ScanEngine.cs @@ -28,6 +28,7 @@ internal class ScanEngine public bool isV2rayExecutionSuccess { get; private set; } public ScanSpeed upTargetSpeed { get; set; } public CheckType checkType { get; set; } + public FrontingType frontingType { get; set; } public int concurrentProcess = 4; public ScanSpeed dlTargetSpeed; @@ -244,7 +245,7 @@ private void parallelScan(List ipRange) { progressInfo.curentWorkingThreads++; } - var checker = new CheckIPWorking(ip, dlTargetSpeed, this.upTargetSpeed, scanConfig, this.checkType, checkTimeout, isDiagnosing); + var checker = new CheckIPWorking(ip, dlTargetSpeed, this.upTargetSpeed, scanConfig, this.checkType, frontingType, checkTimeout, isDiagnosing); bool isOK = checker.check(); lock (locker) diff --git a/windows/frmMain.Designer.cs b/windows/frmMain.Designer.cs index 5e7f4bb2..b42b6820 100644 --- a/windows/frmMain.Designer.cs +++ b/windows/frmMain.Designer.cs @@ -54,6 +54,7 @@ private void InitializeComponent() toolStripSeparator2 = new ToolStripSeparator(); comboConcurrent = new ToolStripComboBox(); lblConcurrent = new ToolStripLabel(); + comboFronting = new ToolStripComboBox(); comboCheckType = new ToolStripComboBox(); comboUpTargetSpeed = new ToolStripComboBox(); comboDLTargetSpeed = new ToolStripComboBox(); @@ -171,7 +172,7 @@ private void InitializeComponent() txtLog.Name = "txtLog"; txtLog.ReadOnly = true; txtLog.ScrollBars = ScrollBars.Vertical; - txtLog.Size = new Size(838, 182); + txtLog.Size = new Size(873, 182); txtLog.TabIndex = 1; txtLog.Text = "Welcome to Cloudflare IP Scanner.\r\n"; // @@ -218,7 +219,7 @@ private void InitializeComponent() groupBox1.Location = new Point(12, 21); groupBox1.Name = "groupBox1"; groupBox1.Padding = new Padding(3, 0, 3, 3); - groupBox1.Size = new Size(838, 120); + groupBox1.Size = new Size(873, 120); groupBox1.TabIndex = 3; groupBox1.TabStop = false; // @@ -228,7 +229,7 @@ private void InitializeComponent() toolStrip2.Dock = DockStyle.None; toolStrip2.GripStyle = ToolStripGripStyle.Hidden; toolStrip2.Items.AddRange(new ToolStripItem[] { prgOveral, toolStripLabel1, btnSkipCurRange, prgCurRange, toolStripLabel2 }); - toolStrip2.Location = new Point(386, 52); + toolStrip2.Location = new Point(421, 52); toolStrip2.Name = "toolStrip2"; toolStrip2.RightToLeft = RightToLeft.Yes; toolStrip2.Size = new Size(446, 28); @@ -332,11 +333,11 @@ private void InitializeComponent() toolStrip1.AccessibleName = "Main scan settings"; toolStrip1.GripStyle = ToolStripGripStyle.Hidden; toolStrip1.ImageScalingSize = new Size(20, 20); - toolStrip1.Items.AddRange(new ToolStripItem[] { btnStart, toolStripSeparator2, comboConcurrent, lblConcurrent, comboCheckType, comboUpTargetSpeed, comboDLTargetSpeed, lblTargetSpeed, comboConfigs, toolStripLabel3 }); + toolStrip1.Items.AddRange(new ToolStripItem[] { btnStart, toolStripSeparator2, comboConcurrent, lblConcurrent, comboFronting, comboCheckType, comboUpTargetSpeed, comboDLTargetSpeed, lblTargetSpeed, comboConfigs, toolStripLabel3 }); toolStrip1.Location = new Point(3, 16); toolStrip1.Name = "toolStrip1"; toolStrip1.RightToLeft = RightToLeft.Yes; - toolStrip1.Size = new Size(832, 33); + toolStrip1.Size = new Size(867, 33); toolStrip1.TabIndex = 1; toolStrip1.TabStop = true; toolStrip1.Text = "toolStrip1"; @@ -393,6 +394,17 @@ private void InitializeComponent() lblConcurrent.Size = new Size(67, 30); lblConcurrent.Text = "Concurrent"; // + // comboFronting + // + comboFronting.AutoSize = false; + comboFronting.DropDownStyle = ComboBoxStyle.DropDownList; + comboFronting.FlatStyle = FlatStyle.System; + comboFronting.Items.AddRange(new object[] { "With Fronting", "NO Fronting" }); + comboFronting.Name = "comboFronting"; + comboFronting.RightToLeft = RightToLeft.No; + comboFronting.Size = new Size(105, 23); + comboFronting.ToolTipText = "With or Without fronting test"; + // // comboCheckType // comboCheckType.AutoSize = false; @@ -465,7 +477,7 @@ private void InitializeComponent() lblDebugMode.BackColor = SystemColors.Control; lblDebugMode.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); lblDebugMode.ForeColor = Color.Red; - lblDebugMode.Location = new Point(289, 92); + lblDebugMode.Location = new Point(324, 92); lblDebugMode.Name = "lblDebugMode"; lblDebugMode.Size = new Size(143, 15); lblDebugMode.TabIndex = 13; @@ -478,7 +490,7 @@ private void InitializeComponent() btnCopyFastestIP.AccessibleDescription = "A button for copy fastest found IP address into the clipboard"; btnCopyFastestIP.AccessibleName = "Copy fastest IP address"; btnCopyFastestIP.Anchor = AnchorStyles.Top | AnchorStyles.Right; - btnCopyFastestIP.Location = new Point(683, 87); + btnCopyFastestIP.Location = new Point(718, 87); btnCopyFastestIP.Name = "btnCopyFastestIP"; btnCopyFastestIP.Size = new Size(149, 25); btnCopyFastestIP.TabIndex = 2; @@ -495,7 +507,7 @@ private void InitializeComponent() txtFastestIP.BackColor = Color.White; txtFastestIP.Font = new Font("Segoe UI", 9F, FontStyle.Bold, GraphicsUnit.Point); txtFastestIP.ForeColor = Color.Green; - txtFastestIP.Location = new Point(438, 89); + txtFastestIP.Location = new Point(473, 89); txtFastestIP.Name = "txtFastestIP"; txtFastestIP.PlaceholderText = "Fastest IP"; txtFastestIP.ReadOnly = true; @@ -555,7 +567,7 @@ private void InitializeComponent() btnLoadIPRanges.AccessibleDescription = "A botton to allow you to load your custom Cloudflare IP ranges into the app"; btnLoadIPRanges.AccessibleName = "Load custom IP ranges"; btnLoadIPRanges.Anchor = AnchorStyles.Top | AnchorStyles.Right; - btnLoadIPRanges.Location = new Point(528, 8); + btnLoadIPRanges.Location = new Point(563, 8); btnLoadIPRanges.Name = "btnLoadIPRanges"; btnLoadIPRanges.Size = new Size(104, 23); btnLoadIPRanges.TabIndex = 4; @@ -568,7 +580,7 @@ private void InitializeComponent() // checkScanInRandomOrder.Anchor = AnchorStyles.Top | AnchorStyles.Right; checkScanInRandomOrder.AutoSize = true; - checkScanInRandomOrder.Location = new Point(330, 11); + checkScanInRandomOrder.Location = new Point(365, 11); checkScanInRandomOrder.Name = "checkScanInRandomOrder"; checkScanInRandomOrder.Size = new Size(194, 19); checkScanInRandomOrder.TabIndex = 5; @@ -584,7 +596,7 @@ private void InitializeComponent() listResults.GridLines = true; listResults.Location = new Point(0, 40); listResults.Name = "listResults"; - listResults.Size = new Size(830, 219); + listResults.Size = new Size(865, 219); listResults.TabIndex = 4; listResults.UseCompatibleStateImageBehavior = false; listResults.View = View.Details; @@ -678,7 +690,7 @@ private void InitializeComponent() // splitContainer1.Panel2 // splitContainer1.Panel2.Controls.Add(txtLog); - splitContainer1.Size = new Size(838, 480); + splitContainer1.Size = new Size(873, 480); splitContainer1.SplitterDistance = 294; splitContainer1.TabIndex = 7; // @@ -692,7 +704,7 @@ private void InitializeComponent() tabControl1.Location = new Point(0, 0); tabControl1.Name = "tabControl1"; tabControl1.SelectedIndex = 0; - tabControl1.Size = new Size(838, 294); + tabControl1.Size = new Size(873, 294); tabControl1.TabIndex = 4; // // tabPageCFRanges @@ -709,7 +721,7 @@ private void InitializeComponent() tabPageCFRanges.Location = new Point(4, 24); tabPageCFRanges.Name = "tabPageCFRanges"; tabPageCFRanges.Padding = new Padding(3); - tabPageCFRanges.Size = new Size(830, 266); + tabPageCFRanges.Size = new Size(865, 266); tabPageCFRanges.TabIndex = 1; tabPageCFRanges.Text = "Cloudflare IP ranges"; // @@ -720,7 +732,7 @@ private void InitializeComponent() listCFIPList.Columns.AddRange(new ColumnHeader[] { headIPRange, headTotalIPs }); listCFIPList.Location = new Point(0, 35); listCFIPList.Name = "listCFIPList"; - listCFIPList.Size = new Size(828, 223); + listCFIPList.Size = new Size(863, 223); listCFIPList.TabIndex = 0; listCFIPList.UseCompatibleStateImageBehavior = false; listCFIPList.View = View.Details; @@ -750,7 +762,7 @@ private void InitializeComponent() // btnSelectNoneIPRanges.AccessibleName = "Unselect all Cloudflare IP ranges"; btnSelectNoneIPRanges.Anchor = AnchorStyles.Top | AnchorStyles.Right; - btnSelectNoneIPRanges.Location = new Point(639, 9); + btnSelectNoneIPRanges.Location = new Point(674, 9); btnSelectNoneIPRanges.Name = "btnSelectNoneIPRanges"; btnSelectNoneIPRanges.Size = new Size(88, 23); btnSelectNoneIPRanges.TabIndex = 2; @@ -762,7 +774,7 @@ private void InitializeComponent() // btnSelectAllIPRanges.AccessibleName = "Select all Cloudflare IP ranges"; btnSelectAllIPRanges.Anchor = AnchorStyles.Top | AnchorStyles.Right; - btnSelectAllIPRanges.Location = new Point(736, 9); + btnSelectAllIPRanges.Location = new Point(771, 9); btnSelectAllIPRanges.Name = "btnSelectAllIPRanges"; btnSelectAllIPRanges.Size = new Size(88, 23); btnSelectAllIPRanges.TabIndex = 1; @@ -784,7 +796,7 @@ private void InitializeComponent() tabPageResults.Location = new Point(4, 24); tabPageResults.Name = "tabPageResults"; tabPageResults.Padding = new Padding(3); - tabPageResults.Size = new Size(830, 266); + tabPageResults.Size = new Size(865, 266); tabPageResults.TabIndex = 0; tabPageResults.Text = "Scan Results"; tabPageResults.UseVisualStyleBackColor = true; @@ -838,7 +850,7 @@ private void InitializeComponent() mnuMain.Items.AddRange(new ToolStripItem[] { fileToolStripMenuItem, toolsToolStripMenuItem, helpToolStripMenuItem }); mnuMain.Location = new Point(0, 0); mnuMain.Name = "mnuMain"; - mnuMain.Size = new Size(864, 24); + mnuMain.Size = new Size(899, 24); mnuMain.TabIndex = 8; mnuMain.Text = "menuStrip1"; // @@ -1060,7 +1072,7 @@ private void InitializeComponent() toolStripBottom.Items.AddRange(new ToolStripItem[] { btnFrontingErrors, toolStripSeparator3, btnDownloadErrors, toolStripSeparator4, lblAutoSkipStatus, seperatorAutoSkip, lblRunningWorkers, linkBuyMeCoffee, linkGithub, seperatorPaused, lblScanPaused }); toolStripBottom.Location = new Point(0, 628); toolStripBottom.Name = "toolStripBottom"; - toolStripBottom.Size = new Size(864, 33); + toolStripBottom.Size = new Size(899, 33); toolStripBottom.TabIndex = 9; toolStripBottom.Text = "toolStrip2"; // @@ -1178,7 +1190,7 @@ private void InitializeComponent() // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(864, 661); + ClientSize = new Size(899, 661); Controls.Add(toolStripBottom); Controls.Add(mnuMain); Controls.Add(splitContainer1); @@ -1332,5 +1344,6 @@ private void InitializeComponent() private ToolStripLabel toolStripLabel4; private ToolStripComboBox comboCheckType; private ColumnHeader hdrUPDelay; + private ToolStripComboBox comboFronting; } } \ No newline at end of file diff --git a/windows/frmMain.cs b/windows/frmMain.cs index d345fa95..18eecdfa 100644 --- a/windows/frmMain.cs +++ b/windows/frmMain.cs @@ -85,6 +85,7 @@ public frmMain() comboDLTargetSpeed.SelectedIndex = 3; // 100kb/s comboUpTargetSpeed.SelectedIndex = 2; // 50kb/s comboCheckType.SelectedIndex = 0; // Only Download + comboFronting.SelectedIndex = 0; // With Fronting comboDownloadTimeout.SelectedIndex = 0; // 2 seconds timeout loadCustomConfigsComboList(); @@ -190,6 +191,15 @@ private void btnStart_ButtonClick(object sender, EventArgs e) startStopScan((ScanType)scanType); } + // setting Fronting to NO and also DL Target Speed to Zero in same time is not a valid scan setting + // and here we will prevent it. + private bool isValidScanSettings() + { + if (getSelectedFrontingType() == FrontingType.NO && getDownloadTargetSpeed().isSpeedZero()) + return false; + + return true; + } private void startStopScan(ScanType scanType = ScanType.SCAN_CLOUDFLARE_IPS) @@ -205,6 +215,12 @@ private void startStopScan(ScanType scanType = ScanType.SCAN_CLOUDFLARE_IPS) addTextLog($"Can not start while app is scanning."); return; } + + if (! isValidScanSettings()) + { + addTextLog($"You are not allowed to set Fronting test to NO and No Speed Test at the same time!"); + return; + } // stop scan if (isScanRunning()) @@ -274,6 +290,7 @@ private void startStopScan(ScanType scanType = ScanType.SCAN_CLOUDFLARE_IPS) scanEngine.isDiagnosing = isDiagnosing; // is diagnosing scanEngine.isRandomScan = checkScanInRandomOrder.Checked; // is random scan scanEngine.checkType = getSelectedCheckType(); // upload - download - both + scanEngine.frontingType = getSelectedFrontingType(); // YES - NO Fronting scanEngine.upTargetSpeed = getUploadTargetSpeed(); // set upload target speed string scanConfigContent = scanEngine.scanConfig.content; @@ -381,6 +398,7 @@ private void updateUIControls(bool isStarting, ScanType scanType = ScanType.SCAN comboDLTargetSpeed.Enabled = false; comboConfigs.Enabled = false; comboCheckType.Enabled = false; + comboFronting.Enabled = false; timerProgress.Enabled = true; //btnSkipCurRange.Enabled = true; comboResults.Enabled = false; @@ -405,6 +423,7 @@ private void updateUIControls(bool isStarting, ScanType scanType = ScanType.SCAN comboUpTargetSpeed.Enabled = true; comboConfigs.Enabled = true; comboCheckType.Enabled = true; + comboFronting.Enabled = true; if (!isScanPaused()) { @@ -890,6 +909,11 @@ private CheckType getSelectedCheckType() return (CheckType)comboCheckType.SelectedIndex; } + private FrontingType getSelectedFrontingType() + { + return (FrontingType)comboFronting.SelectedIndex; + } + private ScanSpeed getDownloadTargetSpeed() { int speed; @@ -1066,7 +1090,7 @@ private void scanASingleIPAddressToolStripMenuItem_Click(object sender, EventArg string ipAddr; if (getIPFromUser(out ipAddr, "Test Single IP Address")) { - testAvgSingleIP(ipAddr, 1, getDownloadTargetSpeed(), getUploadTargetSpeed(), getSelectedV2rayConfig(), getDownloadTimeout(), getSelectedCheckType()); + testAvgSingleIP(ipAddr, 1, getDownloadTargetSpeed(), getUploadTargetSpeed(), getSelectedV2rayConfig(), getDownloadTimeout(), getSelectedCheckType(), getSelectedFrontingType()); } } @@ -1453,7 +1477,7 @@ private void updateClientConfigCloudflareSubnetsToolStripMenuItem_Click(object s } - private void testAvgSingleIP(string IPAddress, int rounds, ScanSpeed dlSpeed, ScanSpeed upSpeed, CustomConfigInfo v2rayConfig, int downloadTimeout, CheckType checkType = CheckType.DOWNLOAD) + private void testAvgSingleIP(string IPAddress, int rounds, ScanSpeed dlSpeed, ScanSpeed upSpeed, CustomConfigInfo v2rayConfig, int downloadTimeout, CheckType checkType, FrontingType frontingType) { addTextLog($"{Environment.NewLine}Testing {IPAddress} for {rounds} round(s), Scan type: {checkType}..."); @@ -1465,7 +1489,7 @@ private void testAvgSingleIP(string IPAddress, int rounds, ScanSpeed dlSpeed, Sc for (int i = 1; i <= rounds; i++) { // test - var checker = new CheckIPWorking(IPAddress, dlSpeed, upSpeed, v2rayConfig, checkType, downloadTimeout); + var checker = new CheckIPWorking(IPAddress, dlSpeed, upSpeed, v2rayConfig, checkType, frontingType, downloadTimeout); var success = checker.check(); long DLDuration = checker.downloadDuration; @@ -1531,6 +1555,7 @@ private void testSelectedIPAddresses(int rounds = 1) var dlSpeed = getDownloadTargetSpeed(); var upSpeed = getUploadTargetSpeed(); var checkType = getSelectedCheckType(); + var frontingType = getSelectedFrontingType(); var conf = getSelectedV2rayConfig(); var timeout = getDownloadTimeout(); @@ -1550,7 +1575,7 @@ private void testSelectedIPAddresses(int rounds = 1) for (int i = 0; i < selectedIPs.Length; i++) { var ip = selectedIPs[i]; - testAvgSingleIP(ip, rounds, dlSpeed, upSpeed, conf, timeout, checkType); + testAvgSingleIP(ip, rounds, dlSpeed, upSpeed, conf, timeout, checkType, frontingType); // stop requested if (stopAvgTetingIsRequested) @@ -1600,7 +1625,7 @@ private void testSelectedIP() if (ip != null) { - testAvgSingleIP(ip, 1, getDownloadTargetSpeed(), getUploadTargetSpeed(), getSelectedV2rayConfig(), getDownloadTimeout(), getSelectedCheckType()); + testAvgSingleIP(ip, 1, getDownloadTargetSpeed(), getUploadTargetSpeed(), getSelectedV2rayConfig(), getDownloadTimeout(), getSelectedCheckType(), getSelectedFrontingType()); } } From 84631b3085cacb624d2a66847797cd91118500be Mon Sep 17 00:00:00 2001 From: goingfine Date: Wed, 10 May 2023 16:54:20 +0330 Subject: [PATCH 3/4] update latest version --- windows/Classes/Checker/CheckIPWorking.cs | 3 ++- windows/Properties/latest-version | 2 +- windows/frmMain.cs | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/windows/Classes/Checker/CheckIPWorking.cs b/windows/Classes/Checker/CheckIPWorking.cs index 7bdb713c..8a6a44b1 100644 --- a/windows/Classes/Checker/CheckIPWorking.cs +++ b/windows/Classes/Checker/CheckIPWorking.cs @@ -34,7 +34,8 @@ internal class CheckIPWorking public FrontingType frontingType { get; private set; } private CheckResultStatus checkResultStatus; - public CheckIPWorking(string ip, ScanSpeed dlTargetSpeed, ScanSpeed upTargetSpeed, CustomConfigInfo scanConfig, CheckType checkType, FrontingType frontingType, int checkTimeout, bool isDiagnosing = false) + public CheckIPWorking(string ip, ScanSpeed dlTargetSpeed, ScanSpeed upTargetSpeed, CustomConfigInfo scanConfig, + CheckType checkType, FrontingType frontingType, int checkTimeout, bool isDiagnosing = false) { this.ip = ip; port = getPortByIP(); diff --git a/windows/Properties/latest-version b/windows/Properties/latest-version index 6cb8a745..dafd80a6 100644 --- a/windows/Properties/latest-version +++ b/windows/Properties/latest-version @@ -1 +1 @@ -v:1.1.8506.21097 \ No newline at end of file +v:1.2.8530.25113 \ No newline at end of file diff --git a/windows/frmMain.cs b/windows/frmMain.cs index 18eecdfa..49f06ca3 100644 --- a/windows/frmMain.cs +++ b/windows/frmMain.cs @@ -191,7 +191,7 @@ private void btnStart_ButtonClick(object sender, EventArgs e) startStopScan((ScanType)scanType); } - // setting Fronting to NO and also DL Target Speed to Zero in same time is not a valid scan setting + // setting Fronting to NO and also DL Target Speed to Zero at the same time is not a valid scan setting // and here we will prevent it. private bool isValidScanSettings() { From 374e792c671a70817a4607c29b4cc5487f727b40 Mon Sep 17 00:00:00 2001 From: goingfine Date: Wed, 10 May 2023 16:59:35 +0330 Subject: [PATCH 4/4] update latest version --- windows/Properties/latest-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/windows/Properties/latest-version b/windows/Properties/latest-version index dafd80a6..2f6edfe4 100644 --- a/windows/Properties/latest-version +++ b/windows/Properties/latest-version @@ -1 +1 @@ -v:1.2.8530.25113 \ No newline at end of file +v:1.2.8530.30281 \ No newline at end of file