From d0c8f5eb457fb39e3dee543b67a3c126cea161ec Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Wed, 26 Oct 2022 19:41:21 +0800
Subject: [PATCH] Revert "add domainStrategy4Freedoms"
This reverts commit d0f953f1d81c252dd6407f57b37a60de95001fac.
---
.../Forms/OptionSettingForm.Designer.cs | 19 +-
v2rayN/v2rayN/Forms/OptionSettingForm.cs | 3 +-
v2rayN/v2rayN/Forms/OptionSettingForm.resx | 2084 +++++++++++------
v2rayN/v2rayN/Global.cs | 1 -
4 files changed, 1385 insertions(+), 722 deletions(-)
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
index a278d45c..29189e81 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
@@ -70,7 +70,6 @@
this.txtKcpmtu = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.tabPage7 = new System.Windows.Forms.TabPage();
- this.chkEnableCheckPreReleaseUpdate = new System.Windows.Forms.CheckBox();
this.numStatisticsFreshRate = new System.Windows.Forms.NumericUpDown();
this.txttrayMenuServersLimit = new System.Windows.Forms.TextBox();
this.label17 = new System.Windows.Forms.Label();
@@ -109,6 +108,7 @@
this.panel2 = new System.Windows.Forms.Panel();
this.btnOK = new System.Windows.Forms.Button();
this.panel1 = new System.Windows.Forms.Panel();
+ this.chkEnableCheckPreReleaseUpdate = new System.Windows.Forms.CheckBox();
this.tabControl1.SuspendLayout();
this.tabPage1.SuspendLayout();
this.groupBox1.SuspendLayout();
@@ -285,6 +285,11 @@
//
this.cmbdomainStrategy4Freedom.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbdomainStrategy4Freedom.FormattingEnabled = true;
+ this.cmbdomainStrategy4Freedom.Items.AddRange(new object[] {
+ resources.GetString("cmbdomainStrategy4Freedom.Items"),
+ resources.GetString("cmbdomainStrategy4Freedom.Items1"),
+ resources.GetString("cmbdomainStrategy4Freedom.Items2"),
+ resources.GetString("cmbdomainStrategy4Freedom.Items3")});
resources.ApplyResources(this.cmbdomainStrategy4Freedom, "cmbdomainStrategy4Freedom");
this.cmbdomainStrategy4Freedom.Name = "cmbdomainStrategy4Freedom";
//
@@ -417,12 +422,6 @@
this.tabPage7.Name = "tabPage7";
this.tabPage7.UseVisualStyleBackColor = true;
//
- // chkEnableCheckPreReleaseUpdate
- //
- resources.ApplyResources(this.chkEnableCheckPreReleaseUpdate, "chkEnableCheckPreReleaseUpdate");
- this.chkEnableCheckPreReleaseUpdate.Name = "chkEnableCheckPreReleaseUpdate";
- this.chkEnableCheckPreReleaseUpdate.UseVisualStyleBackColor = true;
- //
// numStatisticsFreshRate
//
resources.ApplyResources(this.numStatisticsFreshRate, "numStatisticsFreshRate");
@@ -659,6 +658,12 @@
resources.ApplyResources(this.panel1, "panel1");
this.panel1.Name = "panel1";
//
+ // chkEnableCheckPreReleaseUpdate
+ //
+ resources.ApplyResources(this.chkEnableCheckPreReleaseUpdate, "chkEnableCheckPreReleaseUpdate");
+ this.chkEnableCheckPreReleaseUpdate.Name = "chkEnableCheckPreReleaseUpdate";
+ this.chkEnableCheckPreReleaseUpdate.UseVisualStyleBackColor = true;
+ //
// OptionSettingForm
//
resources.ApplyResources(this, "$this");
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.cs
index a6dec30f..9d6502ed 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs
@@ -19,8 +19,7 @@ namespace v2rayN.Forms
private void OptionSettingForm_Load(object sender, EventArgs e)
{
cmbSystemProxyAdvancedProtocol.Items.AddRange(Global.IEProxyProtocols.ToArray());
- cmbdomainStrategy4Freedom.Items.AddRange(Global.domainStrategy4Freedoms.ToArray());
-
+
InitBase();
InitKCP();
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.resx
index 5b710080..c1cb6445 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.resx
@@ -143,10 +143,1219 @@
0
+
+ groupBox1
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage1
+
+
+ 0
+
+
+ 4, 22
+
+
+
+ 3, 3, 3, 3
+
+
+ 728, 427
+
+
+ 0
+
+
+ Core: basic settings
+
+
+ tabPage1
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl1
+
+
+ 0
+
+
+ cmbdomainStrategy4Freedom
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage2
+
+
+ 0
+
+
+ label19
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage2
+
+
+ 1
+
+
+ linkDnsObjectDoc
+
+
+ System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage2
+
+
+ 2
+
+
+ txtremoteDNS
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage2
+
+
+ 3
+
+
+ label14
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage2
+
+
+ 4
+
+
+ 4, 22
+
+
+ 728, 427
+
+
+ 4
+
+
+ Core: DNS settings
+
+
+ tabPage2
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl1
+
+
+ 1
+
+
+ chkKcpcongestion
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 0
+
+
+ txtKcpwriteBufferSize
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 1
+
+
+ label10
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 2
+
+
+ txtKcpreadBufferSize
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 3
+
+
+ label11
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 4
+
+
+ txtKcpdownlinkCapacity
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 5
+
+
+ label8
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 6
+
+
+ txtKcpuplinkCapacity
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 7
+
+
+ label9
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 8
+
+
+ txtKcptti
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 9
+
+
+ label7
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 10
+
+
+ txtKcpmtu
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 11
+
+
+ label6
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 12
+
+
+ 4, 22
+
+
+ 3, 3, 3, 3
+
+
+ 728, 427
+
+
+ 2
+
+
+ Core: KCP settings
+
+
+ tabPage6
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl1
+
+
+ 2
+
+
+ NoControl
+
+
+ 15, 247
+
+
+ 297, 16
+
+
+ 48
+
+
+ Check for pre-release updates
+
+
+ chkEnableCheckPreReleaseUpdate
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 0
+
+
+ 663, 37
+
+
+ 62, 21
+
+
+ 47
+
+
+ numStatisticsFreshRate
+
+
+ System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 1
+
+
+ 351, 211
+
+
+ 97, 21
+
+
+ 45
+
+
+ txttrayMenuServersLimit
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 2
+
+
+ True
+
+
+ NoControl
+
+
+ 27, 215
+
+
+ 263, 12
+
+
+ 44
+
+
+ Tray right-click menu servers display limit
+
+
+ label17
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 3
+
+
+ 351, 184
+
+
+ 97, 21
+
+
+ 43
+
+
+ txtautoUpdateSubInterval
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 4
+
+
+ True
+
+
+ NoControl
+
+
+ 27, 188
+
+
+ 305, 12
+
+
+ 42
+
+
+ Automatic update interval of subscriptions (hours)
+
+
+ label3
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 5
+
+
+ 15, 131
+
+
+ 506, 16
+
+
+ 41
+
+
+ Enable Security Protocol TLS v1.3 (subscription/update/speedtest)
+
+
+ chkEnableSecurityProtocolTls13
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 6
+
+
+ True
+
+
+ NoControl
+
+
+ 15, 108
+
+
+ 390, 16
+
+
+ 40
+
+
+ Automatically adjust column width after updating subscription
+
+
+ chkEnableAutoAdjustMainLvColWidth
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 7
+
+
+ NoControl
+
+
+ 30, 376
+
+
+ 282, 23
+
+
+ 39
+
+
+ Set Windows10 UWP Loopback
+
+
+ btnSetLoopback
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 8
+
+
+ 351, 157
+
+
+ 97, 21
+
+
+ 38
+
+
+ txtautoUpdateInterval
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 9
+
+
+ True
+
+
+ NoControl
+
+
+ 27, 161
+
+
+ 269, 12
+
+
+ 37
+
+
+ Automatic update interval of and Geo (hours)
+
+
+ label15
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 10
+
+
+ True
+
+
+ NoControl
+
+
+ 15, 85
+
+
+ 234, 16
+
+
+ 36
+
+
+ Ignore Geo files when updating core
+
+
+ chkIgnoreGeoUpdateCore
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 11
+
+
+ True
+
+
+ NoControl
+
+
+ 15, 62
+
+
+ 198, 16
+
+
+ 33
+
+
+ Keep older when deduplication
+
+
+ chkKeepOlderDedupl
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 12
+
+
+ True
+
+
+ NoControl
+
+
+ 479, 41
+
+
+ 179, 12
+
+
+ 30
+
+
+ Statistics freshrate (second)
+
+
+ lbFreshrate
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 13
+
+
+ True
+
+
+ NoControl
+
+
+ 15, 39
+
+
+ 468, 16
+
+
+ 29
+
+
+ Enable Statistics (Realtime netspeed and traffic records. Require restart)
+
+
+ chkEnableStatistics
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 14
+
+
+ True
+
+
+ 15, 16
+
+
+ 246, 16
+
+
+ 23
+
+
+ Automatically start at system startup
+
+
+ chkAutoRun
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 15
+
+
+ 4, 22
+
+
+ 3, 3, 3, 3
+
+
+ 728, 427
+
+
+ 3
+
+
+ v2rayN settings
+
+
+ tabPage7
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl1
+
+
+ 3
+
+
+ cmbCoreType6
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPageCoreType
+
+
+ 0
+
+
+ labCoreType6
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPageCoreType
+
+
+ 1
+
+
+ cmbCoreType5
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPageCoreType
+
+
+ 2
+
+
+ labCoreType5
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPageCoreType
+
+
+ 3
+
+
+ cmbCoreType4
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPageCoreType
+
+
+ 4
+
+
+ labCoreType4
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPageCoreType
+
+
+ 5
+
+
+ cmbCoreType3
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPageCoreType
+
+
+ 6
+
+
+ labCoreType3
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPageCoreType
+
+
+ 7
+
+
+ cmbCoreType2
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPageCoreType
+
+
+ 8
+
+
+ labCoreType2
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPageCoreType
+
+
+ 9
+
+
+ cmbCoreType1
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPageCoreType
+
+
+ 10
+
+
+ labCoreType1
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPageCoreType
+
+
+ 11
+
+
+ 4, 22
+
+
+ 3, 3, 3, 3
+
+
+ 728, 427
+
+
+ 6
+
+
+ CoreType settings
+
+
+ tabPageCoreType
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl1
+
+
+ 4
+
+
+ groupBox2
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage3
+
+
+ 0
+
+
+ 4, 22
+
+
+ 728, 427
+
+
+ 5
+
+
+ System proxy settings
+
+
+ tabPage3
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl1
+
+
+ 5
+
+
+ Fill
+
+
+ 0, 10
+
+
+ 736, 453
+
+
+ 10
+
+
+ tabControl1
+
+
+ System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 0
+
+
+ label16
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 0
+
+
+ label4
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 1
+
+
+ txtpass
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 2
+
+
+ txtuser
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 3
+
+
+ chkdefAllowInsecure
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 4
+
+
+ chkAllowLANConn
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 5
+
+
+ chksniffingEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 6
+
+
+ chkmuxEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 7
+
+
+ cmbprotocol
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 8
+
+
+ label1
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 9
+
+
+ chkudpEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 10
+
+
+ chklogEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 11
+
+
+ cmbloglevel
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 12
+
+
+ label5
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 13
+
+
+ txtlocalPort
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 14
+
+
+ label2
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 15
+
+
+ Fill
+
+
+ 3, 3
+
+
+ 722, 421
+
+
+ 6
+
+
+ groupBox1
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage1
+
+
+ 0
+
True
-
NoControl
@@ -154,7 +1363,7 @@
397, 65
- 79, 15
+ 59, 12
39
@@ -184,7 +1393,7 @@
224, 65
- 79, 15
+ 59, 12
38
@@ -208,7 +1417,7 @@
496, 61
- 120, 25
+ 120, 21
37
@@ -229,7 +1438,7 @@
285, 61
- 97, 25
+ 97, 21
36
@@ -256,7 +1465,7 @@
15, 192
- 133, 19
+ 102, 16
35
@@ -283,7 +1492,7 @@
15, 63
- 269, 19
+ 204, 16
29
@@ -313,7 +1522,7 @@
496, 27
- 157, 19
+ 120, 16
31
@@ -340,7 +1549,7 @@
15, 129
- 229, 19
+ 174, 16
20
@@ -373,7 +1582,7 @@
285, 25
- 97, 23
+ 97, 20
12
@@ -397,7 +1606,7 @@
224, 29
- 71, 15
+ 53, 12
11
@@ -424,7 +1633,7 @@
397, 27
- 109, 19
+ 84, 16
10
@@ -451,7 +1660,7 @@
15, 160
- 165, 19
+ 126, 16
9
@@ -490,7 +1699,7 @@
257, 158
- 97, 23
+ 97, 20
6
@@ -514,7 +1723,7 @@
193, 162
- 79, 15
+ 59, 12
8
@@ -538,7 +1747,7 @@
124, 25
- 78, 25
+ 78, 21
3
@@ -562,7 +1771,7 @@
33, 29
- 119, 15
+ 89, 12
2
@@ -582,62 +1791,23 @@
15
-
- Fill
+
+ AsIs
-
- 3, 3
+
+ UseIP
-
- 967, 549
+
+ UseIPv4
-
- 6
-
-
- groupBox1
-
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage1
-
-
- 0
-
-
- 4, 25
-
-
- 3, 3, 3, 3
-
-
- 973, 555
-
-
- 0
-
-
- Core: basic settings
-
-
- tabPage1
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl1
-
-
- 0
+
+ UseIPv6
223, 398
- 100, 23
+ 100, 20
41
@@ -664,7 +1834,7 @@
8, 402
- 255, 15
+ 191, 12
42
@@ -697,7 +1867,7 @@
0, 0, 0, 0
- 143, 15
+ 107, 12
40
@@ -754,7 +1924,7 @@
8, 17
- 375, 15
+ 281, 12
38
@@ -774,30 +1944,6 @@
4
-
- 4, 25
-
-
- 973, 555
-
-
- 4
-
-
- Core: DNS settings
-
-
- tabPage2
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl1
-
-
- 1
-
True
@@ -805,7 +1951,7 @@
20, 143
- 109, 19
+ 84, 16
20
@@ -829,7 +1975,7 @@
345, 100
- 94, 25
+ 94, 21
15
@@ -853,7 +1999,7 @@
236, 104
- 127, 15
+ 95, 12
14
@@ -877,7 +2023,7 @@
111, 100
- 94, 25
+ 94, 21
13
@@ -901,7 +2047,7 @@
18, 104
- 119, 15
+ 89, 12
12
@@ -925,7 +2071,7 @@
345, 62
- 94, 25
+ 94, 21
11
@@ -949,7 +2095,7 @@
236, 66
- 135, 15
+ 101, 12
10
@@ -973,7 +2119,7 @@
111, 62
- 94, 25
+ 94, 21
9
@@ -997,7 +2143,7 @@
18, 66
- 119, 15
+ 89, 12
8
@@ -1021,7 +2167,7 @@
345, 24
- 94, 25
+ 94, 21
7
@@ -1045,7 +2191,7 @@
236, 28
- 31, 15
+ 23, 12
6
@@ -1069,7 +2215,7 @@
111, 24
- 94, 25
+ 94, 21
5
@@ -1093,7 +2239,7 @@
18, 28
- 31, 15
+ 23, 12
4
@@ -1113,494 +2259,11 @@
12
-
- 4, 25
-
-
- 3, 3, 3, 3
-
-
- 728, 424
-
-
- 2
-
-
- Core: KCP settings
-
-
- tabPage6
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl1
-
-
- 2
-
-
- NoControl
-
-
- 15, 247
-
-
- 297, 16
-
-
- 48
-
-
- Check for pre-release updates
-
-
- chkEnableCheckPreReleaseUpdate
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 0
-
-
- 663, 37
-
-
- 62, 25
-
-
- 47
-
-
- numStatisticsFreshRate
-
-
- System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 1
-
-
- 351, 211
-
-
- 97, 25
-
-
- 45
-
-
- txttrayMenuServersLimit
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 2
-
-
- True
-
-
- NoControl
-
-
- 27, 215
-
-
- 351, 15
-
-
- 44
-
-
- Tray right-click menu servers display limit
-
-
- label17
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 3
-
-
- 351, 184
-
-
- 97, 25
-
-
- 43
-
-
- txtautoUpdateSubInterval
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 4
-
-
- True
-
-
- NoControl
-
-
- 27, 188
-
-
- 407, 15
-
-
- 42
-
-
- Automatic update interval of subscriptions (hours)
-
-
- label3
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 5
-
-
- 15, 131
-
-
- 506, 16
-
-
- 41
-
-
- Enable Security Protocol TLS v1.3 (subscription/update/speedtest)
-
-
- chkEnableSecurityProtocolTls13
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 6
-
-
- True
-
-
- NoControl
-
-
- 15, 108
-
-
- 517, 19
-
-
- 40
-
-
- Automatically adjust column width after updating subscription
-
-
- chkEnableAutoAdjustMainLvColWidth
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 7
-
-
- NoControl
-
-
- 30, 376
-
-
- 282, 23
-
-
- 39
-
-
- Set Windows10 UWP Loopback
-
-
- btnSetLoopback
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 8
-
-
- 351, 157
-
-
- 97, 25
-
-
- 38
-
-
- txtautoUpdateInterval
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 9
-
-
- True
-
-
- NoControl
-
-
- 27, 161
-
-
- 359, 15
-
-
- 37
-
-
- Automatic update interval of and Geo (hours)
-
-
- label15
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 10
-
-
- True
-
-
- NoControl
-
-
- 15, 85
-
-
- 309, 19
-
-
- 36
-
-
- Ignore Geo files when updating core
-
-
- chkIgnoreGeoUpdateCore
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 11
-
-
- True
-
-
- NoControl
-
-
- 15, 62
-
-
- 261, 19
-
-
- 33
-
-
- Keep older when deduplication
-
-
- chkKeepOlderDedupl
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 12
-
-
- True
-
-
- NoControl
-
-
- 479, 41
-
-
- 239, 15
-
-
- 30
-
-
- Statistics freshrate (second)
-
-
- lbFreshrate
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 13
-
-
- True
-
-
- NoControl
-
-
- 15, 39
-
-
- 621, 19
-
-
- 29
-
-
- Enable Statistics (Realtime netspeed and traffic records. Require restart)
-
-
- chkEnableStatistics
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 14
-
-
- True
-
-
- 15, 16
-
-
- 325, 19
-
-
- 23
-
-
- Automatically start at system startup
-
-
- chkAutoRun
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage7
-
-
- 15
-
-
- 4, 25
-
-
- 3, 3, 3, 3
-
-
- 728, 424
-
-
- 3
-
-
- v2rayN settings
-
-
- tabPage7
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl1
-
-
- 3
-
117, 172
- 143, 23
+ 143, 20
46
@@ -1627,7 +2290,7 @@
45, 176
- 79, 15
+ 59, 12
47
@@ -1651,7 +2314,7 @@
117, 146
- 143, 23
+ 143, 20
44
@@ -1678,7 +2341,7 @@
45, 150
- 79, 15
+ 59, 12
45
@@ -1702,7 +2365,7 @@
117, 120
- 143, 23
+ 143, 20
42
@@ -1729,7 +2392,7 @@
45, 124
- 79, 15
+ 59, 12
43
@@ -1753,7 +2416,7 @@
117, 94
- 143, 23
+ 143, 20
40
@@ -1780,7 +2443,7 @@
45, 98
- 79, 15
+ 59, 12
41
@@ -1804,7 +2467,7 @@
117, 68
- 143, 23
+ 143, 20
38
@@ -1831,7 +2494,7 @@
45, 72
- 79, 15
+ 59, 12
39
@@ -1855,7 +2518,7 @@
117, 42
- 143, 23
+ 143, 20
36
@@ -1882,7 +2545,7 @@
45, 46
- 79, 15
+ 59, 12
37
@@ -1902,33 +2565,93 @@
11
-
- 4, 25
+
+ label18
-
- 3, 3, 3, 3
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 728, 424
+
+ groupBox2
-
- 6
+
+ 0
-
- CoreType settings
+
+ cmbSystemProxyAdvancedProtocol
-
- tabPageCoreType
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ groupBox2
-
- tabControl1
+
+ 1
-
+
+ label13
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox2
+
+
+ 2
+
+
+ label12
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox2
+
+
+ 3
+
+
+ txtsystemProxyExceptions
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox2
+
+
4
+
+ Fill
+
+
+ 0, 0
+
+
+ 728, 427
+
+
+ 42
+
+
+ Exception
+
+
+ groupBox2
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage3
+
+
+ 0
+
True
@@ -1939,7 +2662,7 @@
8, 346
- 439, 15
+ 329, 12
45
@@ -1963,7 +2686,7 @@
8, 371
- 638, 23
+ 638, 20
44
@@ -1990,7 +2713,7 @@
6, 283
- 143, 15
+ 107, 12
42
@@ -2020,7 +2743,7 @@
8, 28
- 423, 15
+ 317, 12
40
@@ -2067,80 +2790,41 @@
4
-
- Fill
+
+ btnOK
-
- 0, 0
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 728, 424
+
+ panel2
-
- 42
+
+ 1
-
- Exception
+
+ Bottom
-
- groupBox2
+
+ 0, 463
-
- System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 736, 60
-
- tabPage3
+
+ 11
-
- 0
+
+ panel2
-
- 4, 25
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 728, 424
-
-
- 5
-
-
- System proxy settings
-
-
- tabPage3
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl1
-
-
- 5
-
-
- Fill
-
-
- 0, 10
-
-
- 981, 584
-
-
- 10
-
-
- tabControl1
-
-
- System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
+
$this
-
- 0
+
+ 1
267, 16
@@ -2166,30 +2850,6 @@
1
-
- Bottom
-
-
- 0, 594
-
-
- 981, 60
-
-
- 11
-
-
- panel2
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- $this
-
-
- 1
-
Top
@@ -2197,7 +2857,7 @@
0, 0
- 981, 10
+ 736, 10
9
@@ -2218,13 +2878,13 @@
True
- 8, 15
+ 6, 12
- 981, 654
+ 736, 523
- 5, 5, 5, 5
+ 4, 4, 4, 4
Settings
@@ -2233,6 +2893,6 @@
OptionSettingForm
- v2rayN.Forms.BaseForm, v2rayN, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
+ v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Global.cs b/v2rayN/v2rayN/Global.cs
index 8deb6d07..1c8fe14c 100644
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -217,7 +217,6 @@ namespace v2rayN
public static readonly List coreTypes = new List { "v2fly", "SagerNet", "Xray", "v2fly_v5" };
public static readonly List domainMatchers = new List { "linear", "mph", "" };
public static readonly List fingerprints = new List { "chrome", "firefox", "safari", "randomized", "" };
- public static readonly List domainStrategy4Freedoms = new List { "AsIs", "UseIP", "UseIPv4", "UseIPv6", "" };
public const string GrpcgunMode = "gun";
public const string GrpcmultiMode = "multi";
public const string CheckMark = "√";