v2fly

Update README.md
Merge pull request #735 from rprx/patch-5
2020-06-04 08:31:18 +08:00 · 2020-06-04 08:08:30 +08:00 · 2020-04-25 09:29:23 +08:00 · 2020-04-24 02:57:38 +00:00 · 2020-04-23 16:20:30 +08:00 · 2020-04-23 16:11:34 +08:00
15 changed files with 3354 additions and 1918 deletions
--- a/README.md
+++ b/README.md
@@ -7,4 +7,4 @@

 ### Requirements  
 - Microsoft [.NET Framework 4.6](https://docs.microsoft.com/zh-cn/dotnet/framework/install/guide-for-developers) or higher
- Project V core [https://github.com/v2ray/v2ray-core/releases](https://github.com/v2ray/v2ray-core/releases)
+- Project V core [https://github.com/v2fly/v2ray-core/releases](https://github.com/v2fly/v2ray-core/releases)
--- a/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/AddServerForm.Designer.cs
@@ -37,7 +37,6 @@
            this.label24 = new System.Windows.Forms.Label();
            this.label23 = new System.Windows.Forms.Label();
            this.panTlsMore = new System.Windows.Forms.Panel();
-            this.label22 = new System.Windows.Forms.Label();
            this.label21 = new System.Windows.Forms.Label();
            this.cmbAllowInsecure = new System.Windows.Forms.ComboBox();
            this.label20 = new System.Windows.Forms.Label();
@@ -88,14 +87,15 @@
            // 
            // btnClose
            // 
-            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
            resources.ApplyResources(this.btnClose, "btnClose");
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
            this.btnClose.Name = "btnClose";
            this.btnClose.UseVisualStyleBackColor = true;
            this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
            // 
            // groupBox1
            // 
+            resources.ApplyResources(this.groupBox1, "groupBox1");
            this.groupBox1.Controls.Add(this.btnGUID);
            this.groupBox1.Controls.Add(this.label13);
            this.groupBox1.Controls.Add(this.groupBox2);
@@ -115,7 +115,6 @@
            this.groupBox1.Controls.Add(this.label2);
            this.groupBox1.Controls.Add(this.txtAddress);
            this.groupBox1.Controls.Add(this.label1);
-            resources.ApplyResources(this.groupBox1, "groupBox1");
            this.groupBox1.Name = "groupBox1";
            this.groupBox1.TabStop = false;
            // 
@@ -133,6 +132,7 @@
            // 
            // groupBox2
            // 
+            resources.ApplyResources(this.groupBox2, "groupBox2");
            this.groupBox2.Controls.Add(this.label24);
            this.groupBox2.Controls.Add(this.label23);
            this.groupBox2.Controls.Add(this.panTlsMore);
@@ -150,7 +150,6 @@
            this.groupBox2.Controls.Add(this.label11);
            this.groupBox2.Controls.Add(this.label10);
            this.groupBox2.Controls.Add(this.cmbHeaderType);
-            resources.ApplyResources(this.groupBox2, "groupBox2");
            this.groupBox2.Name = "groupBox2";
            this.groupBox2.TabStop = false;
            // 
@@ -166,17 +165,11 @@
            // 
            // panTlsMore
            // 
-            this.panTlsMore.Controls.Add(this.label22);
+            resources.ApplyResources(this.panTlsMore, "panTlsMore");
            this.panTlsMore.Controls.Add(this.label21);
            this.panTlsMore.Controls.Add(this.cmbAllowInsecure);
-            resources.ApplyResources(this.panTlsMore, "panTlsMore");
            this.panTlsMore.Name = "panTlsMore";
            // 
-            // label22
-            // 
-            resources.ApplyResources(this.label22, "label22");
-            this.label22.Name = "label22";
-            // 
            // label21
            // 
            resources.ApplyResources(this.label21, "label21");
@@ -184,13 +177,13 @@
            // 
            // cmbAllowInsecure
            // 
+            resources.ApplyResources(this.cmbAllowInsecure, "cmbAllowInsecure");
            this.cmbAllowInsecure.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbAllowInsecure.FormattingEnabled = true;
            this.cmbAllowInsecure.Items.AddRange(new object[] {
            resources.GetString("cmbAllowInsecure.Items"),
            resources.GetString("cmbAllowInsecure.Items1"),
            resources.GetString("cmbAllowInsecure.Items2")});
-            resources.ApplyResources(this.cmbAllowInsecure, "cmbAllowInsecure");
            this.cmbAllowInsecure.Name = "cmbAllowInsecure";
            // 
            // label20
@@ -235,12 +228,12 @@
            // 
            // cmbStreamSecurity
            // 
+            resources.ApplyResources(this.cmbStreamSecurity, "cmbStreamSecurity");
            this.cmbStreamSecurity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbStreamSecurity.FormattingEnabled = true;
            this.cmbStreamSecurity.Items.AddRange(new object[] {
            resources.GetString("cmbStreamSecurity.Items"),
            resources.GetString("cmbStreamSecurity.Items1")});
-            resources.ApplyResources(this.cmbStreamSecurity, "cmbStreamSecurity");
            this.cmbStreamSecurity.Name = "cmbStreamSecurity";
            this.cmbStreamSecurity.SelectedIndexChanged += new System.EventHandler(this.cmbStreamSecurity_SelectedIndexChanged);
            // 
@@ -266,6 +259,7 @@
            // 
            // cmbHeaderType
            // 
+            resources.ApplyResources(this.cmbHeaderType, "cmbHeaderType");
            this.cmbHeaderType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbHeaderType.FormattingEnabled = true;
            this.cmbHeaderType.Items.AddRange(new object[] {
@@ -276,7 +270,6 @@
            resources.GetString("cmbHeaderType.Items4"),
            resources.GetString("cmbHeaderType.Items5"),
            resources.GetString("cmbHeaderType.Items6")});
-            resources.ApplyResources(this.cmbHeaderType, "cmbHeaderType");
            this.cmbHeaderType.Name = "cmbHeaderType";
            // 
            // label9
@@ -291,6 +284,7 @@
            // 
            // cmbNetwork
            // 
+            resources.ApplyResources(this.cmbNetwork, "cmbNetwork");
            this.cmbNetwork.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbNetwork.FormattingEnabled = true;
            this.cmbNetwork.Items.AddRange(new object[] {
@@ -299,7 +293,6 @@
            resources.GetString("cmbNetwork.Items2"),
            resources.GetString("cmbNetwork.Items3"),
            resources.GetString("cmbNetwork.Items4")});
-            resources.ApplyResources(this.cmbNetwork, "cmbNetwork");
            this.cmbNetwork.Name = "cmbNetwork";
            this.cmbNetwork.SelectedIndexChanged += new System.EventHandler(this.cmbNetwork_SelectedIndexChanged);
            // 
@@ -310,6 +303,7 @@
            // 
            // cmbSecurity
            // 
+            resources.ApplyResources(this.cmbSecurity, "cmbSecurity");
            this.cmbSecurity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbSecurity.FormattingEnabled = true;
            this.cmbSecurity.Items.AddRange(new object[] {
@@ -317,7 +311,6 @@
            resources.GetString("cmbSecurity.Items1"),
            resources.GetString("cmbSecurity.Items2"),
            resources.GetString("cmbSecurity.Items3")});
-            resources.ApplyResources(this.cmbSecurity, "cmbSecurity");
            this.cmbSecurity.Name = "cmbSecurity";
            // 
            // txtRemarks
@@ -377,9 +370,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
@@ -396,42 +389,42 @@
            // 
            // menuServer
            // 
+            resources.ApplyResources(this.menuServer, "menuServer");
            this.menuServer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.MenuItem1});
-            resources.ApplyResources(this.menuServer, "menuServer");
            this.menuServer.Name = "menuServer";
            // 
            // MenuItem1
            // 
+            resources.ApplyResources(this.MenuItem1, "MenuItem1");
            this.MenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.MenuItemImportClient,
            this.MenuItemImportServer,
            this.toolStripSeparator1,
            this.MenuItemImportClipboard});
            this.MenuItem1.Name = "MenuItem1";
-            resources.ApplyResources(this.MenuItem1, "MenuItem1");
            // 
            // MenuItemImportClient
            // 
-            this.MenuItemImportClient.Name = "MenuItemImportClient";
            resources.ApplyResources(this.MenuItemImportClient, "MenuItemImportClient");
+            this.MenuItemImportClient.Name = "MenuItemImportClient";
            this.MenuItemImportClient.Click += new System.EventHandler(this.MenuItemImportClient_Click);
            // 
            // MenuItemImportServer
            // 
-            this.MenuItemImportServer.Name = "MenuItemImportServer";
            resources.ApplyResources(this.MenuItemImportServer, "MenuItemImportServer");
+            this.MenuItemImportServer.Name = "MenuItemImportServer";
            this.MenuItemImportServer.Click += new System.EventHandler(this.MenuItemImportServer_Click);
            // 
            // toolStripSeparator1
            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
            resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
            // 
            // MenuItemImportClipboard
            // 
-            this.MenuItemImportClipboard.Name = "MenuItemImportClipboard";
            resources.ApplyResources(this.MenuItemImportClipboard, "MenuItemImportClipboard");
+            this.MenuItemImportClipboard.Name = "MenuItemImportClipboard";
            this.MenuItemImportClipboard.Click += new System.EventHandler(this.MenuItemImportClipboard_Click);
            // 
            // AddServerForm
@@ -508,7 +501,6 @@
        private System.Windows.Forms.Label label20;
        private System.Windows.Forms.Label label21;
        private System.Windows.Forms.ComboBox cmbAllowInsecure;
-        private System.Windows.Forms.Label label22;
        private System.Windows.Forms.Panel panTlsMore;
        private System.Windows.Forms.Label label24;
        private System.Windows.Forms.Label label23;
--- a/v2rayN/v2rayN/Forms/AddServerForm.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.resx
--- a/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx
@@ -117,64 +117,55 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.Text" xml:space="preserve">
-    <value>编辑或添加[VMess]服务器</value>
-  </data>
  <data name="btnClose.Text" xml:space="preserve">
    <value>取消(&amp;C)</value>
  </data>
-  <data name="btnGUID.Text" xml:space="preserve">
-    <value>生成(&amp;G)</value>
-  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>确定(&amp;O)</value>
-  </data>
-  <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 171</value>
-  </data>
-  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
-    <value>211, 20</value>
-  </data>
-  <data name="cmbSecurity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 143</value>
-  </data>
-  <data name="cmbSecurity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>211, 20</value>
-  </data>
  <data name="groupBox1.Text" xml:space="preserve">
    <value>服务器</value>
  </data>
-  <data name="groupBox2.Text" xml:space="preserve">
-    <value>不清楚则保持默认值</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 12</value>
-  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>地址(address)</value>
-  </data>
-  <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>89, 12</value>
-  </data>
-  <data name="label10.Text" xml:space="preserve">
-    <value>伪装域名(host)</value>
-  </data>
-  <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
-    <value>89, 12</value>
-  </data>
-  <data name="label11.Text" xml:space="preserve">
-    <value>伪装类型(type)</value>
-  </data>
-  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
-    <value>197, 12</value>
-  </data>
-  <data name="label12.Text" xml:space="preserve">
-    <value>*tcp或kcp或QUIC伪装类型,默认none</value>
+  <data name="btnGUID.Text" xml:space="preserve">
+    <value>生成(&amp;G)</value>
  </data>
  <data name="label13.Text" xml:space="preserve">
    <value>*手填,方便识别管理</value>
  </data>
+  <data name="groupBox2.Text" xml:space="preserve">
+    <value>不清楚则保持默认值</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="label24.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</value>
+  </data>
+  <data name="label24.Text" xml:space="preserve">
+    <value>3)QUIC 加密密钥</value>
+  </data>
+  <data name="label23.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</value>
+  </data>
+  <data name="label23.Text" xml:space="preserve">
+    <value>4)QUIC 加密方式</value>
+  </data>
+  <data name="label21.Size" type="System.Drawing.Size, System.Drawing">
+    <value>203, 12</value>
+  </data>
+  <data name="label21.Text" xml:space="preserve">
+    <value>跳过证书验证(allowInsecure)</value>
+  </data>
+  <data name="cmbAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
+    <value>223, 7</value>
+  </data>
+  <data name="label20.Size" type="System.Drawing.Size, System.Drawing">
+    <value>149, 12</value>
+  </data>
+  <data name="label20.Text" xml:space="preserve">
+    <value>3)h2 host中间逗号(,)隔开</value>
+  </data>
+  <data name="label19.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="label19.Text" xml:space="preserve">
+    <value>路径(path)</value>
+  </data>
  <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
    <value>161, 12</value>
  </data>
@@ -187,71 +178,35 @@
  <data name="label15.Text" xml:space="preserve">
    <value>底层传输安全</value>
  </data>
-  <data name="label19.Size" type="System.Drawing.Size, System.Drawing">
-    <value>65, 12</value>
+  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
+    <value>197, 12</value>
  </data>
-  <data name="label19.Text" xml:space="preserve">
-    <value>路径(path)</value>
+  <data name="label12.Text" xml:space="preserve">
+    <value>*tcp或kcp或QUIC伪装类型,默认none</value>
  </data>
-  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>65, 12</value>
+  <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
+    <value>124, 58</value>
  </data>
-  <data name="label2.Text" xml:space="preserve">
-    <value>端口(port)</value>
+  <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
+    <value>334, 51</value>
  </data>
-  <data name="label20.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 12</value>
+  <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
  </data>
-  <data name="label20.Text" xml:space="preserve">
-    <value>3)h2 host中间逗号(,)隔开</value>
+  <data name="label11.Text" xml:space="preserve">
+    <value>伪装类型(type)</value>
  </data>
-  <data name="label22.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
+  <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
  </data>
-  <data name="label22.Text" xml:space="preserve">
-    <value>默认false</value>
+  <data name="label10.Text" xml:space="preserve">
+    <value>伪装域名(host)</value>
  </data>
-  <data name="label23.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 12</value>
+  <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
+    <value>143, 12</value>
  </data>
-  <data name="label23.Text" xml:space="preserve">
-    <value>4)QUIC 加密方式</value>
-  </data>
-  <data name="label24.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 12</value>
-  </data>
-  <data name="label24.Text" xml:space="preserve">
-    <value>3)QUIC 加密密钥</value>
-  </data>
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>65, 12</value>
-  </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>用户ID(id)</value>
-  </data>
-  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 12</value>
-  </data>
-  <data name="label4.Text" xml:space="preserve">
-    <value>额外ID(alterId)</value>
-  </data>
-  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
-  </data>
-  <data name="label5.Text" xml:space="preserve">
-    <value>加密方式(security)</value>
-  </data>
-  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 12</value>
-  </data>
-  <data name="label6.Text" xml:space="preserve">
-    <value>别名(remarks)</value>
-  </data>
-  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>107, 12</value>
-  </data>
-  <data name="label7.Text" xml:space="preserve">
-    <value>传输协议(network)</value>
+  <data name="label9.Text" xml:space="preserve">
+    <value>*默认tcp,选错会无法连接</value>
  </data>
  <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
    <value>113, 12</value>
@@ -259,11 +214,62 @@
  <data name="label8.Text" xml:space="preserve">
    <value>*随便选,建议(auto)</value>
  </data>
-  <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 12</value>
+  <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 171</value>
  </data>
-  <data name="label9.Text" xml:space="preserve">
-    <value>*默认tcp,选错会无法连接</value>
+  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
+    <value>211, 20</value>
+  </data>
+  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>107, 12</value>
+  </data>
+  <data name="label7.Text" xml:space="preserve">
+    <value>传输协议(network)</value>
+  </data>
+  <data name="cmbSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 143</value>
+  </data>
+  <data name="cmbSecurity.Size" type="System.Drawing.Size, System.Drawing">
+    <value>211, 20</value>
+  </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="label6.Text" xml:space="preserve">
+    <value>别名(remarks)</value>
+  </data>
+  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 12</value>
+  </data>
+  <data name="label5.Text" xml:space="preserve">
+    <value>加密方式(security)</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>额外ID(alterId)</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>用户ID(id)</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>端口(port)</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>地址(address)</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>确定(&amp;O)</value>
  </data>
  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
    <value>92, 21</value>
@@ -277,12 +283,6 @@
  <data name="MenuItemImportClient.Text" xml:space="preserve">
    <value>导入客户端配置</value>
  </data>
-  <data name="MenuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
-    <value>171, 22</value>
-  </data>
-  <data name="MenuItemImportClipboard.Text" xml:space="preserve">
-    <value>从剪贴板导入URL</value>
-  </data>
  <data name="MenuItemImportServer.Size" type="System.Drawing.Size, System.Drawing">
    <value>171, 22</value>
  </data>
@@ -292,10 +292,13 @@
  <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
    <value>168, 6</value>
  </data>
-  <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 58</value>
+  <data name="MenuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
+    <value>171, 22</value>
  </data>
-  <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
-    <value>334, 51</value>
+  <data name="MenuItemImportClipboard.Text" xml:space="preserve">
+    <value>从剪贴板导入URL</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>编辑或添加[VMess]服务器</value>
  </data>
 </root>
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs
@@ -33,6 +33,7 @@
            this.tabControl1 = new System.Windows.Forms.TabControl();
            this.tabPage1 = new System.Windows.Forms.TabPage();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.chkdefAllowInsecure = new System.Windows.Forms.CheckBox();
            this.label16 = new System.Windows.Forms.Label();
            this.cmblistenerType = new System.Windows.Forms.ComboBox();
            this.chksniffingEnabled2 = new System.Windows.Forms.CheckBox();
@@ -119,32 +120,34 @@
            // 
            // btnClose
            // 
-            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
            resources.ApplyResources(this.btnClose, "btnClose");
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
            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);
            this.tabControl1.Controls.Add(this.tabPage9);
-            resources.ApplyResources(this.tabControl1, "tabControl1");
            this.tabControl1.Name = "tabControl1";
            this.tabControl1.SelectedIndex = 0;
            // 
            // tabPage1
            // 
-            this.tabPage1.Controls.Add(this.groupBox1);
            resources.ApplyResources(this.tabPage1, "tabPage1");
+            this.tabPage1.Controls.Add(this.groupBox1);
            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.label16);
            this.groupBox1.Controls.Add(this.cmblistenerType);
            this.groupBox1.Controls.Add(this.chksniffingEnabled2);
@@ -165,10 +168,15 @@
            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;
            // 
+            // chkdefAllowInsecure
+            // 
+            resources.ApplyResources(this.chkdefAllowInsecure, "chkdefAllowInsecure");
+            this.chkdefAllowInsecure.Name = "chkdefAllowInsecure";
+            this.chkdefAllowInsecure.UseVisualStyleBackColor = true;
+            // 
            // label16
            // 
            resources.ApplyResources(this.label16, "label16");
@@ -176,6 +184,7 @@
            // 
            // cmblistenerType
            // 
+            resources.ApplyResources(this.cmblistenerType, "cmblistenerType");
            this.cmblistenerType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmblistenerType.FormattingEnabled = true;
            this.cmblistenerType.Items.AddRange(new object[] {
@@ -186,7 +195,6 @@
            resources.GetString("cmblistenerType.Items4"),
            resources.GetString("cmblistenerType.Items5"),
            resources.GetString("cmblistenerType.Items6")});
-            resources.ApplyResources(this.cmblistenerType, "cmblistenerType");
            this.cmblistenerType.Name = "cmblistenerType";
            // 
            // chksniffingEnabled2
@@ -232,12 +240,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
@@ -252,8 +260,8 @@
            // 
            // cmbprotocol
            // 
-            this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            resources.ApplyResources(this.cmbprotocol, "cmbprotocol");
+            this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbprotocol.FormattingEnabled = true;
            this.cmbprotocol.Items.AddRange(new object[] {
            resources.GetString("cmbprotocol.Items"),
@@ -279,6 +287,7 @@
            // 
            // cmbloglevel
            // 
+            resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
            this.cmbloglevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbloglevel.FormattingEnabled = true;
            this.cmbloglevel.Items.AddRange(new object[] {
@@ -287,7 +296,6 @@
            resources.GetString("cmbloglevel.Items2"),
            resources.GetString("cmbloglevel.Items3"),
            resources.GetString("cmbloglevel.Items4")});
-            resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
            this.cmbloglevel.Name = "cmbloglevel";
            // 
            // label5
@@ -307,33 +315,33 @@
            // 
            // tabPage2
            // 
-            this.tabPage2.Controls.Add(this.groupBox2);
            resources.ApplyResources(this.tabPage2, "tabPage2");
+            this.tabPage2.Controls.Add(this.groupBox2);
            this.tabPage2.Name = "tabPage2";
            this.tabPage2.UseVisualStyleBackColor = true;
            // 
            // groupBox2
            // 
+            resources.ApplyResources(this.groupBox2, "groupBox2");
            this.groupBox2.Controls.Add(this.tabControl2);
            this.groupBox2.Controls.Add(this.panel3);
-            resources.ApplyResources(this.groupBox2, "groupBox2");
            this.groupBox2.Name = "groupBox2";
            this.groupBox2.TabStop = false;
            // 
            // tabControl2
            // 
+            resources.ApplyResources(this.tabControl2, "tabControl2");
            this.tabControl2.Controls.Add(this.tabPage3);
            this.tabControl2.Controls.Add(this.tabPage4);
            this.tabControl2.Controls.Add(this.tabPage5);
            this.tabControl2.Controls.Add(this.tabPage8);
-            resources.ApplyResources(this.tabControl2, "tabControl2");
            this.tabControl2.Name = "tabControl2";
            this.tabControl2.SelectedIndex = 0;
            // 
            // tabPage3
            // 
-            this.tabPage3.Controls.Add(this.txtUseragent);
            resources.ApplyResources(this.tabPage3, "tabPage3");
+            this.tabPage3.Controls.Add(this.txtUseragent);
            this.tabPage3.Name = "tabPage3";
            this.tabPage3.UseVisualStyleBackColor = true;
            // 
@@ -344,8 +352,8 @@
            // 
            // tabPage4
            // 
-            this.tabPage4.Controls.Add(this.txtUserdirect);
            resources.ApplyResources(this.tabPage4, "tabPage4");
+            this.tabPage4.Controls.Add(this.txtUserdirect);
            this.tabPage4.Name = "tabPage4";
            this.tabPage4.UseVisualStyleBackColor = true;
            // 
@@ -356,8 +364,8 @@
            // 
            // tabPage5
            // 
-            this.tabPage5.Controls.Add(this.txtUserblock);
            resources.ApplyResources(this.tabPage5, "tabPage5");
+            this.tabPage5.Controls.Add(this.txtUserblock);
            this.tabPage5.Name = "tabPage5";
            this.tabPage5.UseVisualStyleBackColor = true;
            // 
@@ -368,13 +376,14 @@
            // 
            // tabPage8
            // 
-            this.tabPage8.Controls.Add(this.cmbroutingMode);
            resources.ApplyResources(this.tabPage8, "tabPage8");
+            this.tabPage8.Controls.Add(this.cmbroutingMode);
            this.tabPage8.Name = "tabPage8";
            this.tabPage8.UseVisualStyleBackColor = true;
            // 
            // cmbroutingMode
            // 
+            resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode");
            this.cmbroutingMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbroutingMode.FormattingEnabled = true;
            this.cmbroutingMode.Items.AddRange(new object[] {
@@ -382,16 +391,15 @@
            resources.GetString("cmbroutingMode.Items1"),
            resources.GetString("cmbroutingMode.Items2"),
            resources.GetString("cmbroutingMode.Items3")});
-            resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode");
            this.cmbroutingMode.Name = "cmbroutingMode";
            // 
            // panel3
            // 
+            resources.ApplyResources(this.panel3, "panel3");
            this.panel3.Controls.Add(this.linkLabelRoutingDoc);
            this.panel3.Controls.Add(this.btnSetDefRountingRule);
            this.panel3.Controls.Add(this.labRoutingTips);
            this.panel3.Controls.Add(this.cmbdomainStrategy);
-            resources.ApplyResources(this.panel3, "panel3");
            this.panel3.Name = "panel3";
            // 
            // linkLabelRoutingDoc
@@ -410,23 +418,24 @@
            // 
            // labRoutingTips
            // 
-            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
+            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
            this.labRoutingTips.Name = "labRoutingTips";
            // 
            // cmbdomainStrategy
            // 
+            resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy");
            this.cmbdomainStrategy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
            this.cmbdomainStrategy.FormattingEnabled = true;
            this.cmbdomainStrategy.Items.AddRange(new object[] {
            resources.GetString("cmbdomainStrategy.Items"),
            resources.GetString("cmbdomainStrategy.Items1"),
            resources.GetString("cmbdomainStrategy.Items2")});
-            resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy");
            this.cmbdomainStrategy.Name = "cmbdomainStrategy";
            // 
            // tabPage6
            // 
+            resources.ApplyResources(this.tabPage6, "tabPage6");
            this.tabPage6.Controls.Add(this.chkKcpcongestion);
            this.tabPage6.Controls.Add(this.txtKcpwriteBufferSize);
            this.tabPage6.Controls.Add(this.label10);
@@ -440,7 +449,6 @@
            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;
            // 
@@ -512,6 +520,7 @@
            // 
            // tabPage7
            // 
+            resources.ApplyResources(this.tabPage7, "tabPage7");
            this.tabPage7.Controls.Add(this.chkKeepOlderDedupl);
            this.tabPage7.Controls.Add(this.cbFreshrate);
            this.tabPage7.Controls.Add(this.lbFreshrate);
@@ -520,7 +529,6 @@
            this.tabPage7.Controls.Add(this.txturlGFWList);
            this.tabPage7.Controls.Add(this.label13);
            this.tabPage7.Controls.Add(this.chkAutoRun);
-            resources.ApplyResources(this.tabPage7, "tabPage7");
            this.tabPage7.Name = "tabPage7";
            this.tabPage7.UseVisualStyleBackColor = true;
            // 
@@ -532,9 +540,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
@@ -572,9 +580,9 @@
            // 
            // tabPage9
            // 
+            resources.ApplyResources(this.tabPage9, "tabPage9");
            this.tabPage9.Controls.Add(this.txtuserPacRule);
            this.tabPage9.Controls.Add(this.panel4);
-            resources.ApplyResources(this.tabPage9, "tabPage9");
            this.tabPage9.Name = "tabPage9";
            this.tabPage9.UseVisualStyleBackColor = true;
            // 
@@ -585,21 +593,21 @@
            // 
            // panel4
            // 
-            this.panel4.Controls.Add(this.label4);
            resources.ApplyResources(this.panel4, "panel4");
+            this.panel4.Controls.Add(this.label4);
            this.panel4.Name = "panel4";
            // 
            // label4
            // 
-            this.label4.ForeColor = System.Drawing.Color.Brown;
            resources.ApplyResources(this.label4, "label4");
+            this.label4.ForeColor = System.Drawing.Color.Brown;
            this.label4.Name = "label4";
            // 
            // 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
@@ -725,5 +733,6 @@
        private System.Windows.Forms.Label label4;
        private System.Windows.Forms.CheckBox chkKeepOlderDedupl;
        private System.Windows.Forms.LinkLabel linkLabelRoutingDoc;
+        private System.Windows.Forms.CheckBox chkdefAllowInsecure;
    }
 }
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.cs
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.cs
@@ -69,6 +69,8 @@ namespace v2rayN.Forms
            txtremoteDNS.Text = config.remoteDNS;

            cmblistenerType.SelectedIndex = (int)config.listenerType;
+
+            chkdefAllowInsecure.Checked = config.defAllowInsecure;
        }

        /// <summary>
@@ -265,6 +267,8 @@ namespace v2rayN.Forms

            config.listenerType = (ListenerType)Enum.ToObject(typeof(ListenerType), cmblistenerType.SelectedIndex);

+            config.defAllowInsecure = chkdefAllowInsecure.Checked;
+
            return 0;
        }

@@ -440,7 +444,7 @@ namespace v2rayN.Forms

        private void linkLabelRoutingDoc_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
        {
-            System.Diagnostics.Process.Start("https://www.v2ray.com/chapter_02/03_routing.html#routingobject");
+            System.Diagnostics.Process.Start("https://www.v2fly.org/chapter_02/03_routing.html");
        }
    }

--- a/v2rayN/v2rayN/Forms/OptionSettingForm.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.resx
--- a/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
+++ b/v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
@@ -117,88 +117,24 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <data name="$this.Text" xml:space="preserve">
-    <value>参数设置</value>
-  </data>
  <data name="btnClose.Text" xml:space="preserve">
    <value>取消(&amp;C)</value>
  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>确定(&amp;O)</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="btnSetDefRountingRule.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
+  <data name="tabPage1.Text" xml:space="preserve">
+    <value>  Core:基础设置  </value>
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btnSetDefRountingRule.Location" type="System.Drawing.Point, System.Drawing">
-    <value>351, 14</value>
+  <data name="chkdefAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
+    <value>222, 16</value>
  </data>
-  <data name="btnSetDefRountingRule.Size" type="System.Drawing.Size, System.Drawing">
-    <value>201, 23</value>
+  <data name="chkdefAllowInsecure.Text" xml:space="preserve">
+    <value>底层传输安全选tls时，默认跳过证书验证(allowInsecure)</value>
  </data>
-  <data name="btnSetDefRountingRule.Text" xml:space="preserve">
-    <value>一键设置默认自定义路由规则</value>
+  <data name="label16.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
  </data>
-  <data name="chkAllowIn2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>102, 16</value>
-  </data>
-  <data name="chkAllowIn2.Text" xml:space="preserve">
-    <value>本地监听端口2</value>
-  </data>
-  <data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing">
-    <value>144, 16</value>
-  </data>
-  <data name="chkAllowLANConn.Text" xml:space="preserve">
-    <value>允许来自局域网的连接</value>
-  </data>
-  <data name="chkAutoRun.Size" type="System.Drawing.Size, System.Drawing">
-    <value>180, 16</value>
-  </data>
-  <data name="chkAutoRun.Text" xml:space="preserve">
-    <value>开机自动启动(可能会不成功)</value>
-  </data>
-  <data name="chkEnableStatistics.Size" type="System.Drawing.Size, System.Drawing">
-    <value>384, 16</value>
-  </data>
-  <data name="chkEnableStatistics.Text" xml:space="preserve">
-    <value>启用统计(实时网速显示和使用流量显示，需要重启v2rayN客户端)</value>
-  </data>
-  <data name="chkKeepOlderDedupl.Text" xml:space="preserve">
-    <value>去重时保留序号较小的项</value>
-  </data>
-  <data name="chklogEnabled.Size" type="System.Drawing.Size, System.Drawing">
-    <value>156, 16</value>
-  </data>
-  <data name="chklogEnabled.Text" xml:space="preserve">
-    <value>记录本地日志(默认关闭)</value>
-  </data>
-  <data name="chkmuxEnabled.Text" xml:space="preserve">
-    <value>开启Mux多路复用(默认开启)</value>
-  </data>
-  <data name="chksniffingEnabled.Size" type="System.Drawing.Size, System.Drawing">
-    <value>96, 16</value>
-  </data>
-  <data name="chksniffingEnabled.Text" xml:space="preserve">
-    <value>开启流量探测</value>
-  </data>
-  <data name="chksniffingEnabled2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>96, 16</value>
-  </data>
-  <data name="chksniffingEnabled2.Text" xml:space="preserve">
-    <value>开启流量探测</value>
-  </data>
-  <data name="chkudpEnabled.Size" type="System.Drawing.Size, System.Drawing">
-    <value>66, 16</value>
-  </data>
-  <data name="chkudpEnabled.Text" xml:space="preserve">
-    <value>开启UDP</value>
-  </data>
-  <data name="chkudpEnabled2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>66, 16</value>
-  </data>
-  <data name="chkudpEnabled2.Text" xml:space="preserve">
-    <value>开启UDP</value>
+  <data name="label16.Text" xml:space="preserve">
+    <value>Http代理</value>
  </data>
  <data name="cmblistenerType.Items" xml:space="preserve">
    <value>关闭Http代理</value>
@@ -221,6 +157,117 @@
  <data name="cmblistenerType.Items6" xml:space="preserve">
    <value>仅开启PAC,不改变系统代理</value>
  </data>
+  <data name="chksniffingEnabled2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>96, 16</value>
+  </data>
+  <data name="chksniffingEnabled2.Text" xml:space="preserve">
+    <value>开启流量探测</value>
+  </data>
+  <data name="chksniffingEnabled.Size" type="System.Drawing.Size, System.Drawing">
+    <value>96, 16</value>
+  </data>
+  <data name="chksniffingEnabled.Text" xml:space="preserve">
+    <value>开启流量探测</value>
+  </data>
+  <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
+    <value>191, 12</value>
+  </data>
+  <data name="label14.Text" xml:space="preserve">
+    <value>自定义DNS(可多个,用逗号(,)隔开)</value>
+  </data>
+  <data name="chkmuxEnabled.Text" xml:space="preserve">
+    <value>开启Mux多路复用(默认开启)</value>
+  </data>
+  <data name="chkAllowIn2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>102, 16</value>
+  </data>
+  <data name="chkAllowIn2.Text" xml:space="preserve">
+    <value>本地监听端口2</value>
+  </data>
+  <data name="chkudpEnabled2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>66, 16</value>
+  </data>
+  <data name="chkudpEnabled2.Text" xml:space="preserve">
+    <value>开启UDP</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>29, 12</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>协议</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>29, 12</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>协议</value>
+  </data>
+  <data name="chkudpEnabled.Size" type="System.Drawing.Size, System.Drawing">
+    <value>66, 16</value>
+  </data>
+  <data name="chkudpEnabled.Text" xml:space="preserve">
+    <value>开启UDP</value>
+  </data>
+  <data name="chklogEnabled.Size" type="System.Drawing.Size, System.Drawing">
+    <value>156, 16</value>
+  </data>
+  <data name="chklogEnabled.Text" xml:space="preserve">
+    <value>记录本地日志(默认关闭)</value>
+  </data>
+  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
+  </data>
+  <data name="label5.Text" xml:space="preserve">
+    <value>日志等级</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>本地监听端口</value>
+  </data>
+  <data name="tabPage2.Text" xml:space="preserve">
+    <value>  Core:路由设置  </value>
+  </data>
+  <data name="tabControl2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 89</value>
+  </data>
+  <data name="tabControl2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>642, 481</value>
+  </data>
+  <data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 455</value>
+  </data>
+  <data name="tabPage3.Text" xml:space="preserve">
+    <value>  1.代理的Domain或IP  </value>
+  </data>
+  <data name="txtUseragent.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 449</value>
+  </data>
+  <data name="tabPage4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 455</value>
+  </data>
+  <data name="tabPage4.Text" xml:space="preserve">
+    <value>  2.直连的Domain或IP  </value>
+  </data>
+  <data name="txtUserdirect.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 449</value>
+  </data>
+  <data name="tabPage5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 455</value>
+  </data>
+  <data name="tabPage5.Text" xml:space="preserve">
+    <value>  3.阻止的Domain或IP  </value>
+  </data>
+  <data name="txtUserblock.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 449</value>
+  </data>
+  <data name="tabPage8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 455</value>
+  </data>
+  <data name="tabPage8.Text" xml:space="preserve">
+    <value>  4.预定义规则  </value>
+  </data>
  <data name="cmbroutingMode.Items" xml:space="preserve">
    <value>全局</value>
  </data>
@@ -239,53 +286,27 @@
  <data name="cmbroutingMode.Size" type="System.Drawing.Size, System.Drawing">
    <value>244, 20</value>
  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>29, 12</value>
+  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>642, 72</value>
  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>协议</value>
-  </data>
-  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>227, 12</value>
-  </data>
-  <data name="label13.Text" xml:space="preserve">
-    <value>自定义GFWList地址(不需自定义请填空白)</value>
-  </data>
-  <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
-    <value>191, 12</value>
-  </data>
-  <data name="label14.Text" xml:space="preserve">
-    <value>自定义DNS(可多个,用逗号(,)隔开)</value>
-  </data>
-  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
-  </data>
-  <data name="label16.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
-  </data>
-  <data name="label16.Text" xml:space="preserve">
-    <value>Http代理</value>
-  </data>
-  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="linkLabelRoutingDoc.Size" type="System.Drawing.Size, System.Drawing">
    <value>77, 12</value>
  </data>
-  <data name="label2.Text" xml:space="preserve">
-    <value>本地监听端口</value>
+  <data name="linkLabelRoutingDoc.Text" xml:space="preserve">
+    <value>域名解析策略</value>
  </data>
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>29, 12</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="btnSetDefRountingRule.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
  </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>协议</value>
+  <data name="btnSetDefRountingRule.Location" type="System.Drawing.Point, System.Drawing">
+    <value>351, 14</value>
  </data>
-  <data name="label4.Text" xml:space="preserve">
-    <value>*设置用户PAC规则，用逗号(,)隔开</value>
+  <data name="btnSetDefRountingRule.Size" type="System.Drawing.Size, System.Drawing">
+    <value>201, 23</value>
  </data>
-  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
-  </data>
-  <data name="label5.Text" xml:space="preserve">
-    <value>日志等级</value>
+  <data name="btnSetDefRountingRule.Text" xml:space="preserve">
+    <value>一键设置默认自定义路由规则</value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="labRoutingTips.AutoSize" type="System.Boolean, mscorlib">
@@ -300,70 +321,58 @@
  <data name="labRoutingTips.Text" xml:space="preserve">
    <value>*设置的规则，用逗号(,)隔开;支持Domain(纯字符串/正则/子域名)和IP</value>
  </data>
-  <data name="lbFreshrate.Size" type="System.Drawing.Size, System.Drawing">
-    <value>77, 12</value>
-  </data>
-  <data name="lbFreshrate.Text" xml:space="preserve">
-    <value>统计刷新频率</value>
-  </data>
-  <data name="linkLabelRoutingDoc.Text" xml:space="preserve">
-    <value>域名解析策略</value>
-  </data>
-  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>642, 72</value>
-  </data>
-  <data name="tabControl2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 89</value>
-  </data>
-  <data name="tabControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>642, 481</value>
-  </data>
-  <data name="tabPage1.Text" xml:space="preserve">
-    <value>  Core:基础设置  </value>
-  </data>
-  <data name="tabPage2.Text" xml:space="preserve">
-    <value>  Core:路由设置  </value>
-  </data>
-  <data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>634, 455</value>
-  </data>
-  <data name="tabPage3.Text" xml:space="preserve">
-    <value>  1.代理的Domain或IP  </value>
-  </data>
-  <data name="tabPage4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>634, 455</value>
-  </data>
-  <data name="tabPage4.Text" xml:space="preserve">
-    <value>  2.直连的Domain或IP  </value>
-  </data>
-  <data name="tabPage5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>634, 455</value>
-  </data>
-  <data name="tabPage5.Text" xml:space="preserve">
-    <value>  3.阻止的Domain或IP  </value>
-  </data>
  <data name="tabPage6.Text" xml:space="preserve">
    <value>  Core:KCP设置  </value>
  </data>
  <data name="tabPage7.Text" xml:space="preserve">
    <value>  v2rayN设置  </value>
  </data>
-  <data name="tabPage8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>634, 455</value>
+  <data name="chkKeepOlderDedupl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>156, 16</value>
  </data>
-  <data name="tabPage8.Text" xml:space="preserve">
-    <value>  4.预定义规则  </value>
+  <data name="chkKeepOlderDedupl.Text" xml:space="preserve">
+    <value>去重时保留序号较小的项</value>
+  </data>
+  <data name="lbFreshrate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
+  </data>
+  <data name="lbFreshrate.Text" xml:space="preserve">
+    <value>统计刷新频率</value>
+  </data>
+  <data name="chkEnableStatistics.Size" type="System.Drawing.Size, System.Drawing">
+    <value>372, 16</value>
+  </data>
+  <data name="chkEnableStatistics.Text" xml:space="preserve">
+    <value>启用统计(实时网速显示和使用流量显示，需要重启v2rayN客户端)</value>
+  </data>
+  <data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing">
+    <value>144, 16</value>
+  </data>
+  <data name="chkAllowLANConn.Text" xml:space="preserve">
+    <value>允许来自局域网的连接</value>
+  </data>
+  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>227, 12</value>
+  </data>
+  <data name="label13.Text" xml:space="preserve">
+    <value>自定义GFWList地址(不需自定义请填空白)</value>
+  </data>
+  <data name="chkAutoRun.Size" type="System.Drawing.Size, System.Drawing">
+    <value>180, 16</value>
+  </data>
+  <data name="chkAutoRun.Text" xml:space="preserve">
+    <value>开机自动启动(可能会不成功)</value>
  </data>
  <data name="tabPage9.Text" xml:space="preserve">
    <value>  用户PAC设置  </value>
  </data>
-  <data name="txtUseragent.Size" type="System.Drawing.Size, System.Drawing">
-    <value>628, 449</value>
+  <data name="label4.Text" xml:space="preserve">
+    <value>*设置用户PAC规则，用逗号(,)隔开</value>
  </data>
-  <data name="txtUserblock.Size" type="System.Drawing.Size, System.Drawing">
-    <value>628, 449</value>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>确定(&amp;O)</value>
  </data>
-  <data name="txtUserdirect.Size" type="System.Drawing.Size, System.Drawing">
-    <value>628, 449</value>
+  <data name="$this.Text" xml:space="preserve">
+    <value>参数设置</value>
  </data>
 </root>
--- a/v2rayN/v2rayN/Global.cs
+++ b/v2rayN/v2rayN/Global.cs
@@ -6,7 +6,7 @@ namespace v2rayN
        #region 常量


-        public const string v2rayWebsiteUrl = @"https://www.v2ray.com/";
+        public const string v2rayWebsiteUrl = @"https://www.v2fly.org/";
        public const string AboutUrl = @"https://github.com/2dust/v2rayN";
        public const string UpdateUrl = AboutUrl + @"/releases";

--- a/v2rayN/v2rayN/Handler/ConfigHandler.cs
+++ b/v2rayN/v2rayN/Handler/ConfigHandler.cs
@@ -147,10 +147,6 @@ namespace v2rayN.Handler
            //{
            //    config.remoteDNS = "1.1.1.1";
            //}
-            if (Utils.IsNullOrEmpty(config.defaultAllowInsecure))
-            {
-                config.defaultAllowInsecure = "false";
-            }

            if (config.subItem == null)
            {
@@ -219,7 +215,7 @@ namespace v2rayN.Handler
                //添加
                if (Utils.IsNullOrEmpty(vmessItem.allowInsecure))
                {
-                    vmessItem.allowInsecure = config.defaultAllowInsecure;
+                    vmessItem.allowInsecure = config.defAllowInsecure.ToString();
                }
                config.vmess.Add(vmessItem);
                if (config.vmess.Count == 1)
--- a/v2rayN/v2rayN/Handler/DownloadHandle.cs
+++ b/v2rayN/v2rayN/Handler/DownloadHandle.cs
@@ -54,8 +54,8 @@ namespace v2rayN.Handler

        private readonly string nLatestUrl = "https://github.com/2dust/v2rayN/releases/latest";
        private const string nUrl = "https://github.com/2dust/v2rayN/releases/download/{0}/v2rayN.zip";
-        private readonly string coreLatestUrl = "https://github.com/v2ray/v2ray-core/releases/latest";
-        private const string coreUrl = "https://github.com/v2ray/v2ray-core/releases/download/{0}/v2ray-windows-{1}.zip";
+        private readonly string coreLatestUrl = "https://github.com/v2fly/v2ray-core/releases/latest";
+        private const string coreUrl = "https://github.com/v2fly/v2ray-core/releases/download/{0}/v2ray-windows-{1}.zip";

        public async void CheckUpdateAsync(string type)
        {
@@ -101,7 +101,7 @@ namespace v2rayN.Handler
                string filePath = Utils.GetPath("V2ray.exe");
                if (!File.Exists(filePath))
                {
-                    string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2ray/v2ray-core/releases");
+                    string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2fly/v2ray-core/releases");
                    //ShowMsg(true, msg);
                    return "";
                }
@@ -136,13 +136,15 @@ namespace v2rayN.Handler
                string curVersion;
                string message;
                string url;
-                if (type == "Core") {
+                if (type == "Core")
+                {
                    curVersion = "v" + getV2rayVersion();
                    message = string.Format(UIRes.I18N("IsLatestCore"), curVersion);
                    string osBit = Environment.Is64BitProcess ? "64" : "32";
                    url = string.Format(coreUrl, version, osBit);
                }
-                else if (type == "v2rayN") {
+                else if (type == "v2rayN")
+                {
                    curVersion = FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString();
                    message = string.Format(UIRes.I18N("IsLatestN"), curVersion);
                    url = string.Format(nUrl, version);
@@ -172,8 +174,9 @@ namespace v2rayN.Handler

        #region Download 

-        public void DownloadFileAsync(string url, WebProxy webProxy, int downloadTimeout)
+        public WebClientEx DownloadFileAsync(string url, WebProxy webProxy, int downloadTimeout)
        {
+            WebClientEx ws = new WebClientEx();
            try
            {
                Utils.SetSecurityProtocol();
@@ -182,7 +185,7 @@ namespace v2rayN.Handler
                progressPercentage = -1;
                totalBytesToReceive = 0;

-                WebClientEx ws = new WebClientEx();
+                //WebClientEx ws = new WebClientEx();
                DownloadTimeout = downloadTimeout;
                if (webProxy != null)
                {
@@ -199,6 +202,7 @@ namespace v2rayN.Handler

                Error?.Invoke(this, new ErrorEventArgs(ex));
            }
+            return ws;
        }

        void ws_DownloadProgressChanged(object sender, DownloadProgressChangedEventArgs e)
--- a/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
+++ b/v2rayN/v2rayN/Handler/SpeedtestHandler.cs
@@ -11,26 +11,17 @@ namespace v2rayN.Handler
 {
    class SpeedtestHandler
    {
-        private DownloadHandle downloadHandle2;
        private Config _config;
        private V2rayHandler _v2rayHandler;
        private List<int> _selecteds;
        Action<int, string> _updateFunc;

-        private int testCounter = 0;
-        private int ItemIndex
-        {
-            get
-            {
-                return _selecteds[testCounter - 1];
-            }
-        }

        public SpeedtestHandler(ref Config config, ref V2rayHandler v2rayHandler, List<int> selecteds, string actionType, Action<int, string> update)
        {
            _config = config;
            _v2rayHandler = v2rayHandler;
-            _selecteds = selecteds;
+            _selecteds = Utils.DeepCopy(selecteds);
            _updateFunc = update;

            if (actionType == "ping")
@@ -178,6 +169,7 @@ namespace v2rayN.Handler

        private void RunSpeedTest()
        {
+            int testCounter = 0;
            int pid = -1;

            if (_config.vmess.Count <= 0)
@@ -188,39 +180,41 @@ namespace v2rayN.Handler
            pid = _v2rayHandler.LoadV2rayConfigString(_config, _selecteds);

            string url = _config.speedTestUrl;
-            testCounter = 0;
-            if (downloadHandle2 == null)
+            DownloadHandle downloadHandle2 = new DownloadHandle();
+            downloadHandle2.UpdateCompleted += (sender2, args) =>
            {
-                downloadHandle2 = new DownloadHandle();
-                downloadHandle2.UpdateCompleted += (sender2, args) =>
-                {
-                    _updateFunc(ItemIndex, args.Msg);
-                    if (args.Success) StartNext();
-                };
-                downloadHandle2.Error += (sender2, args) =>
-                {
-                    _updateFunc(ItemIndex, args.GetException().Message);
-                    StartNext();
-                };
-            }
-
-            StartNext();
-
-            void StartNext()
+                _updateFunc(testCounter, args.Msg);
+            };
+            downloadHandle2.Error += (sender2, args) =>
            {
-                if (testCounter >= _selecteds.Count)
+                _updateFunc(testCounter, args.GetException().Message);
+            };
+
+            var timeout = 12;
+            foreach (int itemIndex in _selecteds)
+            {
+                if (itemIndex >= _config.vmess.Count)
                {
-                    if (pid > 0) _v2rayHandler.V2rayStopPid(pid);
-                    return;
+                    break;
                }

+                if (_config.vmess[itemIndex].configType == (int)EConfigType.Custom)
+                {
+                    continue;
+                }
+                testCounter = itemIndex;
                int httpPort = _config.GetLocalPort("speedtest");
-                int index = _selecteds[testCounter];

-                testCounter++;
-                WebProxy webProxy = new WebProxy(Global.Loopback, httpPort + index);
-                downloadHandle2.DownloadFileAsync(url, webProxy, 10);
+                WebProxy webProxy = new WebProxy(Global.Loopback, httpPort + itemIndex);
+                var ws = downloadHandle2.DownloadFileAsync(url, webProxy, timeout - 2);
+
+                Thread.Sleep(1000 * timeout);
+
+                ws.CancelAsync();
+
+                Thread.Sleep(1000 * 2);
            }
+            if (pid > 0) _v2rayHandler.V2rayStopPid(pid);
        }


--- a/v2rayN/v2rayN/Handler/V2rayHandler.cs
+++ b/v2rayN/v2rayN/Handler/V2rayHandler.cs
@@ -174,7 +174,7 @@ namespace v2rayN.Handler
            }
            if (Utils.IsNullOrEmpty(fileName))
            {
-                string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2ray/v2ray-core/releases");
+                string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2fly/v2ray-core/releases");
                ShowMsg(false, msg);
            }
            return fileName;
--- a/v2rayN/v2rayN/Mode/Config.cs
+++ b/v2rayN/v2rayN/Mode/Config.cs
@@ -182,7 +182,7 @@ namespace v2rayN.Mode
        /// <summary>
        /// 是否允许不安全连接
        /// </summary>
-        public string defaultAllowInsecure
+        public bool defAllowInsecure
        {
            get; set;
        }
@@ -306,7 +306,7 @@ namespace v2rayN.Mode
        {
            if (index < 0 || Utils.IsNullOrEmpty(vmess[index].allowInsecure))
            {
-                return Convert.ToBoolean(defaultAllowInsecure);
+                return defAllowInsecure;
            }
            return Convert.ToBoolean(vmess[index].allowInsecure);
        }
@@ -704,7 +704,7 @@ namespace v2rayN.Mode
    [Serializable]
    public class UIItem
    {
-         
+

        public System.Drawing.Size mainSize
        {
--- 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("3.16")]
+[assembly: AssemblyFileVersion("3.19")]
Author	SHA1	Message	Date
2dust	a799420d0f	v2fly	2020-06-04 08:31:18 +08:00
2dust	70069a05e6	Update README.md	2020-06-04 08:08:30 +08:00
2dust	d385b44a48	Merge pull request #735 from rprx/patch-5 允许不安全连接 -> 跳过证书验证	2020-04-25 09:29:23 +08:00
rprx	56c1557f4a	允许不安全连接 -> 跳过证书验证 https://github.com/2dust/v2rayN/pull/733	2020-04-24 02:57:38 +00:00
2dust	737d563ebb	up speedtest	2020-04-23 16:20:30 +08:00
2dust	81b70195cf	Merge pull request #730 from rprx/patch-3 Update UI	2020-04-23 16:11:34 +08:00
2dust	e60851153b	Merge pull request #728 from rprx/patch-2 Delete #routingobject	2020-04-23 16:11:23 +08:00
rprx	009a15f0d9	Update UI Update UI	2020-04-23 07:27:13 +00:00
rprx	f234775bd5	Delete #routingobject 打开页面时露出上方“路由功能”的描述	2020-04-23 06:31:10 +00:00
2dust	9b8bd0fa8a	Merge pull request #725 from rprx/patch-1 v2ray.com -> v2fly.org	2020-04-23 13:51:29 +08:00
rprx	f74191946c	v2ray.com -> v2fly.org v2ray.com -> v2fly.org	2020-04-23 05:48:34 +00:00
2dust	ffa8b6296d	Update AssemblyInfo.cs	2020-04-23 10:12:24 +08:00
2dust	0b2a392de2	up allowInsecure	2020-04-23 10:10:29 +08:00