diff --git a/v2rayN/v2rayN/Forms/MainForm.cs b/v2rayN/v2rayN/Forms/MainForm.cs
index 67b78ee5..3eb68a7b 100644
--- a/v2rayN/v2rayN/Forms/MainForm.cs
+++ b/v2rayN/v2rayN/Forms/MainForm.cs
@@ -223,7 +223,7 @@ namespace v2rayN.Forms
}
VmessItem item = config.vmess[k];
-
+
bool stats = statistics != null && statistics.Enable;
if (stats)
{
@@ -1310,7 +1310,7 @@ namespace v2rayN.Forms
string fileName = downloadHandle.DownloadFileName;
fileName = Utils.GetPath(fileName);
- FileManager.ZipExtractToFile(fileName);
+ FileManager.ZipExtractToFile(fileName, config.ignoreGeoUpdateCore ? "geo" : "");
AppendText(false, UIRes.I18N("MsgUpdateV2rayCoreSuccessfullyMore"));
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
index 13e23b02..ddbc4857 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
@@ -69,6 +69,7 @@
this.txtKcpmtu = new System.Windows.Forms.TextBox();
this.label6 = new System.Windows.Forms.Label();
this.tabPage7 = new System.Windows.Forms.TabPage();
+ this.chkIgnoreGeoUpdateCore = new System.Windows.Forms.CheckBox();
this.cmbCoreType = new System.Windows.Forms.ComboBox();
this.label4 = new System.Windows.Forms.Label();
this.chkKeepOlderDedupl = new System.Windows.Forms.CheckBox();
@@ -91,32 +92,31 @@
//
// btnClose
//
- resources.ApplyResources(this.btnClose, "btnClose");
this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
+ resources.ApplyResources(this.btnClose, "btnClose");
this.btnClose.Name = "btnClose";
this.btnClose.UseVisualStyleBackColor = true;
this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
//
// tabControl1
//
- resources.ApplyResources(this.tabControl1, "tabControl1");
this.tabControl1.Controls.Add(this.tabPage1);
this.tabControl1.Controls.Add(this.tabPage2);
this.tabControl1.Controls.Add(this.tabPage6);
this.tabControl1.Controls.Add(this.tabPage7);
+ resources.ApplyResources(this.tabControl1, "tabControl1");
this.tabControl1.Name = "tabControl1";
this.tabControl1.SelectedIndex = 0;
//
// tabPage1
//
- resources.ApplyResources(this.tabPage1, "tabPage1");
this.tabPage1.Controls.Add(this.groupBox1);
+ resources.ApplyResources(this.tabPage1, "tabPage1");
this.tabPage1.Name = "tabPage1";
this.tabPage1.UseVisualStyleBackColor = true;
//
// groupBox1
//
- resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Controls.Add(this.chkdefAllowInsecure);
this.groupBox1.Controls.Add(this.chksniffingEnabled2);
this.groupBox1.Controls.Add(this.chksniffingEnabled);
@@ -134,6 +134,7 @@
this.groupBox1.Controls.Add(this.label5);
this.groupBox1.Controls.Add(this.txtlocalPort);
this.groupBox1.Controls.Add(this.label2);
+ resources.ApplyResources(this.groupBox1, "groupBox1");
this.groupBox1.Name = "groupBox1";
this.groupBox1.TabStop = false;
//
@@ -176,12 +177,12 @@
//
// cmbprotocol2
//
- resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
this.cmbprotocol2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbprotocol2.FormattingEnabled = true;
this.cmbprotocol2.Items.AddRange(new object[] {
resources.GetString("cmbprotocol2.Items"),
resources.GetString("cmbprotocol2.Items1")});
+ resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
this.cmbprotocol2.Name = "cmbprotocol2";
//
// label3
@@ -196,8 +197,8 @@
//
// cmbprotocol
//
- resources.ApplyResources(this.cmbprotocol, "cmbprotocol");
this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+ resources.ApplyResources(this.cmbprotocol, "cmbprotocol");
this.cmbprotocol.FormattingEnabled = true;
this.cmbprotocol.Items.AddRange(new object[] {
resources.GetString("cmbprotocol.Items"),
@@ -223,7 +224,6 @@
//
// cmbloglevel
//
- resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
this.cmbloglevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbloglevel.FormattingEnabled = true;
this.cmbloglevel.Items.AddRange(new object[] {
@@ -232,6 +232,7 @@
resources.GetString("cmbloglevel.Items2"),
resources.GetString("cmbloglevel.Items3"),
resources.GetString("cmbloglevel.Items4")});
+ resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
this.cmbloglevel.Name = "cmbloglevel";
//
// label5
@@ -251,10 +252,10 @@
//
// tabPage2
//
- resources.ApplyResources(this.tabPage2, "tabPage2");
this.tabPage2.Controls.Add(this.linkDnsObjectDoc);
this.tabPage2.Controls.Add(this.txtremoteDNS);
this.tabPage2.Controls.Add(this.label14);
+ resources.ApplyResources(this.tabPage2, "tabPage2");
this.tabPage2.Name = "tabPage2";
this.tabPage2.UseVisualStyleBackColor = true;
//
@@ -263,6 +264,7 @@
resources.ApplyResources(this.linkDnsObjectDoc, "linkDnsObjectDoc");
this.linkDnsObjectDoc.Name = "linkDnsObjectDoc";
this.linkDnsObjectDoc.TabStop = true;
+ this.linkDnsObjectDoc.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.linkDnsObjectDoc_LinkClicked);
//
// txtremoteDNS
//
@@ -276,7 +278,6 @@
//
// tabPage6
//
- resources.ApplyResources(this.tabPage6, "tabPage6");
this.tabPage6.Controls.Add(this.chkKcpcongestion);
this.tabPage6.Controls.Add(this.txtKcpwriteBufferSize);
this.tabPage6.Controls.Add(this.label10);
@@ -290,6 +291,7 @@
this.tabPage6.Controls.Add(this.label7);
this.tabPage6.Controls.Add(this.txtKcpmtu);
this.tabPage6.Controls.Add(this.label6);
+ resources.ApplyResources(this.tabPage6, "tabPage6");
this.tabPage6.Name = "tabPage6";
this.tabPage6.UseVisualStyleBackColor = true;
//
@@ -361,7 +363,7 @@
//
// tabPage7
//
- resources.ApplyResources(this.tabPage7, "tabPage7");
+ this.tabPage7.Controls.Add(this.chkIgnoreGeoUpdateCore);
this.tabPage7.Controls.Add(this.cmbCoreType);
this.tabPage7.Controls.Add(this.label4);
this.tabPage7.Controls.Add(this.chkKeepOlderDedupl);
@@ -370,17 +372,24 @@
this.tabPage7.Controls.Add(this.chkEnableStatistics);
this.tabPage7.Controls.Add(this.chkAllowLANConn);
this.tabPage7.Controls.Add(this.chkAutoRun);
+ resources.ApplyResources(this.tabPage7, "tabPage7");
this.tabPage7.Name = "tabPage7";
this.tabPage7.UseVisualStyleBackColor = true;
//
+ // chkIgnoreGeoUpdateCore
+ //
+ resources.ApplyResources(this.chkIgnoreGeoUpdateCore, "chkIgnoreGeoUpdateCore");
+ this.chkIgnoreGeoUpdateCore.Name = "chkIgnoreGeoUpdateCore";
+ this.chkIgnoreGeoUpdateCore.UseVisualStyleBackColor = true;
+ //
// cmbCoreType
//
- resources.ApplyResources(this.cmbCoreType, "cmbCoreType");
this.cmbCoreType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbCoreType.FormattingEnabled = true;
this.cmbCoreType.Items.AddRange(new object[] {
resources.GetString("cmbCoreType.Items"),
resources.GetString("cmbCoreType.Items1")});
+ resources.ApplyResources(this.cmbCoreType, "cmbCoreType");
this.cmbCoreType.Name = "cmbCoreType";
//
// label4
@@ -396,9 +405,9 @@
//
// cbFreshrate
//
- resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
this.cbFreshrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cbFreshrate.FormattingEnabled = true;
+ resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
this.cbFreshrate.Name = "cbFreshrate";
//
// lbFreshrate
@@ -426,9 +435,9 @@
//
// panel2
//
- resources.ApplyResources(this.panel2, "panel2");
this.panel2.Controls.Add(this.btnClose);
this.panel2.Controls.Add(this.btnOK);
+ resources.ApplyResources(this.panel2, "panel2");
this.panel2.Name = "panel2";
//
// btnOK
@@ -522,5 +531,6 @@
private System.Windows.Forms.Label label14;
private System.Windows.Forms.ComboBox cmbCoreType;
private System.Windows.Forms.Label label4;
+ private System.Windows.Forms.CheckBox chkIgnoreGeoUpdateCore;
}
}
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.cs b/v2rayN/v2rayN/Forms/OptionSettingForm.cs
index d26843a6..95dbb622 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs
@@ -120,6 +120,7 @@ namespace v2rayN.Forms
break;
}
+ chkIgnoreGeoUpdateCore.Checked = config.ignoreGeoUpdateCore;
cmbCoreType.SelectedIndex = (int)config.coreType;
}
private void btnOK_Click(object sender, EventArgs e)
@@ -285,6 +286,7 @@ namespace v2rayN.Forms
config.statisticsFreshRate = (int)cbFreshrate.SelectedValue;
config.keepOlderDedupl = chkKeepOlderDedupl.Checked;
+ config.ignoreGeoUpdateCore = chkIgnoreGeoUpdateCore.Checked;
config.coreType = (ECoreType)cmbCoreType.SelectedIndex;
return 0;
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.resx
index 05feb4af..a0268ac7 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.resx
@@ -117,1390 +117,1837 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- True
-
-
- Xray_core
-
-
- 11
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- Keep older when deduplication
-
-
- 1
-
-
- Record local logs
-
-
- 12
-
-
- 4, 22
+
+ 355, 16
-
- txtKcpwriteBufferSize
+
+ 75, 23
-
- groupBox1
-
-
- 4
-
-
- False
-
-
- 14
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabControl1
-
-
- groupBox1
-
-
- 9
-
-
- groupBox1
-
-
- 662, 523
-
-
- 35
-
-
- 1
-
-
- 468, 60
-
-
-
- Top
-
-
- 102, 16
-
-
- cmbprotocol
-
-
- 6
-
-
- 14
-
-
- 30, 87
-
-
- 111, 100
-
-
- True
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 84, 16
-
-
- 40
-
-
- True
-
-
- 120, 16
-
-
- True
-
-
- tti
-
-
- tabPage6
-
-
- chkdefAllowInsecure
-
-
+
+
7
-
- tabPage7
-
-
- 12
-
-
- http
-
-
- 7
-
-
- label5
-
-
- 648, 421
-
-
- 206, 64
-
-
- 95, 12
-
-
- tabPage6
-
-
- 15, 63
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 2
-
-
- Enable UDP
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 2
-
&Cancel
-
- label10
-
-
- groupBox1
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 662, 10
-
-
- Settings
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- label4
-
-
- 236, 66
-
-
- txtKcpmtu
-
-
- lbFreshrate
-
-
- 12
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- label11
-
-
- 29
-
-
- 8
-
-
- 0, 10
-
-
- 58, 20
-
-
- Support DnsObject
-
-
- tabPage6
-
-
- False
-
-
- groupBox1
-
-
- $this
-
-
- 3
-
-
- 6
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- NoControl
-
-
- tabPage7
-
-
- tabPage6
-
-
- Bottom
-
-
- 576, 16
-
-
- 18
-
-
- True
-
-
- 39
-
-
- tabPage6
-
-
- congestion
-
-
- NoControl
+
+ btnClose
System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 89, 12
-
-
- NoControl
-
-
- 0
-
-
- tabPage7
-
-
- v2rayN settings
-
-
- 16
-
-
- groupBox1
-
-
- 10
-
-
- 32
-
-
- 6, 12
-
-
- groupBox1
-
-
- 1
-
-
- True
-
-
- 8
-
-
- 198, 16
-
-
- Automatically start at system startup
-
-
- Fill
-
-
- txtKcptti
-
-
- 2
-
-
- Turn on Sniffing
-
-
- 281, 12
-
-
- tabPage7
-
-
- 2
-
-
- 3, 3, 3, 3
-
-
- 3
-
-
- 662, 453
-
-
- 33, 29
-
-
- 1
-
-
- 124, 60
-
-
- 78, 21
-
-
- Log level
-
-
- tabControl1
-
-
- 59, 12
-
-
- v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
-
-
- warning
-
-
- tabPage2
-
-
+
panel2
-
- 11
-
-
- Statistics freshrate
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- True
-
-
- 120, 16
-
-
- 89, 12
-
-
- btnOK
-
-
- 18, 66
-
-
- 20, 143
-
-
- 15
-
-
- True
-
-
- 4, 4, 4, 4
-
-
- tabPage6
-
-
- 5
-
-
- Turn on Sniffing
+
+ 0
groupBox1
-
- 18, 28
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 20
-
-
- 29
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 14
-
-
- 5
-
-
- Core Type
-
-
- True
-
-
- chksniffingEnabled
-
-
- 2
-
-
- 174, 16
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 18, 104
-
-
- tabPage2
-
-
- mtu
-
-
- socks
-
System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- panel1
-
-
- 30
-
-
- 53, 12
-
-
- 13
-
-
- label8
-
-
- 468, 27
-
-
- 236, 28
-
-
- chkAutoRun
-
-
- 94, 21
-
-
- 345, 62
-
-
- 11
-
-
- 15, 129
-
-
- chkudpEnabled
-
-
- 0
-
-
- True
-
-
- 8, 17
-
tabPage1
-
- tabPage6
-
-
- System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 1
-
-
- System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 84, 16
-
-
- 15
-
-
- True
-
-
- False
-
-
- label7
-
-
- txtlocalPort
-
-
- info
-
-
- 19
-
-
- readBufferSize
-
-
- tabPage6
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- btnClose
-
-
- 124, 25
-
-
- protocol
-
-
- 23, 12
-
-
- 638, 356
-
-
- socks
-
-
- 2
-
-
- 3, 3
-
-
- chkAllowLANConn
-
-
- 84, 16
-
-
- tabControl1
-
-
- True
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- True
-
-
- 1
-
-
- 10
-
-
- 369, 62
-
-
- 161, 84
-
-
- 9
-
-
- groupBox1
-
-
- 33, 141
-
-
- NoControl
-
-
- chkEnableStatistics
-
-
- 4
-
-
- 355, 16
-
-
- 53, 12
-
-
- 193, 162
-
-
- True
-
-
- 369, 27
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- tabPage6
-
-
- label2
-
-
- 654, 427
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 9
-
-
- 101, 12
-
-
- 5
-
-
- 12
-
-
- 20
-
-
- allowInsecure
-
-
- Enable Statistics (Realtime netspeed and traffic records. Require restart the v2rayN client)
-
-
- $this
-
-
- 4
-
-
- Listening port
-
-
- Fill
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- False
-
-
- 257, 60
-
-
+
0
-
- tabControl1
-
-
- True
-
-
- 34
-
-
- cmbprotocol2
-
-
- chkKeepOlderDedupl
-
-
- True
-
-
- 16
-
-
- True
-
-
- True
-
-
- True
-
-
- chkKcpcongestion
-
-
- Core: basic settings
-
-
- 0
-
-
- 257, 25
-
-
- tabPage2
-
-
- tabControl1
-
-
- listening port 2
-
-
- 97, 20
-
-
- chkAllowIn2
-
-
- 15, 38
-
-
- True
-
-
- 15, 160
-
-
- 38
-
-
- 33
-
4, 22
-
- v2fly_core
+
+
+ 3, 3, 3, 3
-
- 9
-
-
- label1
-
-
- Core: KCP settings
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- error
-
-
- 59, 12
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 8
-
-
- 120, 16
-
-
- 75, 23
-
-
- txtlocalPort2
-
-
- True
-
-
- 246, 16
-
-
- True
-
-
+
654, 427
-
- 10
+
+ 0
-
- False
-
-
- 206, 29
-
-
- downlinkCapacity
-
-
- chkudpEnabled2
-
-
- Allow connections from the LAN
+
+ Core: basic settings
tabPage1
-
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl1
+
+
+ 0
+
+
+ linkDnsObjectDoc
+
+
+ System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage2
+
+
+ 0
+
+
+ txtremoteDNS
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage2
+
+
+ 1
+
+
+ label14
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage2
+
+
+ 2
+
+
+ 4, 22
+
+
+ 654, 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
-
- 2
-
-
- panel2
-
-
- 3
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- linkDnsObjectDoc
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 125, 12
-
-
- txtKcpreadBufferSize
-
-
- none
-
-
- groupBox1
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 6
-
-
- OptionSettingForm
-
-
- 2
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 15, 62
-
-
- 111, 62
-
-
- 7
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 5
-
-
- 13
-
-
- 97, 20
-
-
+
0
-
- 8
+
+ txtKcpwriteBufferSize
-
- 78, 21
-
-
- tabPage7
-
-
- tabPage7
-
-
- True
-
-
- System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- True
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 23, 12
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 345, 100
-
-
- 94, 21
-
-
- NoControl
-
-
- 654, 427
-
-
- 10
-
-
- 204, 16
-
-
- 17
-
-
- 23
-
-
- 94, 21
-
-
- 6
-
-
- 0, 463
-
-
- groupBox1
-
-
- 3
-
-
- http
-
-
- 0
-
-
- 97, 20
-
-
- tabPage6
-
-
- tabPage6
-
-
- 7
-
-
- False
-
-
- 257, 158
-
-
+
System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- &OK
+
+ tabPage6
-
- 10
-
-
+
1
-
- 94, 21
-
-
- txtKcpuplinkCapacity
-
-
- tabPage2
-
-
- chklogEnabled
-
-
- chksniffingEnabled2
-
-
- tabPage7
-
-
- 4, 22
-
-
- $this
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 4, 22
-
-
- groupBox1
-
-
- NoControl
-
-
- 6
-
-
- protocol
-
-
- tabPage7
-
-
- 15, 16
-
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- True
-
-
- 0
-
-
- 8
-
-
- txtremoteDNS
-
-
- True
-
-
- True
-
-
- writeBufferSize
-
-
- 11
-
-
- System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 89, 12
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 31
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- Core: DNS settings
-
-
- groupBox1
-
-
- 32
-
-
- System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- True
-
-
- 345, 24
-
-
- tabPage7
-
-
- cbFreshrate
-
-
- 236, 104
-
-
- 4
-
-
- NoControl
-
-
- System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 94, 21
-
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 8, 41
+
+ label10
System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 0, 0, 0, 0
+
+ tabPage6
-
- uplinkCapacity
+
+ 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
-
- 35
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 6
+
+ tabPage6
-
- 3
+
+ 5
-
- 3, 3, 3, 3
+
+ label8
-
- 107, 12
-
-
- 0
-
-
- 15, 192
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
tabPage6
-
- debug
+
+ 6
-
- chkmuxEnabled
+
+ txtKcpuplinkCapacity
-
- label3
-
-
- tabPage6
-
-
- False
-
-
- 15, 110
-
-
- 105, 137
-
-
- 0, 0
-
-
- Enable UDP
-
-
- cmbCoreType
-
-
- 3, 3, 3, 3
-
-
- groupBox1
-
-
- 126, 16
-
-
- 267, 16
-
-
- 75, 23
-
-
- groupBox1
-
-
- NoControl
-
-
+
System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- 9
+
+ tabPage6
-
- System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- groupBox1
-
-
- 342, 17
-
-
- 94, 21
-
-
- 97, 20
-
-
- 3
-
-
- Custom DNS (multiple, separated by commas (,))
-
-
- 654, 427
-
-
- 11
-
-
- System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- 0
-
-
- NoControl
-
-
- panel2
-
-
+
7
-
- System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
-
- Turn on Mux Multiplexing
-
-
- cmbloglevel
-
-
- label6
-
-
- 111, 24
-
-
- 4
-
label9
-
- 662, 60
+
+ 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
+
+
+ 654, 427
+
+
+ 2
+
+
+ Core: KCP settings
+
+
+ tabPage6
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl1
+
+
+ 2
+
+
+ True
+
+
+ NoControl
+
+
+ 15, 132
+
+
+ 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
+
+
+ 0
+
+
+ v2fly_core
+
+
+ Xray_core
+
+
+ 325, 130
+
+
+ 97, 20
+
+
+ 34
+
+
+ cmbCoreType
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 1
+
+
+ True
+
+
+ NoControl
+
+
+ 253, 134
+
+
+ 59, 12
+
+
+ 35
+
+
+ Core Type
+
+
+ label4
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 2
+
+
+ True
+
+
+ NoControl
+
+
+ 15, 108
+
+
+ 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
+
+
+ 3
+
+
+ 161, 84
+
+
+ 58, 20
+
+
+ 32
+
+
+ cbFreshrate
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 4
+
+
+ True
+
+
+ NoControl
+
+
+ 30, 88
+
+
+ 125, 12
+
+
+ 30
+
+
+ Statistics freshrate
+
+
+ lbFreshrate
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 5
+
+
+ True
+
+
+ NoControl
+
+
+ 15, 64
+
+
+ 576, 16
+
+
+ 29
+
+
+ Enable Statistics (Realtime netspeed and traffic records. Require restart the v2rayN client)
+
+
+ chkEnableStatistics
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 6
+
+
+ True
+
+
+ 15, 40
+
+
+ 204, 16
+
+
+ 29
+
+
+ Allow connections from the LAN
+
+
+ chkAllowLANConn
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage7
+
+
+ 7
+
+
+ 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
+
+
+ 8
+
+
+ 4, 22
+
+
+ 3, 3, 3, 3
+
+
+ 654, 427
+
+
+ 3
+
+
+ v2rayN settings
+
+
+ tabPage7
+
+
+ System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabControl1
+
+
+ 3
+
+
+ Fill
+
+
+ 0, 10
+
+
+ 662, 453
+
+
+ 10
+
+
+ tabControl1
+
+
+ System.Windows.Forms.TabControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 0
+
+
+ chkdefAllowInsecure
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 0
+
+
+ chksniffingEnabled2
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 1
+
+
+ chksniffingEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 2
+
+
+ chkmuxEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 3
+
+
+ chkAllowIn2
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 4
+
+
+ chkudpEnabled2
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 5
+
+
+ cmbprotocol2
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 6
+
+
+ label3
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 7
+
+
+ txtlocalPort2
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 8
+
+
+ cmbprotocol
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 9
+
+
+ label1
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 10
+
+
+ chkudpEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 11
+
+
+ chklogEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 12
+
+
+ cmbloglevel
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 13
+
+
+ label5
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 14
+
+
+ txtlocalPort
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 15
+
+
+ label2
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 16
+
+
+ Fill
+
+
+ 3, 3
+
+
+ 648, 421
+
+
+ 6
+
+
+ groupBox1
+
+
+ System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage1
+
+
+ 0
+
+
+ True
+
+
+ NoControl
+
+
+ 15, 192
+
+
+ 102, 16
+
+
+ 35
+
+
+ allowInsecure
+
+
+ chkdefAllowInsecure
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 0
+
+
+ True
+
+
+ NoControl
+
+
+ 468, 60
+
+
+ 120, 16
+
+
+ 32
+
+
+ Turn on Sniffing
+
+
+ False
+
+
+ chksniffingEnabled2
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 1
+
+
+ True
+
+
+ NoControl
+
+
+ 468, 27
+
+
+ 120, 16
+
+
+ 31
+
+
+ Turn on Sniffing
+
+
+ chksniffingEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 2
+
+
+ True
+
+
+ 15, 129
+
+
+ 174, 16
+
+
+ 20
+
+
+ Turn on Mux Multiplexing
+
+
+ chkmuxEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 3
+
+
+ True
+
+
+ 15, 63
+
+
+ 120, 16
+
+
+ 19
+
+
+ listening port 2
+
+
+ False
+
+
+ chkAllowIn2
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 4
+
+
+ True
+
+
+ 369, 62
+
+
+ 84, 16
+
+
+ 18
+
+
+ Enable UDP
+
+
+ False
+
+
+ chkudpEnabled2
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 5
+
+
+ socks
+
+
+ http
+
+
+ 257, 60
+
+
+ 97, 20
+
+
+ 17
+
+
+ False
+
+
+ cmbprotocol2
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 6
+
+
+ True
+
+
+ 206, 64
+
+
+ 53, 12
+
+
+ 16
+
+
+ protocol
+
+
+ False
+
+
+ label3
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 7
+
+
+ 124, 60
+
+
+ 78, 21
+
+
+ 14
+
+
+ False
+
+
+ txtlocalPort2
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 8
+
+
+ False
+
+
+ socks
+
+
+ http
+
+
+ 257, 25
+
+
+ 97, 20
+
+
+ 12
+
+
+ cmbprotocol
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 9
+
+
+ True
+
+
+ 206, 29
+
+
+ 53, 12
+
+
+ 11
+
+
+ protocol
+
+
+ label1
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 10
+
+
+ True
+
+
+ 369, 27
+
+
+ 84, 16
+
+
+ 10
+
+
+ Enable UDP
+
+
+ chkudpEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 11
+
+
+ True
+
+
+ 15, 160
+
+
+ 126, 16
+
+
+ 9
+
+
+ Record local logs
+
+
+ chklogEnabled
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 12
+
+
+ debug
+
+
+ info
+
+
+ warning
+
+
+ error
+
+
+ none
+
+
+ 257, 158
+
+
+ 97, 20
+
+
+ 6
+
+
+ cmbloglevel
+
+
+ System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 13
+
+
+ True
+
+
+ 193, 162
+
+
+ 59, 12
+
+
+ 8
+
+
+ Log level
+
+
+ label5
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 14
+
+
+ 124, 25
+
+
+ 78, 21
+
+
+ 3
+
+
+ txtlocalPort
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 15
+
+
+ True
+
+
+ 33, 29
+
+
+ 89, 12
+
+
+ 2
+
+
+ Listening port
+
+
+ label2
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ groupBox1
+
+
+ 16
+
+
+ True
+
+
+ NoControl
+
+
+ 342, 17
+
+
+ 0, 0, 0, 0
+
+
+ 107, 12
+
+
+ 40
+
+
+ Support DnsObject
+
+
+ linkDnsObjectDoc
+
+
+ System.Windows.Forms.LinkLabel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage2
+
+
+ 0
+
+
+ 8, 41
+
+
+ True
+
+
+ 638, 356
+
+
+ 39
+
+
+ txtremoteDNS
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage2
+
+
+ 1
+
+
+ True
+
+
+ NoControl
+
+
+ 8, 17
+
+
+ 281, 12
+
+
+ 38
+
+
+ Custom DNS (multiple, separated by commas (,))
label14
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage2
+
+
+ 2
+
+
+ True
+
+
+ 20, 143
+
+
+ 84, 16
+
+
+ 20
+
+
+ congestion
+
+
+ chkKcpcongestion
+
+
+ System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 0
+
+
+ 345, 100
+
+
+ 94, 21
+
+
+ 15
+
+
+ txtKcpwriteBufferSize
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 1
+
+
+ True
+
+
+ 236, 104
+
+
+ 95, 12
+
+
+ 14
+
+
+ writeBufferSize
+
+
+ label10
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 2
+
+
+ 111, 100
+
+
+ 94, 21
+
+
+ 13
+
+
+ txtKcpreadBufferSize
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 3
+
+
+ True
+
+
+ 18, 104
+
+
+ 89, 12
+
+
+ 12
+
+
+ readBufferSize
+
+
+ label11
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 4
+
+
+ 345, 62
+
+
+ 94, 21
+
+
+ 11
+
+
+ txtKcpdownlinkCapacity
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 5
+
+
+ True
+
+
+ 236, 66
+
+
+ 101, 12
+
+
+ 10
+
+
+ downlinkCapacity
+
+
+ label8
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 6
+
+
+ 111, 62
+
+
+ 94, 21
+
+
+ 9
+
+
+ txtKcpuplinkCapacity
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 7
+
+
+ True
+
+
+ 18, 66
+
+
+ 89, 12
+
+
+ 8
+
+
+ uplinkCapacity
+
+
+ label9
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 8
+
+
+ 345, 24
+
+
+ 94, 21
+
+
+ 7
+
+
+ txtKcptti
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 9
+
+
+ True
+
+
+ 236, 28
+
+
+ 23, 12
+
+
+ 6
+
+
+ tti
+
+
+ label7
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 10
+
+
+ 111, 24
+
+
+ 94, 21
+
+
+ 5
+
+
+ txtKcpmtu
+
+
+ System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 11
+
+
+ True
+
+
+ 18, 28
+
+
+ 23, 12
+
+
+ 4
+
+
+ mtu
+
+
+ label6
+
+
+ System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ tabPage6
+
+
+ 12
+
+
+ btnOK
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel2
+
+
+ 1
+
+
+ Bottom
+
+
+ 0, 463
+
+
+ 662, 60
+
+
+ 11
+
+
+ panel2
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 1
+
+
+ 267, 16
+
+
+ 75, 23
+
+
+ 8
+
+
+ &OK
+
+
+ btnOK
+
+
+ System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ panel2
+
+
+ 1
+
+
+ Top
+
+
+ 0, 0
+
+
+ 662, 10
+
+
+ 9
+
+
+ panel1
+
+
+ System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+
+ $this
+
+
+ 2
+
True
-
- zh-Hans
-
+
+ 6, 12
+
+
+ 662, 523
+
+
+ 4, 4, 4, 4
+
+
+ Settings
+
+
+ OptionSettingForm
+
+
+ v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
+
\ No newline at end of file
diff --git a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
index bfab7ce2..eccd6e2c 100644
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
@@ -223,6 +223,12 @@
Core:KCP设置
+
+ 150, 16
+
+
+ 更新Core时忽略Geo文件
+
53, 12
diff --git a/v2rayN/v2rayN/Handler/ShareHandler.cs b/v2rayN/v2rayN/Handler/ShareHandler.cs
index 766f16e0..157988c8 100644
--- a/v2rayN/v2rayN/Handler/ShareHandler.cs
+++ b/v2rayN/v2rayN/Handler/ShareHandler.cs
@@ -57,7 +57,7 @@ namespace v2rayN.Handler
string remark = string.Empty;
if (!Utils.IsNullOrEmpty(item.remarks))
{
- remark = "#" + WebUtility.UrlEncode(item.remarks);
+ remark = "#" + Utils.UrlEncode(item.remarks);
}
url = string.Format("{0}:{1}@{2}:{3}",
item.security,
@@ -72,7 +72,7 @@ namespace v2rayN.Handler
string remark = string.Empty;
if (!Utils.IsNullOrEmpty(item.remarks))
{
- remark = "#" + WebUtility.UrlEncode(item.remarks);
+ remark = "#" + Utils.UrlEncode(item.remarks);
}
url = string.Format("{0}:{1}@{2}:{3}",
item.security,
@@ -87,12 +87,12 @@ namespace v2rayN.Handler
string remark = string.Empty;
if (!Utils.IsNullOrEmpty(item.remarks))
{
- remark = "#" + WebUtility.UrlEncode(item.remarks);
+ remark = "#" + Utils.UrlEncode(item.remarks);
}
string query = string.Empty;
if (!Utils.IsNullOrEmpty(item.requestHost))
{
- query = string.Format("?sni={0}", item.requestHost);
+ query = string.Format("?sni={0}", Utils.UrlEncode(item.requestHost));
}
url = string.Format("{0}@{1}:{2}",
item.id,
@@ -105,7 +105,7 @@ namespace v2rayN.Handler
string remark = string.Empty;
if (!Utils.IsNullOrEmpty(item.remarks))
{
- remark = "#" + WebUtility.UrlEncode(item.remarks);
+ remark = "#" + Utils.UrlEncode(item.remarks);
}
var dicQuery = new Dictionary();
if (!Utils.IsNullOrEmpty(item.flow))
@@ -150,7 +150,7 @@ namespace v2rayN.Handler
}
if (!Utils.IsNullOrEmpty(item.requestHost))
{
- dicQuery.Add("host", item.requestHost);
+ dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
}
break;
case "kcp":
@@ -164,18 +164,18 @@ namespace v2rayN.Handler
}
if (!Utils.IsNullOrEmpty(item.path))
{
- dicQuery.Add("seed", item.path);
+ dicQuery.Add("seed", Utils.UrlEncode(item.path));
}
break;
case "ws":
if (!Utils.IsNullOrEmpty(item.requestHost))
{
- dicQuery.Add("host", item.requestHost);
+ dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
}
if (!Utils.IsNullOrEmpty(item.path))
{
- dicQuery.Add("path", item.path);
+ dicQuery.Add("path", Utils.UrlEncode(item.path));
}
break;
@@ -184,11 +184,11 @@ namespace v2rayN.Handler
dicQuery["type"] = "http";
if (!Utils.IsNullOrEmpty(item.requestHost))
{
- dicQuery.Add("host", item.requestHost);
+ dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
}
if (!Utils.IsNullOrEmpty(item.path))
{
- dicQuery.Add("path", item.path);
+ dicQuery.Add("path", Utils.UrlEncode(item.path));
}
break;
@@ -201,8 +201,8 @@ namespace v2rayN.Handler
{
dicQuery.Add("headerType", "none");
}
- dicQuery.Add("quicSecurity", item.requestHost);
- dicQuery.Add("key", item.path);
+ dicQuery.Add("quicSecurity", Utils.UrlEncode(item.requestHost));
+ dicQuery.Add("key", Utils.UrlEncode(item.path));
break;
}
string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
@@ -330,7 +330,7 @@ namespace v2rayN.Handler
{
try
{
- vmessItem.remarks = WebUtility.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
+ vmessItem.remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
}
catch { }
result = result.Substring(0, indexRemark);
@@ -383,7 +383,7 @@ namespace v2rayN.Handler
}
else
{
- vmessItem.remarks = WebUtility.UrlDecode(remarks);
+ vmessItem.remarks = Utils.UrlDecode(remarks);
}
}
else if (result.StartsWith(Global.vlessProtocol))
@@ -509,7 +509,7 @@ namespace v2rayN.Handler
var tag = match.Groups["tag"].Value;
if (!Utils.IsNullOrEmpty(tag))
{
- server.remarks = HttpUtility.UrlDecode(tag, Encoding.UTF8);
+ server.remarks = Utils.UrlDecode(tag);
}
Match details;
try
@@ -591,7 +591,7 @@ namespace v2rayN.Handler
case "ws":
string p1 = q["path"] ?? "/";
string h1 = q["host"] ?? "";
- i.requestHost = h1;
+ i.requestHost = Utils.UrlDecode(h1);
i.path = p1;
break;
@@ -600,7 +600,7 @@ namespace v2rayN.Handler
i.network = "h2";
string p2 = q["path"] ?? "/";
string h2 = q["host"] ?? "";
- i.requestHost = h2;
+ i.requestHost = Utils.UrlDecode(h2);
i.path = p2;
break;
@@ -609,7 +609,7 @@ namespace v2rayN.Handler
string k = q["key"] ?? "";
string t3 = q["type"] ?? "none";
i.headerType = t3;
- i.requestHost = s;
+ i.requestHost = Utils.UrlDecode(s);
i.path = k;
break;
@@ -645,30 +645,30 @@ namespace v2rayN.Handler
{
case "tcp":
item.headerType = query["headerType"] ?? "none";
- item.requestHost = query["host"] ?? "";
+ item.requestHost = Utils.UrlDecode(query["host"] ?? "");
break;
case "kcp":
item.headerType = query["headerType"] ?? "none";
- item.path = query["seed"] ?? "";
+ item.path = Utils.UrlDecode(query["seed"] ?? "");
break;
case "ws":
- item.requestHost = query["host"] ?? "";
- item.path = query["path"] ?? "/";
+ item.requestHost = Utils.UrlDecode(query["host"] ?? "");
+ item.path = Utils.UrlDecode(query["path"] ?? "/");
break;
case "http":
case "h2":
item.network = "h2";
- item.requestHost = query["host"] ?? "";
- item.path = query["path"] ?? "/";
+ item.requestHost = Utils.UrlDecode(query["host"] ?? "");
+ item.path = Utils.UrlDecode(query["path"] ?? "/");
break;
case "quic":
item.headerType = query["headerType"] ?? "none";
item.requestHost = query["quicSecurity"] ?? "none";
- item.path = query["key"] ?? "";
+ item.path = Utils.UrlDecode(query["key"] ?? "");
break;
default:
diff --git a/v2rayN/v2rayN/Mode/Config.cs b/v2rayN/v2rayN/Mode/Config.cs
index 2680a577..b1b63fe5 100644
--- a/v2rayN/v2rayN/Mode/Config.cs
+++ b/v2rayN/v2rayN/Mode/Config.cs
@@ -170,6 +170,10 @@ namespace v2rayN.Mode
{
get; set;
}
+ public bool ignoreGeoUpdateCore
+ {
+ get; set;
+ }
#region 函数
diff --git a/v2rayN/v2rayN/Properties/AssemblyInfo.cs b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
index bc7f263c..c8e96058 100644
--- a/v2rayN/v2rayN/Properties/AssemblyInfo.cs
+++ b/v2rayN/v2rayN/Properties/AssemblyInfo.cs
@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
// 方法是按如下所示使用“*”:
//[assembly: AssemblyVersion("1.0.*")]
//[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("4.4")]
+[assembly: AssemblyFileVersion("4.5")]
diff --git a/v2rayN/v2rayN/Tool/FileManager.cs b/v2rayN/v2rayN/Tool/FileManager.cs
index bd5ebf93..d668b599 100644
--- a/v2rayN/v2rayN/Tool/FileManager.cs
+++ b/v2rayN/v2rayN/Tool/FileManager.cs
@@ -68,7 +68,7 @@ namespace v2rayN.Tool
throw ex;
}
}
- public static bool ZipExtractToFile(string fileName)
+ public static bool ZipExtractToFile(string fileName, string ignoredName)
{
try
{
@@ -82,6 +82,10 @@ namespace v2rayN.Tool
}
try
{
+ if (!Utils.IsNullOrEmpty(ignoredName) && entry.Name.Contains(ignoredName))
+ {
+ continue;
+ }
entry.ExtractToFile(Utils.GetPath(entry.Name), true);
}
catch (IOException ex)
diff --git a/v2rayN/v2rayN/Tool/Utils.cs b/v2rayN/v2rayN/Tool/Utils.cs
index f6ac4c67..1e1e9444 100644
--- a/v2rayN/v2rayN/Tool/Utils.cs
+++ b/v2rayN/v2rayN/Tool/Utils.cs
@@ -20,11 +20,12 @@ using ZXing.QrCode;
using System.Security.Principal;
using v2rayN.Base;
using Newtonsoft.Json.Linq;
+using System.Web;
namespace v2rayN
{
class Utils
- {
+ {
#region 资源Json操作
@@ -369,6 +370,14 @@ namespace v2rayN
result = list;
}
+ public static string UrlEncode(string url)
+ {
+ return HttpUtility.UrlEncode(url);
+ }
+ public static string UrlDecode(string url)
+ {
+ return HttpUtility.UrlDecode(url);
+ }
#endregion