up 4.29

Fix autorun

README.md

@@ -6,5 +6,5 @@
 - Run v2rayN.exe
 
 ### Requirements  
-- Microsoft [.NET Framework 4.6](https://docs.microsoft.com/zh-cn/dotnet/framework/install/guide-for-developers) or higher
+- Microsoft [.NET Framework 4.8](https://docs.microsoft.com/zh-cn/dotnet/framework/install/guide-for-developers)
 - Project V core [https://github.com/v2fly/v2ray-core/releases](https://github.com/v2fly/v2ray-core/releases)

v2rayN/v2rayN/Forms/AddServer3Form.Designer.cs

@@ -45,12 +45,8 @@
             this.panel2 = new System.Windows.Forms.Panel();
             this.btnOK = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.menuServer = new System.Windows.Forms.MenuStrip();
-            this.MenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.menuItemImportClipboard = new System.Windows.Forms.ToolStripMenuItem();
             this.groupBox1.SuspendLayout();
             this.panel2.SuspendLayout();
-            this.menuServer.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnClose
@@ -161,26 +157,6 @@
             resources.ApplyResources(this.panel1, "panel1");
             this.panel1.Name = "panel1";
             // 
-            // menuServer
-            // 
-            this.menuServer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.MenuItem1});
-            resources.ApplyResources(this.menuServer, "menuServer");
-            this.menuServer.Name = "menuServer";
-            // 
-            // MenuItem1
-            // 
-            this.MenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.menuItemImportClipboard});
-            this.MenuItem1.Name = "MenuItem1";
-            resources.ApplyResources(this.MenuItem1, "MenuItem1");
-            // 
-            // menuItemImportClipboard
-            // 
-            this.menuItemImportClipboard.Name = "menuItemImportClipboard";
-            resources.ApplyResources(this.menuItemImportClipboard, "menuItemImportClipboard");
-            this.menuItemImportClipboard.Click += new System.EventHandler(this.menuItemImportClipboard_Click);
-            // 
             // AddServer3Form
             // 
             resources.ApplyResources(this, "$this");
@@ -189,7 +165,6 @@
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel1);
-            this.Controls.Add(this.menuServer);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.MinimizeBox = true;
             this.Name = "AddServer3Form";
@@ -197,10 +172,7 @@
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             this.panel2.ResumeLayout(false);
-            this.menuServer.ResumeLayout(false);
-            this.menuServer.PerformLayout();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -222,8 +194,5 @@
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.MenuStrip menuServer;
-        private System.Windows.Forms.ToolStripMenuItem MenuItem1;
-        private System.Windows.Forms.ToolStripMenuItem menuItemImportClipboard;
     }
 }

v2rayN/v2rayN/Forms/AddServer3Form.cs

@@ -100,41 +100,7 @@ namespace v2rayN.Forms
         private void btnClose_Click(object sender, EventArgs e)
         {
             this.DialogResult = DialogResult.Cancel;
-        }
-
-
-        #region 导入配置
-         
-        /// <summary>
-        /// 从剪贴板导入URL
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void menuItemImportClipboard_Click(object sender, EventArgs e)
-        {
-            ImportConfig();
-        }
-
-        private void ImportConfig()
-        {
-            ClearServer();
-
-            VmessItem vmessItem = ShareHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out string msg);
-            if (vmessItem == null)
-            {
-                UI.ShowWarning(msg);
-                return;
-            }
-
-            txtAddress.Text = vmessItem.address;
-            txtPort.Text = vmessItem.port.ToString();
-            cmbSecurity.Text = vmessItem.security;
-            txtId.Text = vmessItem.id;
-            txtRemarks.Text = vmessItem.remarks;
-        }
-         
-        #endregion
-         
+        }       
 
     }
 }

v2rayN/v2rayN/Forms/AddServer3Form.resx

@@ -126,7 +126,7 @@
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+    <value>1</value>
   </data>
   <data name="btnClose.Text" xml:space="preserve">
     <value>&amp;Cancel</value>
@@ -146,8 +146,12 @@
   <data name="label13.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="label13.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
   <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
-    <value>337, 158</value>
+    <value>426, 158</value>
   </data>
   <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
     <value>113, 12</value>
@@ -192,10 +196,10 @@
     <value>127, 123</value>
   </data>
   <data name="cmbSecurity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 20</value>
+    <value>278, 20</value>
   </data>
   <data name="cmbSecurity.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+    <value>3</value>
   </data>
   <data name="&gt;&gt;cmbSecurity.Name" xml:space="preserve">
     <value>cmbSecurity</value>
@@ -213,10 +217,10 @@
     <value>127, 154</value>
   </data>
   <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 21</value>
+    <value>278, 21</value>
   </data>
   <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+    <value>4</value>
   </data>
   <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
     <value>txtRemarks</value>
@@ -287,14 +291,11 @@
   <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 91</value>
   </data>
-  <data name="txtId.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
-    <value>*</value>
-  </data>
   <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
     <value>278, 21</value>
   </data>
   <data name="txtId.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+    <value>2</value>
   </data>
   <data name="&gt;&gt;txtId.Name" xml:space="preserve">
     <value>txtId</value>
@@ -342,7 +343,7 @@
     <value>194, 21</value>
   </data>
   <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;txtPort.Name" xml:space="preserve">
     <value>txtPort</value>
@@ -390,7 +391,7 @@
     <value>359, 21</value>
   </data>
   <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>0</value>
   </data>
   <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
     <value>txtAddress</value>
@@ -431,15 +432,14 @@
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
     <value>10</value>
   </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
   <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 35</value>
+    <value>0, 10</value>
   </data>
   <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 196</value>
+    <value>547, 221</value>
   </data>
   <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -466,7 +466,7 @@
     <value>75, 23</value>
   </data>
   <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+    <value>0</value>
   </data>
   <data name="btnOK.Text" xml:space="preserve">
     <value>&amp;OK</value>
@@ -511,7 +511,7 @@
     <value>Top</value>
   </data>
   <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 25</value>
+    <value>0, 0</value>
   </data>
   <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
     <value>547, 10</value>
@@ -531,42 +531,6 @@
   <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <metadata name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <data name="menuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
-    <value>235, 22</value>
-  </data>
-  <data name="menuItemImportClipboard.Text" xml:space="preserve">
-    <value>Import URL from clipboard</value>
-  </data>
-  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>162, 21</value>
-  </data>
-  <data name="MenuItem1.Text" xml:space="preserve">
-    <value>Import configuration file</value>
-  </data>
-  <data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 25</value>
-  </data>
-  <data name="menuServer.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
-  </data>
-  <data name="&gt;&gt;menuServer.Name" xml:space="preserve">
-    <value>menuServer</value>
-  </data>
-  <data name="&gt;&gt;menuServer.Type" xml:space="preserve">
-    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;menuServer.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;menuServer.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
@@ -579,18 +543,6 @@
   <data name="$this.Text" xml:space="preserve">
     <value>Edit or add a [Shadowsocks] server</value>
   </data>
-  <data name="&gt;&gt;MenuItem1.Name" xml:space="preserve">
-    <value>MenuItem1</value>
-  </data>
-  <data name="&gt;&gt;MenuItem1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;menuItemImportClipboard.Name" xml:space="preserve">
-    <value>menuItemImportClipboard</value>
-  </data>
-  <data name="&gt;&gt;menuItemImportClipboard.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>AddServer3Form</value>
   </data>

v2rayN/v2rayN/Forms/AddServer4Form.Designer.cs

@@ -45,25 +45,20 @@
             this.panel2 = new System.Windows.Forms.Panel();
             this.btnOK = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.menuServer = new System.Windows.Forms.MenuStrip();
-            this.MenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.menuItemImportClipboard = new System.Windows.Forms.ToolStripMenuItem();
             this.groupBox1.SuspendLayout();
             this.panel2.SuspendLayout();
-            this.menuServer.SuspendLayout();
             this.SuspendLayout();
             // 
             // 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);
             // 
             // groupBox1
             // 
-            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Controls.Add(this.txtSecurity);
             this.groupBox1.Controls.Add(this.label4);
             this.groupBox1.Controls.Add(this.txtId);
@@ -75,6 +70,7 @@
             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;
             // 
@@ -135,9 +131,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
@@ -152,26 +148,6 @@
             resources.ApplyResources(this.panel1, "panel1");
             this.panel1.Name = "panel1";
             // 
-            // menuServer
-            // 
-            resources.ApplyResources(this.menuServer, "menuServer");
-            this.menuServer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.MenuItem1});
-            this.menuServer.Name = "menuServer";
-            // 
-            // MenuItem1
-            // 
-            resources.ApplyResources(this.MenuItem1, "MenuItem1");
-            this.MenuItem1.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.menuItemImportClipboard});
-            this.MenuItem1.Name = "MenuItem1";
-            // 
-            // menuItemImportClipboard
-            // 
-            resources.ApplyResources(this.menuItemImportClipboard, "menuItemImportClipboard");
-            this.menuItemImportClipboard.Name = "menuItemImportClipboard";
-            this.menuItemImportClipboard.Click += new System.EventHandler(this.menuItemImportClipboard_Click);
-            // 
             // AddServer4Form
             // 
             resources.ApplyResources(this, "$this");
@@ -180,7 +156,6 @@
             this.Controls.Add(this.groupBox1);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel1);
-            this.Controls.Add(this.menuServer);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.MinimizeBox = true;
             this.Name = "AddServer4Form";
@@ -188,10 +163,7 @@
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
             this.panel2.ResumeLayout(false);
-            this.menuServer.ResumeLayout(false);
-            this.menuServer.PerformLayout();
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -209,9 +181,6 @@
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.MenuStrip menuServer;
-        private System.Windows.Forms.ToolStripMenuItem MenuItem1;
-        private System.Windows.Forms.ToolStripMenuItem menuItemImportClipboard;
         private System.Windows.Forms.TextBox txtId;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.TextBox txtSecurity;

v2rayN/v2rayN/Forms/AddServer4Form.cs

@@ -90,40 +90,7 @@ namespace v2rayN.Forms
         {
             this.DialogResult = DialogResult.Cancel;
         }
-
-
-        #region 导入配置
-         
-        /// <summary>
-        /// 从剪贴板导入URL
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void menuItemImportClipboard_Click(object sender, EventArgs e)
-        {
-            ImportConfig();
-        }
-
-        private void ImportConfig()
-        {
-            ClearServer();
-
-            VmessItem vmessItem = ShareHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out string msg);
-            if (vmessItem == null)
-            {
-                UI.ShowWarning(msg);
-                return;
-            }
-
-            txtAddress.Text = vmessItem.address;
-            txtPort.Text = vmessItem.port.ToString();
-            txtSecurity.Text = vmessItem.security;
-            txtId.Text = vmessItem.id;
-            txtRemarks.Text = vmessItem.remarks;
-        }        
-
-        #endregion
-         
+                 
 
     }
 }

v2rayN/v2rayN/Forms/AddServer4Form.resx

@@ -118,471 +118,420 @@
     <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="label13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
-  </data>
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
-  </data>
-  <data name="&gt;&gt;label6.Name" xml:space="preserve">
-    <value>label6</value>
-  </data>
-  <data name="&gt;&gt;txtSecurity.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 25</value>
-  </data>
-  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
-  <data name="MenuItem1.Text" xml:space="preserve">
-    <value>Import configuration file</value>
-  </data>
-  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>Password(Optional)</value>
-  </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label6.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;menuItemImportClipboard.Name" xml:space="preserve">
-    <value>menuItemImportClipboard</value>
-  </data>
-  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="menuServer.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>89, 12</value>
-  </data>
-  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 27</value>
-  </data>
-  <data name="&gt;&gt;menuServer.Type" xml:space="preserve">
-    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Edit or add a [Socks] server</value>
-  </data>
-  <data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>10</value>
-  </data>
-  <data name="txtId.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
-  </data>
-  <data name="menuItemImportClipboard.Text" xml:space="preserve">
-    <value>Import URL from clipboard</value>
-  </data>
-  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
-    <value>303, 17</value>
-  </data>
-  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="label3.TabIndex" type="System.Int32, mscorlib">
-    <value>23</value>
-  </data>
-  <data name="&gt;&gt;MenuItem1.Name" xml:space="preserve">
-    <value>MenuItem1</value>
-  </data>
-  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
-    <value>359, 21</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
     <value>396, 17</value>
   </data>
-  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>8</value>
+  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
   </data>
-  <data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>label1</value>
-  </data>
-  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 60</value>
-  </data>
-  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 25</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label13.TabIndex" type="System.Int32, mscorlib">
-    <value>22</value>
-  </data>
-  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>162, 21</value>
-  </data>
-  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>Server</value>
-  </data>
-  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 120</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="txtSecurity.TabIndex" type="System.Int32, mscorlib">
-    <value>26</value>
-  </data>
-  <data name="&gt;&gt;txtId.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;menuServer.Name" xml:space="preserve">
-    <value>menuServer</value>
-  </data>
-  <data name="&gt;&gt;label13.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label13.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="&gt;&gt;txtId.Name" xml:space="preserve">
-    <value>txtId</value>
-  </data>
-  <data name="menuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
-    <value>235, 22</value>
-  </data>
-  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 93</value>
-  </data>
-  <data name="&gt;&gt;txtId.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 31</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
   </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>AddServer4Form</value>
+  <data name="btnClose.Text" xml:space="preserve">
+    <value>&amp;Cancel</value>
   </data>
-  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 21</value>
+  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
+    <value>btnClose</value>
   </data>
-  <data name="&gt;&gt;label4.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtPort.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 58</value>
-  </data>
-  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
+  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
     <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;txtPort.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>71, 12</value>
-  </data>
-  <data name="&gt;&gt;MenuItem1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;txtPort.Name" xml:space="preserve">
-    <value>txtPort</value>
-  </data>
   <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
     <value>panel2</value>
   </data>
-  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 10</value>
+  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
-  <data name="txtId.PasswordChar" type="System.Char, mscorlib" xml:space="preserve">
-    <value>*</value>
+  <data name="txtSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 89</value>
   </data>
-  <data name="&gt;&gt;txtId.ZOrder" xml:space="preserve">
+  <data name="txtSecurity.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 21</value>
+  </data>
+  <data name="txtSecurity.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
   <data name="&gt;&gt;txtSecurity.Name" xml:space="preserve">
     <value>txtSecurity</value>
   </data>
-  <data name="&gt;&gt;menuServer.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;menuItemImportClipboard.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label4.Name" xml:space="preserve">
-    <value>label4</value>
-  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>&amp;OK</value>
-  </data>
-  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
-    <value>btnClose</value>
-  </data>
-  <data name="txtSecurity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 21</value>
-  </data>
-  <data name="label1.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;menuServer.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 124</value>
-  </data>
-  <data name="label2.TabIndex" type="System.Int32, mscorlib">
-    <value>2</value>
-  </data>
-  <data name="label6.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
-    <value>btnOK</value>
-  </data>
-  <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 21</value>
-  </data>
-  <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
-  </data>
-  <data name="&gt;&gt;label13.Name" xml:space="preserve">
-    <value>label13</value>
-  </data>
-  <data name="&gt;&gt;label6.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;txtSecurity.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
-  <data name="&gt;&gt;label3.Name" xml:space="preserve">
-    <value>label3</value>
-  </data>
-  <data name="label2.Text" xml:space="preserve">
-    <value>Server port</value>
-  </data>
-  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 231</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
-    <value>9</value>
-  </data>
-  <data name="btnClose.Text" xml:space="preserve">
-    <value>&amp;Cancel</value>
-  </data>
-  <data name="label13.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 12</value>
-  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>Server address</value>
-  </data>
-  <data name="label4.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
-  </data>
-  <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
-    <value>txtAddress</value>
-  </data>
-  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 151</value>
-  </data>
-  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 12</value>
-  </data>
-  <data name="&gt;&gt;label3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="label6.Text" xml:space="preserve">
-    <value>Alias (remarks)</value>
-  </data>
-  <data name="label13.Text" xml:space="preserve">
-    <value>* Fill in manually</value>
-  </data>
-  <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="&gt;&gt;label2.Name" xml:space="preserve">
-    <value>label2</value>
-  </data>
-  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 62</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>547, 291</value>
-  </data>
-  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>547, 196</value>
-  </data>
-  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>6</value>
+  <data name="&gt;&gt;txtSecurity.Parent" xml:space="preserve">
+    <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtSecurity.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="txtSecurity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 89</value>
-  </data>
-  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
-    <value>337, 155</value>
-  </data>
-  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+  <data name="label4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
+  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 93</value>
   </data>
   <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
     <value>89, 12</value>
   </data>
-  <data name="&gt;&gt;txtAddress.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;label4.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 35</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
-    <value>txtRemarks</value>
-  </data>
-  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 155</value>
-  </data>
-  <data name="label4.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="label4.TabIndex" type="System.Int32, mscorlib">
+    <value>25</value>
   </data>
   <data name="label4.Text" xml:space="preserve">
     <value>User(Optional)</value>
   </data>
+  <data name="&gt;&gt;label4.Name" xml:space="preserve">
+    <value>label4</value>
+  </data>
+  <data name="&gt;&gt;label4.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label4.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 120</value>
+  </data>
   <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
     <value>278, 21</value>
   </data>
+  <data name="txtId.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;txtId.Name" xml:space="preserve">
+    <value>txtId</value>
+  </data>
+  <data name="&gt;&gt;txtId.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtId.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtId.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 124</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 12</value>
+  </data>
+  <data name="label3.TabIndex" type="System.Int32, mscorlib">
+    <value>23</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>Password(Optional)</value>
+  </data>
+  <data name="&gt;&gt;label3.Name" xml:space="preserve">
+    <value>label3</value>
+  </data>
+  <data name="&gt;&gt;label3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="label13.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
+    <value>422, 155</value>
+  </data>
+  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 12</value>
+  </data>
+  <data name="label13.TabIndex" type="System.Int32, mscorlib">
+    <value>22</value>
+  </data>
+  <data name="label13.Text" xml:space="preserve">
+    <value>* Fill in manually</value>
+  </data>
+  <data name="&gt;&gt;label13.Name" xml:space="preserve">
+    <value>label13</value>
+  </data>
+  <data name="&gt;&gt;label13.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label13.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 151</value>
+  </data>
+  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 21</value>
+  </data>
+  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
+    <value>txtRemarks</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="label6.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 155</value>
+  </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</value>
+  </data>
+  <data name="label6.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="label6.Text" xml:space="preserve">
+    <value>Alias (remarks)</value>
+  </data>
+  <data name="&gt;&gt;label6.Name" xml:space="preserve">
+    <value>label6</value>
+  </data>
+  <data name="&gt;&gt;label6.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label6.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 58</value>
+  </data>
+  <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
+    <value>194, 21</value>
+  </data>
+  <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;txtPort.Name" xml:space="preserve">
+    <value>txtPort</value>
+  </data>
+  <data name="&gt;&gt;txtPort.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtPort.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 62</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 12</value>
+  </data>
+  <data name="label2.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>Server port</value>
+  </data>
+  <data name="&gt;&gt;label2.Name" xml:space="preserve">
+    <value>label2</value>
+  </data>
+  <data name="&gt;&gt;label2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 27</value>
+  </data>
+  <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
+    <value>359, 21</value>
+  </data>
+  <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
+    <value>txtAddress</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 31</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
+  </data>
+  <data name="label1.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Server address</value>
+  </data>
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">
+    <value>label1</value>
+  </data>
+  <data name="&gt;&gt;label1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 10</value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 221</value>
+  </data>
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>Server</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>303, 17</value>
+  </data>
+  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>&amp;OK</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
+    <value>btnOK</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Bottom</value>
+  </data>
+  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 231</value>
+  </data>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 60</value>
+  </data>
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
   <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Top</value>
   </data>
-  <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>547, 10</value>
+  </data>
+  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
+    <value>2</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>547, 291</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Edit or add a [Socks] server</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>AddServer4Form</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>v2rayN.Forms.BaseServerForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
 </root>

v2rayN/v2rayN/Forms/AddServer4Form.zh-Hans.resx

@@ -120,22 +120,13 @@
   <data name="btnClose.Text" xml:space="preserve">
     <value>取消(&amp;C)</value>
   </data>
-  <data name="groupBox1.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="txtSecurity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 21</value>
-  </data>
   <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
     <value>77, 12</value>
   </data>
   <data name="label4.Text" xml:space="preserve">
     <value>用户名(可选)</value>
   </data>
-  <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
-    <value>194, 21</value>
-  </data>
   <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
     <value>65, 12</value>
   </data>
@@ -163,21 +154,24 @@
   <data name="label1.Text" xml:space="preserve">
     <value>服务器地址</value>
   </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>服务器</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>
-  </data>
-  <data name="MenuItem1.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="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>92, 21</value>
+  </data>
+  <data name="MenuItem1.Text" xml:space="preserve">
+    <value>导入配置文件</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>编辑或添加[Socks]服务器</value>
   </data>

v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs

@@ -35,29 +35,6 @@
             this.label4 = new System.Windows.Forms.Label();
             this.btnGUID = new System.Windows.Forms.Button();
             this.label13 = new System.Windows.Forms.Label();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.label24 = new System.Windows.Forms.Label();
-            this.label23 = new System.Windows.Forms.Label();
-            this.panTlsMore = new System.Windows.Forms.Panel();
-            this.label21 = new System.Windows.Forms.Label();
-            this.cmbAllowInsecure = new System.Windows.Forms.ComboBox();
-            this.label9 = new System.Windows.Forms.Label();
-            this.label20 = new System.Windows.Forms.Label();
-            this.txtPath = new System.Windows.Forms.TextBox();
-            this.cmbNetwork = new System.Windows.Forms.ComboBox();
-            this.label7 = new System.Windows.Forms.Label();
-            this.label19 = new System.Windows.Forms.Label();
-            this.label18 = new System.Windows.Forms.Label();
-            this.label17 = new System.Windows.Forms.Label();
-            this.label16 = new System.Windows.Forms.Label();
-            this.label14 = new System.Windows.Forms.Label();
-            this.label15 = new System.Windows.Forms.Label();
-            this.cmbStreamSecurity = new System.Windows.Forms.ComboBox();
-            this.label12 = new System.Windows.Forms.Label();
-            this.txtRequestHost = new System.Windows.Forms.TextBox();
-            this.label11 = new System.Windows.Forms.Label();
-            this.label10 = new System.Windows.Forms.Label();
-            this.cmbHeaderType = new System.Windows.Forms.ComboBox();
             this.label8 = new System.Windows.Forms.Label();
             this.cmbSecurity = new System.Windows.Forms.ComboBox();
             this.txtRemarks = new System.Windows.Forms.TextBox();
@@ -72,17 +49,11 @@
             this.panel2 = new System.Windows.Forms.Panel();
             this.btnOK = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.menuServer = new System.Windows.Forms.MenuStrip();
-            this.MenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.MenuItemImportClient = new System.Windows.Forms.ToolStripMenuItem();
-            this.MenuItemImportServer = new System.Windows.Forms.ToolStripMenuItem();
-            this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
-            this.MenuItemImportClipboard = new System.Windows.Forms.ToolStripMenuItem();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.transportControl = new v2rayN.Forms.ServerTransportControl();
             this.groupBox1.SuspendLayout();
-            this.groupBox2.SuspendLayout();
-            this.panTlsMore.SuspendLayout();
             this.panel2.SuspendLayout();
-            this.menuServer.SuspendLayout();
+            this.panel3.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnClose
@@ -99,7 +70,6 @@
             this.groupBox1.Controls.Add(this.label4);
             this.groupBox1.Controls.Add(this.btnGUID);
             this.groupBox1.Controls.Add(this.label13);
-            this.groupBox1.Controls.Add(this.groupBox2);
             this.groupBox1.Controls.Add(this.label8);
             this.groupBox1.Controls.Add(this.cmbSecurity);
             this.groupBox1.Controls.Add(this.txtRemarks);
@@ -144,176 +114,6 @@
             resources.ApplyResources(this.label13, "label13");
             this.label13.Name = "label13";
             // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.label24);
-            this.groupBox2.Controls.Add(this.label23);
-            this.groupBox2.Controls.Add(this.panTlsMore);
-            this.groupBox2.Controls.Add(this.label9);
-            this.groupBox2.Controls.Add(this.label20);
-            this.groupBox2.Controls.Add(this.txtPath);
-            this.groupBox2.Controls.Add(this.cmbNetwork);
-            this.groupBox2.Controls.Add(this.label7);
-            this.groupBox2.Controls.Add(this.label19);
-            this.groupBox2.Controls.Add(this.label18);
-            this.groupBox2.Controls.Add(this.label17);
-            this.groupBox2.Controls.Add(this.label16);
-            this.groupBox2.Controls.Add(this.label14);
-            this.groupBox2.Controls.Add(this.label15);
-            this.groupBox2.Controls.Add(this.cmbStreamSecurity);
-            this.groupBox2.Controls.Add(this.label12);
-            this.groupBox2.Controls.Add(this.txtRequestHost);
-            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;
-            // 
-            // label24
-            // 
-            resources.ApplyResources(this.label24, "label24");
-            this.label24.Name = "label24";
-            // 
-            // label23
-            // 
-            resources.ApplyResources(this.label23, "label23");
-            this.label23.Name = "label23";
-            // 
-            // panTlsMore
-            // 
-            this.panTlsMore.Controls.Add(this.label21);
-            this.panTlsMore.Controls.Add(this.cmbAllowInsecure);
-            resources.ApplyResources(this.panTlsMore, "panTlsMore");
-            this.panTlsMore.Name = "panTlsMore";
-            // 
-            // label21
-            // 
-            resources.ApplyResources(this.label21, "label21");
-            this.label21.Name = "label21";
-            // 
-            // 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";
-            // 
-            // label9
-            // 
-            resources.ApplyResources(this.label9, "label9");
-            this.label9.Name = "label9";
-            // 
-            // label20
-            // 
-            resources.ApplyResources(this.label20, "label20");
-            this.label20.Name = "label20";
-            // 
-            // txtPath
-            // 
-            resources.ApplyResources(this.txtPath, "txtPath");
-            this.txtPath.Name = "txtPath";
-            // 
-            // cmbNetwork
-            // 
-            this.cmbNetwork.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbNetwork.FormattingEnabled = true;
-            this.cmbNetwork.Items.AddRange(new object[] {
-            resources.GetString("cmbNetwork.Items"),
-            resources.GetString("cmbNetwork.Items1"),
-            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);
-            // 
-            // label7
-            // 
-            resources.ApplyResources(this.label7, "label7");
-            this.label7.Name = "label7";
-            // 
-            // label19
-            // 
-            resources.ApplyResources(this.label19, "label19");
-            this.label19.Name = "label19";
-            // 
-            // label18
-            // 
-            resources.ApplyResources(this.label18, "label18");
-            this.label18.Name = "label18";
-            // 
-            // label17
-            // 
-            resources.ApplyResources(this.label17, "label17");
-            this.label17.Name = "label17";
-            // 
-            // label16
-            // 
-            resources.ApplyResources(this.label16, "label16");
-            this.label16.Name = "label16";
-            // 
-            // label14
-            // 
-            resources.ApplyResources(this.label14, "label14");
-            this.label14.Name = "label14";
-            // 
-            // label15
-            // 
-            resources.ApplyResources(this.label15, "label15");
-            this.label15.Name = "label15";
-            // 
-            // 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.GetString("cmbStreamSecurity.Items2")});
-            resources.ApplyResources(this.cmbStreamSecurity, "cmbStreamSecurity");
-            this.cmbStreamSecurity.Name = "cmbStreamSecurity";
-            this.cmbStreamSecurity.SelectedIndexChanged += new System.EventHandler(this.cmbStreamSecurity_SelectedIndexChanged);
-            // 
-            // label12
-            // 
-            resources.ApplyResources(this.label12, "label12");
-            this.label12.Name = "label12";
-            // 
-            // txtRequestHost
-            // 
-            resources.ApplyResources(this.txtRequestHost, "txtRequestHost");
-            this.txtRequestHost.Name = "txtRequestHost";
-            // 
-            // label11
-            // 
-            resources.ApplyResources(this.label11, "label11");
-            this.label11.Name = "label11";
-            // 
-            // label10
-            // 
-            resources.ApplyResources(this.label10, "label10");
-            this.label10.Name = "label10";
-            // 
-            // cmbHeaderType
-            // 
-            this.cmbHeaderType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbHeaderType.FormattingEnabled = true;
-            this.cmbHeaderType.Items.AddRange(new object[] {
-            resources.GetString("cmbHeaderType.Items"),
-            resources.GetString("cmbHeaderType.Items1"),
-            resources.GetString("cmbHeaderType.Items2"),
-            resources.GetString("cmbHeaderType.Items3"),
-            resources.GetString("cmbHeaderType.Items4"),
-            resources.GetString("cmbHeaderType.Items5"),
-            resources.GetString("cmbHeaderType.Items6")});
-            resources.ApplyResources(this.cmbHeaderType, "cmbHeaderType");
-            this.cmbHeaderType.Name = "cmbHeaderType";
-            // 
             // label8
             // 
             resources.ApplyResources(this.label8, "label8");
@@ -392,45 +192,17 @@
             resources.ApplyResources(this.panel1, "panel1");
             this.panel1.Name = "panel1";
             // 
-            // menuServer
+            // panel3
             // 
-            this.menuServer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.MenuItem1});
-            resources.ApplyResources(this.menuServer, "menuServer");
-            this.menuServer.Name = "menuServer";
+            this.panel3.Controls.Add(this.transportControl);
+            resources.ApplyResources(this.panel3, "panel3");
+            this.panel3.Name = "panel3";
             // 
-            // MenuItem1
+            // transportControl
             // 
-            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.Click += new System.EventHandler(this.MenuItemImportClient_Click);
-            // 
-            // MenuItemImportServer
-            // 
-            this.MenuItemImportServer.Name = "MenuItemImportServer";
-            resources.ApplyResources(this.MenuItemImportServer, "MenuItemImportServer");
-            this.MenuItemImportServer.Click += new System.EventHandler(this.MenuItemImportServer_Click);
-            // 
-            // toolStripSeparator1
-            // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
-            resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
-            // 
-            // MenuItemImportClipboard
-            // 
-            this.MenuItemImportClipboard.Name = "MenuItemImportClipboard";
-            resources.ApplyResources(this.MenuItemImportClipboard, "MenuItemImportClipboard");
-            this.MenuItemImportClipboard.Click += new System.EventHandler(this.MenuItemImportClipboard_Click);
+            this.transportControl.AllowXtls = false;
+            resources.ApplyResources(this.transportControl, "transportControl");
+            this.transportControl.Name = "transportControl";
             // 
             // AddServer5Form
             // 
@@ -438,23 +210,17 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnClose;
             this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.panel3);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel1);
-            this.Controls.Add(this.menuServer);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
             this.Name = "AddServer5Form";
             this.Load += new System.EventHandler(this.AddServer5Form_Load);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.panTlsMore.ResumeLayout(false);
-            this.panTlsMore.PerformLayout();
             this.panel2.ResumeLayout(false);
-            this.menuServer.ResumeLayout(false);
-            this.menuServer.PerformLayout();
+            this.panel3.ResumeLayout(false);
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
@@ -473,41 +239,14 @@
         private System.Windows.Forms.TextBox txtAddress;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.ComboBox cmbSecurity;
-        private System.Windows.Forms.ComboBox cmbNetwork;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Panel panel2;
-        private System.Windows.Forms.TextBox txtRequestHost;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.ComboBox cmbHeaderType;
-        private System.Windows.Forms.Label label12;
-        private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.Label label13;
-        private System.Windows.Forms.MenuStrip menuServer;
-        private System.Windows.Forms.ToolStripMenuItem MenuItem1;
-        private System.Windows.Forms.ToolStripMenuItem MenuItemImportClient;
-        private System.Windows.Forms.ToolStripMenuItem MenuItemImportServer;
-        private System.Windows.Forms.Label label15;
-        private System.Windows.Forms.ComboBox cmbStreamSecurity;
-        private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
-        private System.Windows.Forms.ToolStripMenuItem MenuItemImportClipboard;
         private System.Windows.Forms.Button btnGUID;
-        private System.Windows.Forms.Label label16;
-        private System.Windows.Forms.Label label14;
-        private System.Windows.Forms.Label label17;
-        private System.Windows.Forms.Label label18;
-        private System.Windows.Forms.Label label19;
-        private System.Windows.Forms.TextBox txtPath;
-        private System.Windows.Forms.Label label20;
-        private System.Windows.Forms.Label label21;
-        private System.Windows.Forms.ComboBox cmbAllowInsecure;
-        private System.Windows.Forms.Panel panTlsMore;
-        private System.Windows.Forms.Label label24;
-        private System.Windows.Forms.Label label23;
         private System.Windows.Forms.ComboBox cmbFlow;
         private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Panel panel3;
+        private ServerTransportControl transportControl;
     }
 }

v2rayN/v2rayN/Forms/AddServer5Form.cs

@@ -6,7 +6,7 @@ using v2rayN.Mode;
 namespace v2rayN.Forms
 {
     public partial class AddServer5Form : BaseServerForm
-    { 
+    {
 
         public AddServer5Form()
         {
@@ -15,6 +15,7 @@ namespace v2rayN.Forms
 
         private void AddServer5Form_Load(object sender, EventArgs e)
         {
+            transportControl.AllowXtls = true;
             if (EditIndex >= 0)
             {
                 vmessItem = config.vmess[EditIndex];
@@ -37,14 +38,9 @@ namespace v2rayN.Forms
             txtId.Text = vmessItem.id;
             cmbFlow.Text = vmessItem.flow;
             cmbSecurity.Text = vmessItem.security;
-            cmbNetwork.Text = vmessItem.network;
             txtRemarks.Text = vmessItem.remarks;
 
-            cmbHeaderType.Text = vmessItem.headerType;
-            txtRequestHost.Text = vmessItem.requestHost;
-            txtPath.Text = vmessItem.path;
-            cmbStreamSecurity.Text = vmessItem.streamSecurity;
-            cmbAllowInsecure.Text = vmessItem.allowInsecure;
+            transportControl.BindingServer(vmessItem);
         }
 
 
@@ -58,53 +54,9 @@ namespace v2rayN.Forms
             txtId.Text = "";
             cmbFlow.Text = "";
             cmbSecurity.Text = Global.None;
-            cmbNetwork.Text = Global.DefaultNetwork;
             txtRemarks.Text = "";
 
-            cmbHeaderType.Text = Global.None;
-            txtRequestHost.Text = "";
-            cmbStreamSecurity.Text = "";
-            cmbAllowInsecure.Text = "";
-            txtPath.Text = "";
-        }
-
-
-        private void cmbNetwork_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            SetHeaderType();
-        }
-
-        /// <summary>
-        /// 设置伪装选项
-        /// </summary>
-        private void SetHeaderType()
-        {
-            cmbHeaderType.Items.Clear();
-
-            string network = cmbNetwork.Text;
-            if (Utils.IsNullOrEmpty(network))
-            {
-                cmbHeaderType.Items.Add(Global.None);
-                return;
-            }
-
-            cmbHeaderType.Items.Add(Global.None);
-            if (network.Equals(Global.DefaultNetwork))
-            {
-                cmbHeaderType.Items.Add(Global.TcpHeaderHttp);
-            }
-            else if (network.Equals("kcp") || network.Equals("quic"))
-            {
-                cmbHeaderType.Items.Add("srtp");
-                cmbHeaderType.Items.Add("utp");
-                cmbHeaderType.Items.Add("wechat-video");
-                cmbHeaderType.Items.Add("dtls");
-                cmbHeaderType.Items.Add("wireguard");
-            }
-            else
-            {
-            }
-            cmbHeaderType.Text = Global.None;
+            transportControl.ClearServer(vmessItem);
         }
 
         private void btnOK_Click(object sender, EventArgs e)
@@ -114,15 +66,8 @@ namespace v2rayN.Forms
             string id = txtId.Text;
             string flow = cmbFlow.Text;
             string security = cmbSecurity.Text;
-            string network = cmbNetwork.Text;
             string remarks = txtRemarks.Text;
 
-            string headerType = cmbHeaderType.Text;
-            string requestHost = txtRequestHost.Text;
-            string path = txtPath.Text;
-            string streamSecurity = cmbStreamSecurity.Text;
-            string allowInsecure = cmbAllowInsecure.Text;
-
             if (Utils.IsNullOrEmpty(address))
             {
                 UI.Show(UIRes.I18N("FillServerAddress"));
@@ -139,21 +84,15 @@ namespace v2rayN.Forms
                 return;
             }
 
+            transportControl.EndBindingServer();
 
             vmessItem.address = address;
             vmessItem.port = Utils.ToInt(port);
             vmessItem.id = id;
             vmessItem.flow = flow;
             vmessItem.security = security;
-            vmessItem.network = network;
             vmessItem.remarks = remarks;
 
-            vmessItem.headerType = headerType;
-            vmessItem.requestHost = requestHost.Replace(" ", "");
-            vmessItem.path = path.Replace(" ", "");
-            vmessItem.streamSecurity = streamSecurity;
-            vmessItem.allowInsecure = allowInsecure;
-
             if (ConfigHandler.AddVlessServer(ref config, vmessItem, EditIndex) == 0)
             {
                 this.DialogResult = DialogResult.OK;
@@ -173,114 +112,5 @@ namespace v2rayN.Forms
         {
             this.DialogResult = DialogResult.Cancel;
         }
-
-        private void cmbStreamSecurity_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            string security = cmbStreamSecurity.Text;
-            if (Utils.IsNullOrEmpty(security))
-            {
-                panTlsMore.Hide();
-            }
-            else
-            {
-                panTlsMore.Show();
-            }
-        }
-
-        #region 导入客户端/服务端配置
-
-        /// <summary>
-        /// 导入客户端
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void MenuItemImportClient_Click(object sender, EventArgs e)
-        {
-            MenuItemImport(1);
-        }
-
-        /// <summary>
-        /// 导入服务端
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void MenuItemImportServer_Click(object sender, EventArgs e)
-        {
-            MenuItemImport(2);
-        }
-
-        private void MenuItemImport(int type)
-        {
-            ClearServer();
-
-            OpenFileDialog fileDialog = new OpenFileDialog
-            {
-                Multiselect = false,
-                Filter = "Config|*.json|All|*.*"
-            };
-            if (fileDialog.ShowDialog() != DialogResult.OK)
-            {
-                return;
-            }
-            string fileName = fileDialog.FileName;
-            if (Utils.IsNullOrEmpty(fileName))
-            {
-                return;
-            }
-            string msg;
-            VmessItem vmessItem;
-            if (type.Equals(1))
-            {
-                vmessItem = V2rayConfigHandler.ImportFromClientConfig(fileName, out msg);
-            }
-            else
-            {
-                vmessItem = V2rayConfigHandler.ImportFromServerConfig(fileName, out msg);
-            }
-            if (vmessItem == null)
-            {
-                UI.ShowWarning(msg);
-                return;
-            }
-
-            txtAddress.Text = vmessItem.address;
-            txtPort.Text = vmessItem.port.ToString();
-            txtId.Text = vmessItem.id;
-            txtRemarks.Text = vmessItem.remarks;
-            cmbNetwork.Text = vmessItem.network;
-            cmbHeaderType.Text = vmessItem.headerType;
-            txtRequestHost.Text = vmessItem.requestHost;
-            txtPath.Text = vmessItem.path;
-            cmbStreamSecurity.Text = vmessItem.streamSecurity;
-        }
-
-        /// <summary>
-        /// 从剪贴板导入URL
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void MenuItemImportClipboard_Click(object sender, EventArgs e)
-        {
-            ClearServer();
-
-            VmessItem vmessItem = ShareHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out string msg);
-            if (vmessItem == null)
-            {
-                UI.ShowWarning(msg);
-                return;
-            }
-
-            txtAddress.Text = vmessItem.address;
-            txtPort.Text = vmessItem.port.ToString();
-            txtId.Text = vmessItem.id;
-            txtRemarks.Text = vmessItem.remarks;
-            cmbNetwork.Text = vmessItem.network;
-            cmbHeaderType.Text = vmessItem.headerType;
-            txtRequestHost.Text = vmessItem.requestHost;
-            txtPath.Text = vmessItem.path;
-            cmbStreamSecurity.Text = vmessItem.streamSecurity;
-        }
-        #endregion
-
     }
-}
+}

v2rayN/v2rayN/Forms/AddServer5Form.resx

@@ -165,7 +165,7 @@
     <value>211, 20</value>
   </data>
   <data name="cmbFlow.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
+    <value>3</value>
   </data>
   <data name="&gt;&gt;cmbFlow.Name" xml:space="preserve">
     <value>cmbFlow</value>
@@ -261,654 +261,6 @@
   <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
     <value>3</value>
   </data>
-  <data name="label24.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label24.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="label24.Location" type="System.Drawing.Point, System.Drawing">
-    <value>529, 207</value>
-  </data>
-  <data name="label24.Size" type="System.Drawing.Size, System.Drawing">
-    <value>119, 12</value>
-  </data>
-  <data name="label24.TabIndex" type="System.Int32, mscorlib">
-    <value>35</value>
-  </data>
-  <data name="label24.Text" xml:space="preserve">
-    <value>3)QUIC key/Kcp seed</value>
-  </data>
-  <data name="&gt;&gt;label24.Name" xml:space="preserve">
-    <value>label24</value>
-  </data>
-  <data name="&gt;&gt;label24.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label24.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label24.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="label23.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label23.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="label23.Location" type="System.Drawing.Point, System.Drawing">
-    <value>465, 140</value>
-  </data>
-  <data name="label23.Size" type="System.Drawing.Size, System.Drawing">
-    <value>89, 12</value>
-  </data>
-  <data name="label23.TabIndex" type="System.Int32, mscorlib">
-    <value>34</value>
-  </data>
-  <data name="label23.Text" xml:space="preserve">
-    <value>4)QUIC securty</value>
-  </data>
-  <data name="&gt;&gt;label23.Name" xml:space="preserve">
-    <value>label23</value>
-  </data>
-  <data name="&gt;&gt;label23.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label23.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label23.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="label21.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label21.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="label21.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 11</value>
-  </data>
-  <data name="label21.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 12</value>
-  </data>
-  <data name="label21.TabIndex" type="System.Int32, mscorlib">
-    <value>31</value>
-  </data>
-  <data name="label21.Text" xml:space="preserve">
-    <value>allowInsecure</value>
-  </data>
-  <data name="&gt;&gt;label21.Name" xml:space="preserve">
-    <value>label21</value>
-  </data>
-  <data name="&gt;&gt;label21.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label21.Parent" xml:space="preserve">
-    <value>panTlsMore</value>
-  </data>
-  <data name="&gt;&gt;label21.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="cmbAllowInsecure.Items" xml:space="preserve">
-    <value />
-  </data>
-  <data name="cmbAllowInsecure.Items1" xml:space="preserve">
-    <value>true</value>
-  </data>
-  <data name="cmbAllowInsecure.Items2" xml:space="preserve">
-    <value>false</value>
-  </data>
-  <data name="cmbAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
-    <value>107, 7</value>
-  </data>
-  <data name="cmbAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
-    <value>91, 20</value>
-  </data>
-  <data name="cmbAllowInsecure.TabIndex" type="System.Int32, mscorlib">
-    <value>30</value>
-  </data>
-  <data name="&gt;&gt;cmbAllowInsecure.Name" xml:space="preserve">
-    <value>cmbAllowInsecure</value>
-  </data>
-  <data name="&gt;&gt;cmbAllowInsecure.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbAllowInsecure.Parent" xml:space="preserve">
-    <value>panTlsMore</value>
-  </data>
-  <data name="&gt;&gt;cmbAllowInsecure.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="panTlsMore.Location" type="System.Drawing.Point, System.Drawing">
-    <value>284, 232</value>
-  </data>
-  <data name="panTlsMore.Size" type="System.Drawing.Size, System.Drawing">
-    <value>338, 35</value>
-  </data>
-  <data name="panTlsMore.TabIndex" type="System.Int32, mscorlib">
-    <value>33</value>
-  </data>
-  <data name="&gt;&gt;panTlsMore.Name" xml:space="preserve">
-    <value>panTlsMore</value>
-  </data>
-  <data name="&gt;&gt;panTlsMore.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panTlsMore.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;panTlsMore.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="label9.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
-    <value>353, 32</value>
-  </data>
-  <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
-  </data>
-  <data name="label9.TabIndex" type="System.Int32, mscorlib">
-    <value>15</value>
-  </data>
-  <data name="label9.Text" xml:space="preserve">
-    <value>*Default value tcp</value>
-  </data>
-  <data name="&gt;&gt;label9.Name" xml:space="preserve">
-    <value>label9</value>
-  </data>
-  <data name="&gt;&gt;label9.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label9.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label9.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="label20.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label20.Location" type="System.Drawing.Point, System.Drawing">
-    <value>464, 124</value>
-  </data>
-  <data name="label20.Size" type="System.Drawing.Size, System.Drawing">
-    <value>203, 12</value>
-  </data>
-  <data name="label20.TabIndex" type="System.Int32, mscorlib">
-    <value>29</value>
-  </data>
-  <data name="label20.Text" xml:space="preserve">
-    <value>3)h2 host Separated by commas (,)</value>
-  </data>
-  <data name="&gt;&gt;label20.Name" xml:space="preserve">
-    <value>label20</value>
-  </data>
-  <data name="&gt;&gt;label20.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label20.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label20.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="txtPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 169</value>
-  </data>
-  <data name="txtPath.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="txtPath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>396, 54</value>
-  </data>
-  <data name="txtPath.TabIndex" type="System.Int32, mscorlib">
-    <value>28</value>
-  </data>
-  <data name="&gt;&gt;txtPath.Name" xml:space="preserve">
-    <value>txtPath</value>
-  </data>
-  <data name="&gt;&gt;txtPath.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtPath.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;txtPath.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="cmbNetwork.Items" xml:space="preserve">
-    <value>tcp</value>
-  </data>
-  <data name="cmbNetwork.Items1" xml:space="preserve">
-    <value>kcp</value>
-  </data>
-  <data name="cmbNetwork.Items2" xml:space="preserve">
-    <value>ws</value>
-  </data>
-  <data name="cmbNetwork.Items3" xml:space="preserve">
-    <value>h2</value>
-  </data>
-  <data name="cmbNetwork.Items4" xml:space="preserve">
-    <value>quic</value>
-  </data>
-  <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
-    <value>192, 28</value>
-  </data>
-  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 20</value>
-  </data>
-  <data name="cmbNetwork.TabIndex" type="System.Int32, mscorlib">
-    <value>12</value>
-  </data>
-  <data name="&gt;&gt;cmbNetwork.Name" xml:space="preserve">
-    <value>cmbNetwork</value>
-  </data>
-  <data name="&gt;&gt;cmbNetwork.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbNetwork.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;cmbNetwork.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="label7.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 32</value>
-  </data>
-  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>167, 12</value>
-  </data>
-  <data name="label7.TabIndex" type="System.Int32, mscorlib">
-    <value>13</value>
-  </data>
-  <data name="label7.Text" xml:space="preserve">
-    <value>Transport protocol(network)</value>
-  </data>
-  <data name="&gt;&gt;label7.Name" xml:space="preserve">
-    <value>label7</value>
-  </data>
-  <data name="&gt;&gt;label7.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label7.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="label19.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label19.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 169</value>
-  </data>
-  <data name="label19.Size" type="System.Drawing.Size, System.Drawing">
-    <value>29, 12</value>
-  </data>
-  <data name="label19.TabIndex" type="System.Int32, mscorlib">
-    <value>27</value>
-  </data>
-  <data name="label19.Text" xml:space="preserve">
-    <value>Path</value>
-  </data>
-  <data name="&gt;&gt;label19.Name" xml:space="preserve">
-    <value>label19</value>
-  </data>
-  <data name="&gt;&gt;label19.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label19.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label19.ZOrder" xml:space="preserve">
-    <value>8</value>
-  </data>
-  <data name="label18.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label18.Location" type="System.Drawing.Point, System.Drawing">
-    <value>529, 189</value>
-  </data>
-  <data name="label18.Size" type="System.Drawing.Size, System.Drawing">
-    <value>59, 12</value>
-  </data>
-  <data name="label18.TabIndex" type="System.Int32, mscorlib">
-    <value>26</value>
-  </data>
-  <data name="label18.Text" xml:space="preserve">
-    <value>2)h2 path</value>
-  </data>
-  <data name="&gt;&gt;label18.Name" xml:space="preserve">
-    <value>label18</value>
-  </data>
-  <data name="&gt;&gt;label18.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label18.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label18.ZOrder" xml:space="preserve">
-    <value>9</value>
-  </data>
-  <data name="label17.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label17.Location" type="System.Drawing.Point, System.Drawing">
-    <value>464, 109</value>
-  </data>
-  <data name="label17.Size" type="System.Drawing.Size, System.Drawing">
-    <value>59, 12</value>
-  </data>
-  <data name="label17.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
-  </data>
-  <data name="label17.Text" xml:space="preserve">
-    <value>2)ws host</value>
-  </data>
-  <data name="&gt;&gt;label17.Name" xml:space="preserve">
-    <value>label17</value>
-  </data>
-  <data name="&gt;&gt;label17.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label17.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label17.ZOrder" xml:space="preserve">
-    <value>10</value>
-  </data>
-  <data name="label16.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label16.Location" type="System.Drawing.Point, System.Drawing">
-    <value>529, 172</value>
-  </data>
-  <data name="label16.Size" type="System.Drawing.Size, System.Drawing">
-    <value>59, 12</value>
-  </data>
-  <data name="label16.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
-  </data>
-  <data name="label16.Text" xml:space="preserve">
-    <value>1)ws path</value>
-  </data>
-  <data name="&gt;&gt;label16.Name" xml:space="preserve">
-    <value>label16</value>
-  </data>
-  <data name="&gt;&gt;label16.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label16.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label16.ZOrder" xml:space="preserve">
-    <value>11</value>
-  </data>
-  <data name="label14.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label14.Location" type="System.Drawing.Point, System.Drawing">
-    <value>464, 94</value>
-  </data>
-  <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
-    <value>215, 12</value>
-  </data>
-  <data name="label14.TabIndex" type="System.Int32, mscorlib">
-    <value>23</value>
-  </data>
-  <data name="label14.Text" xml:space="preserve">
-    <value>1)http host Separated by commas (,)</value>
-  </data>
-  <data name="&gt;&gt;label14.Name" xml:space="preserve">
-    <value>label14</value>
-  </data>
-  <data name="&gt;&gt;label14.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label14.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label14.ZOrder" xml:space="preserve">
-    <value>12</value>
-  </data>
-  <data name="label15.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label15.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 243</value>
-  </data>
-  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>23, 12</value>
-  </data>
-  <data name="label15.TabIndex" type="System.Int32, mscorlib">
-    <value>22</value>
-  </data>
-  <data name="label15.Text" xml:space="preserve">
-    <value>TLS</value>
-  </data>
-  <data name="&gt;&gt;label15.Name" xml:space="preserve">
-    <value>label15</value>
-  </data>
-  <data name="&gt;&gt;label15.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label15.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label15.ZOrder" xml:space="preserve">
-    <value>13</value>
-  </data>
-  <data name="cmbStreamSecurity.Items" xml:space="preserve">
-    <value />
-  </data>
-  <data name="cmbStreamSecurity.Items1" xml:space="preserve">
-    <value>tls</value>
-  </data>
-  <data name="cmbStreamSecurity.Items2" xml:space="preserve">
-    <value>xtls</value>
-  </data>
-  <data name="cmbStreamSecurity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 239</value>
-  </data>
-  <data name="cmbStreamSecurity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 20</value>
-  </data>
-  <data name="cmbStreamSecurity.TabIndex" type="System.Int32, mscorlib">
-    <value>21</value>
-  </data>
-  <data name="&gt;&gt;cmbStreamSecurity.Name" xml:space="preserve">
-    <value>cmbStreamSecurity</value>
-  </data>
-  <data name="&gt;&gt;cmbStreamSecurity.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbStreamSecurity.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;cmbStreamSecurity.ZOrder" xml:space="preserve">
-    <value>14</value>
-  </data>
-  <data name="label12.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
-    <value>282, 68</value>
-  </data>
-  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
-    <value>299, 12</value>
-  </data>
-  <data name="label12.TabIndex" type="System.Int32, mscorlib">
-    <value>20</value>
-  </data>
-  <data name="label12.Text" xml:space="preserve">
-    <value>*tcp or kcp or QUIC camouflage type, default none</value>
-  </data>
-  <data name="&gt;&gt;label12.Name" xml:space="preserve">
-    <value>label12</value>
-  </data>
-  <data name="&gt;&gt;label12.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label12.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label12.ZOrder" xml:space="preserve">
-    <value>15</value>
-  </data>
-  <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
-    <value>158, 100</value>
-  </data>
-  <data name="txtRequestHost.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
-    <value>300, 53</value>
-  </data>
-  <data name="txtRequestHost.TabIndex" type="System.Int32, mscorlib">
-    <value>16</value>
-  </data>
-  <data name="&gt;&gt;txtRequestHost.Name" xml:space="preserve">
-    <value>txtRequestHost</value>
-  </data>
-  <data name="&gt;&gt;txtRequestHost.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtRequestHost.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;txtRequestHost.ZOrder" xml:space="preserve">
-    <value>16</value>
-  </data>
-  <data name="label11.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label11.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 68</value>
-  </data>
-  <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 12</value>
-  </data>
-  <data name="label11.TabIndex" type="System.Int32, mscorlib">
-    <value>19</value>
-  </data>
-  <data name="label11.Text" xml:space="preserve">
-    <value>Camouflage type</value>
-  </data>
-  <data name="&gt;&gt;label11.Name" xml:space="preserve">
-    <value>label11</value>
-  </data>
-  <data name="&gt;&gt;label11.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label11.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label11.ZOrder" xml:space="preserve">
-    <value>17</value>
-  </data>
-  <data name="label10.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label10.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 100</value>
-  </data>
-  <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 12</value>
-  </data>
-  <data name="label10.TabIndex" type="System.Int32, mscorlib">
-    <value>17</value>
-  </data>
-  <data name="label10.Text" xml:space="preserve">
-    <value>Camouflage domain(host)</value>
-  </data>
-  <data name="&gt;&gt;label10.Name" xml:space="preserve">
-    <value>label10</value>
-  </data>
-  <data name="&gt;&gt;label10.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label10.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label10.ZOrder" xml:space="preserve">
-    <value>18</value>
-  </data>
-  <data name="cmbHeaderType.Items" xml:space="preserve">
-    <value>none</value>
-  </data>
-  <data name="cmbHeaderType.Items1" xml:space="preserve">
-    <value>http</value>
-  </data>
-  <data name="cmbHeaderType.Items2" xml:space="preserve">
-    <value>srtp</value>
-  </data>
-  <data name="cmbHeaderType.Items3" xml:space="preserve">
-    <value>utp</value>
-  </data>
-  <data name="cmbHeaderType.Items4" xml:space="preserve">
-    <value>wechat-video</value>
-  </data>
-  <data name="cmbHeaderType.Items5" xml:space="preserve">
-    <value>dtls</value>
-  </data>
-  <data name="cmbHeaderType.Items6" xml:space="preserve">
-    <value>wireguard</value>
-  </data>
-  <data name="cmbHeaderType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 64</value>
-  </data>
-  <data name="cmbHeaderType.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 20</value>
-  </data>
-  <data name="cmbHeaderType.TabIndex" type="System.Int32, mscorlib">
-    <value>18</value>
-  </data>
-  <data name="&gt;&gt;cmbHeaderType.Name" xml:space="preserve">
-    <value>cmbHeaderType</value>
-  </data>
-  <data name="&gt;&gt;cmbHeaderType.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbHeaderType.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;cmbHeaderType.ZOrder" xml:space="preserve">
-    <value>19</value>
-  </data>
-  <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
-  <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 215</value>
-  </data>
-  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>723, 281</value>
-  </data>
-  <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
-    <value>21</value>
-  </data>
-  <data name="groupBox2.Text" xml:space="preserve">
-    <value>Transport</value>
-  </data>
-  <data name="&gt;&gt;groupBox2.Name" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;groupBox2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;groupBox2.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;groupBox2.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
   <data name="label8.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -937,7 +289,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>4</value>
   </data>
   <data name="cmbSecurity.Items" xml:space="preserve">
     <value>none</value>
@@ -949,7 +301,7 @@
     <value>211, 20</value>
   </data>
   <data name="cmbSecurity.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+    <value>4</value>
   </data>
   <data name="&gt;&gt;cmbSecurity.Name" xml:space="preserve">
     <value>cmbSecurity</value>
@@ -961,7 +313,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cmbSecurity.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>5</value>
   </data>
   <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 185</value>
@@ -970,7 +322,7 @@
     <value>211, 21</value>
   </data>
   <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+    <value>5</value>
   </data>
   <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
     <value>txtRemarks</value>
@@ -982,7 +334,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>6</value>
   </data>
   <data name="label6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1009,7 +361,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>7</value>
   </data>
   <data name="label5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1036,7 +388,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>8</value>
   </data>
   <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 91</value>
@@ -1045,7 +397,7 @@
     <value>278, 21</value>
   </data>
   <data name="txtId.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+    <value>2</value>
   </data>
   <data name="&gt;&gt;txtId.Name" xml:space="preserve">
     <value>txtId</value>
@@ -1057,7 +409,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtId.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>9</value>
   </data>
   <data name="label3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1084,7 +436,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>10</value>
   </data>
   <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 59</value>
@@ -1093,7 +445,7 @@
     <value>143, 21</value>
   </data>
   <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;txtPort.Name" xml:space="preserve">
     <value>txtPort</value>
@@ -1105,7 +457,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>11</value>
   </data>
   <data name="label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1132,7 +484,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>12</value>
   </data>
   <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 27</value>
@@ -1141,7 +493,7 @@
     <value>359, 21</value>
   </data>
   <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>0</value>
   </data>
   <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
     <value>txtAddress</value>
@@ -1153,7 +505,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>13</value>
   </data>
   <data name="label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1180,16 +532,16 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>14</value>
   </data>
   <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
   <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 35</value>
+    <value>0, 10</value>
   </data>
   <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>729, 499</value>
+    <value>729, 221</value>
   </data>
   <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -1237,7 +589,7 @@
     <value>Bottom</value>
   </data>
   <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 534</value>
+    <value>0, 461</value>
   </data>
   <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
     <value>729, 60</value>
@@ -1255,13 +607,13 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Top</value>
   </data>
   <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 25</value>
+    <value>0, 0</value>
   </data>
   <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
     <value>729, 10</value>
@@ -1279,58 +631,55 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
-  <metadata name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <data name="MenuItemImportClient.Size" type="System.Drawing.Size, System.Drawing">
-    <value>237, 22</value>
+  <data name="transportControl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
   </data>
-  <data name="MenuItemImportClient.Text" xml:space="preserve">
-    <value>Import client configuration</value>
-  </data>
-  <data name="MenuItemImportServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>237, 22</value>
-  </data>
-  <data name="MenuItemImportServer.Text" xml:space="preserve">
-    <value>Import server configuration</value>
-  </data>
-  <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>234, 6</value>
-  </data>
-  <data name="MenuItemImportClipboard.Size" type="System.Drawing.Size, System.Drawing">
-    <value>237, 22</value>
-  </data>
-  <data name="MenuItemImportClipboard.Text" xml:space="preserve">
-    <value>Import URL from clipboard</value>
-  </data>
-  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>162, 21</value>
-  </data>
-  <data name="MenuItem1.Text" xml:space="preserve">
-    <value>Import configuration file</value>
-  </data>
-  <data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="transportControl.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
-  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>729, 25</value>
+  <data name="transportControl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>729, 230</value>
   </data>
-  <data name="menuServer.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
+  <data name="transportControl.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
   </data>
-  <data name="&gt;&gt;menuServer.Name" xml:space="preserve">
-    <value>menuServer</value>
+  <data name="&gt;&gt;transportControl.Name" xml:space="preserve">
+    <value>transportControl</value>
   </data>
-  <data name="&gt;&gt;menuServer.Type" xml:space="preserve">
-    <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;transportControl.Type" xml:space="preserve">
+    <value>v2rayN.Forms.ServerTransportControl, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
-  <data name="&gt;&gt;menuServer.Parent" xml:space="preserve">
+  <data name="&gt;&gt;transportControl.Parent" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="&gt;&gt;transportControl.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="panel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Bottom</value>
+  </data>
+  <data name="panel3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 231</value>
+  </data>
+  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>729, 230</value>
+  </data>
+  <data name="panel3.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="&gt;&gt;panel3.Name" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="&gt;&gt;panel3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;panel3.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;menuServer.ZOrder" xml:space="preserve">
-    <value>3</value>
+  <data name="&gt;&gt;panel3.ZOrder" xml:space="preserve">
+    <value>1</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
@@ -1342,41 +691,11 @@
     <value>6, 12</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>729, 594</value>
+    <value>729, 521</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Edit or add a [VLESS] server</value>
   </data>
-  <data name="&gt;&gt;MenuItem1.Name" xml:space="preserve">
-    <value>MenuItem1</value>
-  </data>
-  <data name="&gt;&gt;MenuItem1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;MenuItemImportClient.Name" xml:space="preserve">
-    <value>MenuItemImportClient</value>
-  </data>
-  <data name="&gt;&gt;MenuItemImportClient.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;MenuItemImportServer.Name" xml:space="preserve">
-    <value>MenuItemImportServer</value>
-  </data>
-  <data name="&gt;&gt;MenuItemImportServer.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;toolStripSeparator1.Name" xml:space="preserve">
-    <value>toolStripSeparator1</value>
-  </data>
-  <data name="&gt;&gt;toolStripSeparator1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripSeparator, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;MenuItemImportClipboard.Name" xml:space="preserve">
-    <value>MenuItemImportClipboard</value>
-  </data>
-  <data name="&gt;&gt;MenuItemImportClipboard.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>AddServer5Form</value>
   </data>

v2rayN/v2rayN/Forms/AddServer5Form.zh-Hans.resx

@@ -120,9 +120,6 @@
   <data name="btnClose.Text" xml:space="preserve">
     <value>取消(&amp;C)</value>
   </data>
-  <data name="groupBox1.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="cmbFlow.Size" type="System.Drawing.Size, System.Drawing">
     <value>220, 20</value>
@@ -139,126 +136,6 @@
   <data name="label13.Text" xml:space="preserve">
     <value>*手填,方便识别管理</value>
   </data>
-  <data name="groupBox2.Text" xml:space="preserve">
-    <value>底层传输方式(transport)</value>
-  </data>
-  <data name="label24.Size" type="System.Drawing.Size, System.Drawing">
-    <value>149, 12</value>
-  </data>
-  <data name="label24.Text" xml:space="preserve">
-    <value>3)QUIC 加密密钥/Kcp seed</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>167, 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="label9.Location" type="System.Drawing.Point, System.Drawing">
-    <value>353, 36</value>
-  </data>
-  <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 12</value>
-  </data>
-  <data name="label9.Text" xml:space="preserve">
-    <value>*默认tcp,选错会无法连接</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="txtPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 168</value>
-  </data>
-  <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 32</value>
-  </data>
-  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
-    <value>220, 20</value>
-  </data>
-  <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 36</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="label19.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 168</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>
-  <data name="label14.Text" xml:space="preserve">
-    <value>1)http host中间逗号(,)隔开</value>
-  </data>
-  <data name="label15.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 241</value>
-  </data>
-  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>107, 12</value>
-  </data>
-  <data name="label15.Text" xml:space="preserve">
-    <value>底层传输安全(tls)</value>
-  </data>
-  <data name="cmbStreamSecurity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 237</value>
-  </data>
-  <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
-    <value>282, 71</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>
-  <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 102</value>
-  </data>
-  <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
-    <value>334, 51</value>
-  </data>
-  <data name="label11.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 71</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="label10.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 102</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="cmbHeaderType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 67</value>
-  </data>
   <data name="label8.Location" type="System.Drawing.Point, System.Drawing">
     <value>353, 158</value>
   </data>
@@ -304,40 +181,12 @@
   <data name="label1.Text" xml:space="preserve">
     <value>地址(address)</value>
   </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>服务器</value>
+  </data>
   <data name="btnOK.Text" xml:space="preserve">
     <value>确定(&amp;O)</value>
   </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="MenuItem1.Enabled" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>92, 21</value>
-  </data>
-  <data name="MenuItem1.Text" xml:space="preserve">
-    <value>导入配置文件</value>
-  </data>
-  <data name="MenuItemImportClient.Size" type="System.Drawing.Size, System.Drawing">
-    <value>171, 22</value>
-  </data>
-  <data name="MenuItemImportClient.Text" xml:space="preserve">
-    <value>导入客户端配置</value>
-  </data>
-  <data name="MenuItemImportServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>171, 22</value>
-  </data>
-  <data name="MenuItemImportServer.Text" xml:space="preserve">
-    <value>导入服务端配置</value>
-  </data>
-  <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>168, 6</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="$this.Text" xml:space="preserve">
     <value>编辑或添加[VLESS]服务器</value>
   </data>

v2rayN/v2rayN/Forms/AddServer6Form.Designer.cs

@@ -31,8 +31,8 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(AddServer6Form));
             this.btnClose = new System.Windows.Forms.Button();
             this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.cmbFlow = new System.Windows.Forms.ComboBox();
             this.label4 = new System.Windows.Forms.Label();
-            this.txtRequestHost = new System.Windows.Forms.TextBox();
             this.label13 = new System.Windows.Forms.Label();
             this.txtRemarks = new System.Windows.Forms.TextBox();
             this.label6 = new System.Windows.Forms.Label();
@@ -42,26 +42,28 @@
             this.label2 = new System.Windows.Forms.Label();
             this.txtAddress = new System.Windows.Forms.TextBox();
             this.label1 = new System.Windows.Forms.Label();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.transportControl = new v2rayN.Forms.ServerTransportControl();
             this.panel2 = new System.Windows.Forms.Panel();
             this.btnOK = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
             this.groupBox1.SuspendLayout();
+            this.panel3.SuspendLayout();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
             // 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);
             // 
             // groupBox1
             // 
-            resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Controls.Add(this.cmbFlow);
             this.groupBox1.Controls.Add(this.label4);
-            this.groupBox1.Controls.Add(this.txtRequestHost);
             this.groupBox1.Controls.Add(this.label13);
             this.groupBox1.Controls.Add(this.txtRemarks);
             this.groupBox1.Controls.Add(this.label6);
@@ -71,19 +73,27 @@
             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;
             // 
+            // cmbFlow
+            // 
+            this.cmbFlow.FormattingEnabled = true;
+            this.cmbFlow.Items.AddRange(new object[] {
+            resources.GetString("cmbFlow.Items"),
+            resources.GetString("cmbFlow.Items1"),
+            resources.GetString("cmbFlow.Items2"),
+            resources.GetString("cmbFlow.Items3"),
+            resources.GetString("cmbFlow.Items4")});
+            resources.ApplyResources(this.cmbFlow, "cmbFlow");
+            this.cmbFlow.Name = "cmbFlow";
+            // 
             // label4
             // 
             resources.ApplyResources(this.label4, "label4");
             this.label4.Name = "label4";
             // 
-            // txtRequestHost
-            // 
-            resources.ApplyResources(this.txtRequestHost, "txtRequestHost");
-            this.txtRequestHost.Name = "txtRequestHost";
-            // 
             // label13
             // 
             resources.ApplyResources(this.label13, "label13");
@@ -129,11 +139,23 @@
             resources.ApplyResources(this.label1, "label1");
             this.label1.Name = "label1";
             // 
+            // panel3
+            // 
+            this.panel3.Controls.Add(this.transportControl);
+            resources.ApplyResources(this.panel3, "panel3");
+            this.panel3.Name = "panel3";
+            // 
+            // transportControl
+            // 
+            this.transportControl.AllowXtls = false;
+            resources.ApplyResources(this.transportControl, "transportControl");
+            this.transportControl.Name = "transportControl";
+            // 
             // 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
@@ -154,6 +176,7 @@
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnClose;
             this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.panel3);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
@@ -162,6 +185,7 @@
             this.Load += new System.EventHandler(this.AddServer6Form_Load);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
+            this.panel3.ResumeLayout(false);
             this.panel2.ResumeLayout(false);
             this.ResumeLayout(false);
 
@@ -183,7 +207,9 @@
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label label13;
+        private System.Windows.Forms.Panel panel3;
+        private ServerTransportControl transportControl;
+        private System.Windows.Forms.ComboBox cmbFlow;
         private System.Windows.Forms.Label label4;
-        private System.Windows.Forms.TextBox txtRequestHost;
     }
 }

v2rayN/v2rayN/Forms/AddServer6Form.cs

@@ -14,6 +14,7 @@ namespace v2rayN.Forms
 
         private void AddServer6Form_Load(object sender, EventArgs e)
         {
+            transportControl.AllowXtls = true;
             if (EditIndex >= 0)
             {
                 vmessItem = config.vmess[EditIndex];
@@ -31,12 +32,13 @@ namespace v2rayN.Forms
         /// </summary>
         private void BindingServer()
         {
-
             txtAddress.Text = vmessItem.address;
             txtPort.Text = vmessItem.port.ToString();
             txtId.Text = vmessItem.id;
-            txtRequestHost.Text = vmessItem.requestHost;
+            cmbFlow.Text = vmessItem.flow;
             txtRemarks.Text = vmessItem.remarks;
+
+            transportControl.BindingServer(vmessItem);
         }
 
 
@@ -48,8 +50,10 @@ namespace v2rayN.Forms
             txtAddress.Text = "";
             txtPort.Text = "";
             txtId.Text = "";
-            txtRequestHost.Text = "";
-            txtRemarks.Text = "";
+            cmbFlow.Text = "";
+            txtRemarks.Text = ""; 
+
+            transportControl.ClearServer(vmessItem);
         }
 
         private void btnOK_Click(object sender, EventArgs e)
@@ -57,7 +61,7 @@ namespace v2rayN.Forms
             string address = txtAddress.Text;
             string port = txtPort.Text;
             string id = txtId.Text;
-            string requestHost = txtRequestHost.Text;
+            string flow = cmbFlow.Text;
             string remarks = txtRemarks.Text;
 
             if (Utils.IsNullOrEmpty(address))
@@ -74,12 +78,14 @@ namespace v2rayN.Forms
             {
                 UI.Show(UIRes.I18N("FillPassword"));
                 return;
-            } 
+            }
+
+            transportControl.EndBindingServer();
 
             vmessItem.address = address;
             vmessItem.port = Utils.ToInt(port);
             vmessItem.id = id;
-            vmessItem.requestHost = requestHost.Replace(" ", "");
+            vmessItem.flow = flow;
             vmessItem.remarks = remarks;
 
             if (ConfigHandler.AddTrojanServer(ref config, vmessItem, EditIndex) == 0)

v2rayN/v2rayN/Forms/AddServer6Form.zh-Hans.resx

@@ -120,16 +120,16 @@
   <data name="btnClose.Text" xml:space="preserve">
     <value>取消(&amp;C)</value>
   </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>服务器</value>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
   </data>
   <data name="label4.Text" xml:space="preserve">
-    <value>域名(SNI)</value>
+    <value>流控(flow)</value>
   </data>
   <data name="label13.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="label6.Size" type="System.Drawing.Size, System.Drawing">
     <value>83, 12</value>
   </data>
@@ -154,9 +154,185 @@
   <data name="label1.Text" xml:space="preserve">
     <value>服务器地址</value>
   </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>服务器</value>
+  </data>
   <data name="btnOK.Text" xml:space="preserve">
     <value>确定(&amp;O)</value>
   </data>
+  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAABAAYAICAQAAAAAADoAgAAZgAAABAQEAAAAAAAKAEAAE4DAAAgIAAAAQAIAKgIAAB2BAAAEBAAAAEA
+        CABoBQAAHg0AACAgAAABACAAqBAAAIYSAAAQEAAAAQAgAGgEAAAuIwAAKAAAACAAAABAAAAAAQAEAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACAgACAAAAAgACAAICAAACAgIAAwMDAAAAA
+        /wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIiIoiI
+        iIiIiIiIiIiIiIiIiIiCIigiIiIozMzMzMzMyCIogiIoIiIiKM7m5ubm5sgiKIIiKCIiIijObm5ubm7I
+        IiiCIigiIiIozubm5ubmyCIogiIoIiIiKM5ubm5ubsgiKIIiKCIiIijO5ubm5ubIIiiIiIiIiIiIzm5u
+        bm5uyCIogRERERERGM7u7u7u7sgiKIHZWVlZWRjMzMzMzMzIIiiB1ZWVlZUYiIiIiIiIiIiIgdlZWVlZ
+        GDMzMzMzMzMzOIHVlZWVlRg/uLi4uLi4uDiB2VlZWVkYP7uLi4uLi4s4gdWVlZWVGD+4uLi4uLi4OIHZ
+        WVlZWRg/u4uLi4uLiziB1ZWVlZUYP7i4uLi4uLg4gdlZWVlZGD+7i4uLi4uLOIHVlZWVlRg/uLi4uLi4
+        uDiB3d3d3d0YP7uLi4uLi4s4gRERERERGD+4uLi4uLi4OIiIiIiIiIg/u4uLi4uLiziCIiIiIiIoP7i4
+        uLi4uLg4giIiIiIiKD+7i4uLi4uLOIIiIiIiIig/uLi4uLi4uDiCIiIiIiIoP7u7u7u7u7s4giIiIiIi
+        KD//////////OIIiIiIiIigzMzMzMzMzMziIiIiIiIiIiIiIiIiIiIiIIiIiIiIiIiIiIiIiIiIiIv//
+        ////////AAAAAHv4AA57+AAOe/gADnv4AA57+AAOe/gADgAAAA4AAAAOAAAADgAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAH/4AAB/+AAAf/gAAH/4AAB/+AAAf/gAAAAA
+        AAD/////KAAAABAAAAAgAAAAAQAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAACA
+        gACAAAAAgACAAICAAACAgIAAwMDAAAAA/wAA/wAAAP//AP8AAAD/AP8A//8AAP///wAiIiIiIiIiIoiI
+        iIiIiIiIgigijMzMyCiCKCKM5mbIKIiIiIzu7sgogRERjMzMyCiB2ZGIiIiIiIHZkYMzMzM4gdmRg/u7
+        uziB3dGD+7u7OIEREYP7u7s4iIiIg/u7uziCIiKD+7u7OIIiIoP///84giIigzMzMziIiIiIiIiIiP//
+        KCIAACjObALm5mwCIigAAoiIAAKIzgAAbm4AACIoAAAREQAAGM4AAO7uAAAiKHwAWVl8ABjMfADMzAAA
+        IigoAAAAIAAAAEAAAAABAAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAgAAAAICAAIAA
+        AACAAIAAgIAAAICAgADA3MAA8MqmAKo/KgD/PyoAAF8qAFVfKgCqXyoA/18qAAB/KgBVfyoAqn8qAP9/
+        KgAAnyoAVZ8qAKqfKgD/nyoAAL8qAFW/KgCqvyoA/78qAADfKgBV3yoAqt8qAP/fKgAA/yoAVf8qAKr/
+        KgD//yoAAABVAFUAVQCqAFUA/wBVAAAfVQBVH1UAqh9VAP8fVQAAP1UAVT9VAKo/VQD/P1UAAF9VAFVf
+        VQCqX1UA/19VAAB/VQBVf1UAqn9VAP9/VQAAn1UAVZ9VAKqfVQD/n1UAAL9VAFW/VQCqv1UA/79VAADf
+        VQBV31UAqt9VAP/fVQAA/1UAVf9VAKr/VQD//1UAAAB/AFUAfwCqAH8A/wB/AAAffwBVH38Aqh9/AP8f
+        fwAAP38AVT9/AKo/fwD/P38AAF9/AFVffwCqX38A/19/AAB/fwBVf38Aqn9/AP9/fwAAn38AVZ9/AKqf
+        fwD/n38AAL9/AFW/fwCqv38A/79/AADffwBV338Aqt9/AP/ffwAA/38AVf9/AKr/fwD//38AAACqAFUA
+        qgCqAKoA/wCqAAAfqgBVH6oAqh+qAP8fqgAAP6oAVT+qAKo/qgD/P6oAAF+qAFVfqgCqX6oA/1+qAAB/
+        qgBVf6oAqn+qAP9/qgAAn6oAVZ+qAKqfqgD/n6oAAL+qAFW/qgCqv6oA/7+qAADfqgBV36oAqt+qAP/f
+        qgAA/6oAVf+qAKr/qgD//6oAAADUAFUA1ACqANQA/wDUAAAf1ABVH9QAqh/UAP8f1AAAP9QAVT/UAKo/
+        1AD/P9QAAF/UAFVf1ACqX9QA/1/UAAB/1ABVf9QAqn/UAP9/1AAAn9QAVZ/UAKqf1AD/n9QAAL/UAFW/
+        1ACqv9QA/7/UAADf1ABV39QAqt/UAP/f1AAA/9QAVf/UAKr/1AD//9QAVQD/AKoA/wAAH/8AVR//AKof
+        /wD/H/8AAD//AFU//wCqP/8A/z//AABf/wBVX/8Aql//AP9f/wAAf/8AVX//AKp//wD/f/8AAJ//AFWf
+        /wCqn/8A/5//AAC//wBVv/8Aqr//AP+//wAA3/8AVd//AKrf/wD/3/8AVf//AKr//wD/zMwA/8z/AP//
+        MwD//2YA//+ZAP//zAAAfwAAVX8AAKp/AAD/fwAAAJ8AAFWfAACqnwAA/58AAAC/AABVvwAAqr8AAP+/
+        AAAA3wAAVd8AAKrfAAD/3wAAVf8AAKr/AAAAACoAVQAqAKoAKgD/ACoAAB8qAFUfKgCqHyoA/x8qAAA/
+        KgBVPyoA8Pv/AKSgoACAgIAAAAD/AAD/AAAA//8A/wAAAAAAAAD//wAA////AP39/f39/f39/f39/f39
+        /f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39
+        /f39/f39/f39/f39/f39/f39/f39/f39qoYIqoYIhqoIqgiqCaoIqgiqhqqGhoYIhoYIqv39/f0I/f39
+        /ar9/f39/YY2Ng4yDg4ODgoOCgoKCgqG/f39/Yb9/f39CP39/f39qjY7Ozs3Nzc3NjMSMjIOCqr9/f39
+        qv39/f2G/f39/f0IN19fOzs3Nzc3NjcODg4KCP39/f0I/f39/ar9/f39/ao6X19fXzs7Ozc3NzY3NgqG
+        /f39/Yb9/f39CP39/f39hl9jY19jX187Ozs7Nzc3Dqr9/f39qv39/f2G/f39/f0IOodjh19jX19fXztf
+        OzcOCP39/f0ICAmqCAiqCKoICapfCYdjh2ODY19fXzs7Ow6q/f39/QhITEwoSCUoKSQoqmMJCYcJCWNj
+        Y2NfY19fNgj9/f39qkyZmZmYmJRwlCmqX19fXl9fX186WzY3Njc2gv39/f0JcJ2dmZmZlJmUJAmqCaoJ
+        hggIqggICKoIqggI/f39/YZwnp2dnZmZmJVMqnx8fHx8fFR8VHhUVFRUVKr9/f39CHChoZ2dnZ2ZmUwJ
+        fKSkxqSkxqSkpKSkpKBUCP39/f2qcKLDoqGdnZ2ZTKp8ysakxqSkxqSkxqSkpFSq/f39/QiUpqbDoqHE
+        nZ1Mq3ykqMakyqSkxqSkpKSkVAj9/f39hpTIyKbHoqGhoXAIfMrLpMqkxqSkxqTGpKRUqv39/f0IlMym
+        yKbIpcShcAh8y6jKpMqkxsqkpKSkxlQI/f39/aqUzMzMyKbIpqJwqnzLy8qpxsqkpMakxqSkeAj9/f39
+        CJSUlJSUlJSUlJQJgMupy8qpysqkyqSkxqRUqv39/f2GCKoIqgiqCKoIhgigrcvPqcuoy8qkxsqkxnyG
+        /f39/ar9/f39/f39/f39qnzPz6nLy8uoyqnKpKTKVAj9/f39CP39/f39/f39/f0IfNDPz8+py8upyqjG
+        yqR8hv39/f2G/f39/f39/f39/Qik0K7P0M+ty8vLy6jKpXyq/f39/ar9/f39/f39/f39CHzQ09Ctz8/P
+        qcupy6jKeAj9/f39CP39/f39/f39/f2qoNPQ0NPQ0M/Qz8vLy6l8CP39/f2G/f39/f39/f39/QmkfKR8
+        oHx8fHx8fHx8fHyG/f39/aoIqgiqCKoIqgiqCKoIqgiqCKoIqgiqCKoIqgj9/f39/f39/f39/f39/f39
+        /f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f39/f3/////////////
+        ///AAAAD3vgAA974AAPe+AAD3vgAA974AAPe+AADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAADwAAAA8AA
+        AAPAAAADwAAAA8AAAAPAAAADwAAAA9/4AAPf+AAD3/gAA9/4AAPf+AAD3/gAA8AAAAP//////////ygA
+        AAAQAAAAIAAAAAEACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAACAAAAAgIAAgAAAAIAA
+        gACAgAAAgICAAMDcwADwyqYAqj8qAP8/KgAAXyoAVV8qAKpfKgD/XyoAAH8qAFV/KgCqfyoA/38qAACf
+        KgBVnyoAqp8qAP+fKgAAvyoAVb8qAKq/KgD/vyoAAN8qAFXfKgCq3yoA/98qAAD/KgBV/yoAqv8qAP//
+        KgAAAFUAVQBVAKoAVQD/AFUAAB9VAFUfVQCqH1UA/x9VAAA/VQBVP1UAqj9VAP8/VQAAX1UAVV9VAKpf
+        VQD/X1UAAH9VAFV/VQCqf1UA/39VAACfVQBVn1UAqp9VAP+fVQAAv1UAVb9VAKq/VQD/v1UAAN9VAFXf
+        VQCq31UA/99VAAD/VQBV/1UAqv9VAP//VQAAAH8AVQB/AKoAfwD/AH8AAB9/AFUffwCqH38A/x9/AAA/
+        fwBVP38Aqj9/AP8/fwAAX38AVV9/AKpffwD/X38AAH9/AFV/fwCqf38A/39/AACffwBVn38Aqp9/AP+f
+        fwAAv38AVb9/AKq/fwD/v38AAN9/AFXffwCq338A/99/AAD/fwBV/38Aqv9/AP//fwAAAKoAVQCqAKoA
+        qgD/AKoAAB+qAFUfqgCqH6oA/x+qAAA/qgBVP6oAqj+qAP8/qgAAX6oAVV+qAKpfqgD/X6oAAH+qAFV/
+        qgCqf6oA/3+qAACfqgBVn6oAqp+qAP+fqgAAv6oAVb+qAKq/qgD/v6oAAN+qAFXfqgCq36oA/9+qAAD/
+        qgBV/6oAqv+qAP//qgAAANQAVQDUAKoA1AD/ANQAAB/UAFUf1ACqH9QA/x/UAAA/1ABVP9QAqj/UAP8/
+        1AAAX9QAVV/UAKpf1AD/X9QAAH/UAFV/1ACqf9QA/3/UAACf1ABVn9QAqp/UAP+f1AAAv9QAVb/UAKq/
+        1AD/v9QAAN/UAFXf1ACq39QA/9/UAAD/1ABV/9QAqv/UAP//1ABVAP8AqgD/AAAf/wBVH/8Aqh//AP8f
+        /wAAP/8AVT//AKo//wD/P/8AAF//AFVf/wCqX/8A/1//AAB//wBVf/8Aqn//AP9//wAAn/8AVZ//AKqf
+        /wD/n/8AAL//AFW//wCqv/8A/7//AADf/wBV3/8Aqt//AP/f/wBV//8Aqv//AP/MzAD/zP8A//8zAP//
+        ZgD//5kA///MAAB/AABVfwAAqn8AAP9/AAAAnwAAVZ8AAKqfAAD/nwAAAL8AAFW/AACqvwAA/78AAADf
+        AABV3wAAqt8AAP/fAABV/wAAqv8AAAAAKgBVACoAqgAqAP8AKgAAHyoAVR8qAKofKgD/HyoAAD8qAFU/
+        KgDw+/8ApKCgAICAgAAAAP8AAP8AAAD//wD/AAAAAAAAAP//AAD///8A/f39/f39/f39/f39/f39/f0I
+        hgiqCKoICKoICKaGCP39qv39hv2GNg4ODjII/ar9/Yb9/ar9qjdjXzsOCP2G/f0IhquGCAleCWNfNob9
+        qv39qkxMTEgIX19fX18I/Qj9/QhwnZlMqoYIqggIqgiG/f2qcKadcAl8fFQDVFQDqv39CHDMpnCqfMvL
+        ysrKVAj9/QiUlHBwCYDPy8/LylSG/f2GqoYIqgig0M/Py8t8qv39CP39/f2GpNDQ0M/PfAn9/ar9/f39
+        qqT20NDQ0Hyq/f2G/f39/QmkpKSloKR8CP39CKoIhgiqCIYIqgiGCKr9/f39/f39/f39/f39/f39/f//
+        hv2AAf0ItAX9/bQFX2OABWNfgAU7O4ABNzeAAf39gAGq/YAB/YaAAf39vAE6h7wBX2O8AV9fgAE7N///
+        /f0oAAAAIAAAAEAAAAABACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAADCv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/
+        wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/
+        wf/Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wAAAAAAAAAAAAAAAAAA
+        AAAAAAAAwr/B/7Z3Sf+zckT/rm0//6toO/+nYjb/pF4y/6BZLv+dVCr/mlEn/5dNI/+VSiH/kkce/5FE
+        HP+RRBz/kUUb/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/AAAAAAAA
+        AAAAAAAAAAAAAAAAAADCv8H/v4JS//+aZv//lWD/+5Bc//WLV//uh1P/54FO/997S//Wdkb/zXBD/8Vr
+        QP+9Zj3/tGI5/65dN/+RRRz/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/AAAAAAAAAAAAAAAAAAAAAMK/
+        wf8AAAAAAAAAAAAAAAAAAAAAAAAAAMK/wf/GjFv//6Rz//+fbf//m2f//5Zh//yRXf/3jVj/8IhV/+mD
+        UP/hfUz/2HhI/9ByRP/HbED/v2c9/5VJIf/Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8AAAAAAAAAAAAA
+        AAAAAAAAwr/B/wAAAAAAAAAAAAAAAAAAAAAAAAAAwr/B/86WZP//r4L//6p7//+mdf//oW7//5xo//+X
+        Yv/9kl7/+I5a//KJVf/rhFH/4n5N/9t4SP/Sc0X/mlEm/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wAA
+        AAAAAAAAAAAAAAAAAADCv8H/AAAAAAAAAAAAAAAAAAAAAAAAAADCv8H/1J9s//+4kf//tIv//6+E//+r
+        ff//p3f//6Jw//+eav//mWT//pRf//qQWv/0i1b/7IVS/+V/Tv+gWC7/wr/B/wAAAAAAAAAAAAAAAAAA
+        AADCv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8AAAAAAAAAAAAAAAAAAAAAAAAAAMK/wf/apnP//7+d//+7
+        mP//uJL//7WM//+whv//rH///6d4//+jcf//n2v//5ll//+VYP/6kVv/9YxY/6diN//Cv8H/AAAAAAAA
+        AAAAAAAAAAAAAMK/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/96t
+        eP//wqL//8Gi//+/nv//vJn//7mT//+2jv//sYj//66A//+pev//pHP//6Bt//+bZ///l2L/r20//8K/
+        wf8AAAAAAAAAAAAAAAAAAAAAwr/B/xYXev8XF3b/GBVx/xkUbf8ZFGr/GhNm/xoSY/8bEV//HBFd/xwQ
+        W//Cv8H/4K96///Cov//wqL//8Ki///Cov//wJ///72b//+6lf//t4///7KJ//+ugv//qnv//6V0//+h
+        bv+3d0n/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/FRqE/0dN1v8/RNL/Nz3Q/y40zv8nLcz/ISfK/xwh
+        yf8WHMf/GxJh/8K/wf/gr3r/4K96/+Cvev/gr3r/3614/9yqdf/apnL/16Nw/9Sea//Rmmj/zZZk/8qR
+        X//GjFz/w4dW/7+CUv/Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8SHZD/WF3a/05U1/9FS9X/PUPS/zU7
+        0P8uM83/JyzL/yAmyf8aFGn/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/
+        wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/xAfnP9obt7/YGTc/1Zb
+        2f9NU9f/RUrU/ztB0v80OdD/LDHO/xgWcv/Cv8H/Dn+n/w18pP8MeqH/DHie/wt1m/8Kc5j/CXGV/wlv
+        k/8JbJD/CGqN/wdpi/8HZ4j/BmWH/wZkhf8GYoP/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/DiKp/3l+
+        4/9vdeH/Zmze/11i2/9UWtn/S1HW/0NI1P86P9H/Fhh9/8K/wf8Ogar/Barp/wGo6P8Apef/AKPm/wCi
+        5P8An+L/AJ7h/wCd3/8AnN7/AJnc/wCY2/8AmNn/AJbX/wZjhP/Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/
+        wf8MJbX/iI7n/4CF5v93fOP/bnPg/2Vr3f9bYdv/UljY/0lP1v8UGoj/wr/B/w+Erf8Lrur/Bqvq/wOo
+        6f8Apuf/AKTm/wCi5f8AoOT/AJ/i/wCd4f8AnN//AJrd/wCZ2/8AmNr/BmWH/8K/wf8AAAAAAAAAAAAA
+        AAAAAAAAwr/B/wkowP+WnOz/jpTq/4aL6P9+hOX/dXri/2xx4P9jaN3/WV/b/xEek//Cv8H/EIaw/xay
+        7P8Or+z/Cavr/wWq6v8Bp+j/AKbn/wCj5f8AoeT/AJ/j/wCe4f8AnOD/AJve/wCa3f8HZ4n/wr/B/wAA
+        AAAAAAAAAAAAAAAAAADCv8H/CCrK/6Ko7/+coe7/lZrr/42T6f+Fiub/fIHl/3N54v9rcN//ECGg/8K/
+        wf8QiLP/I7nu/xq07f8Ssez/C63r/war6v8Cqen/AKbo/wCk5v8AouX/AKHk/wCf4f8AneH/AJzf/who
+        i//Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8GLNP/q7Hy/6as8P+hpu//mp/u/5OY6/+LkOj/g4nm/3qA
+        5P8NI6z/wr/B/xCKtv8xvvD/J7rv/x627f8Vsuz/Dq/s/wmr6/8Equn/Aafo/wCl5/8Ao+X/AKHk/wCf
+        4v8AnuH/CGqO/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wUu2/+vtPP/r7Tz/6qv8v+mq/D/oKXv/5me
+        7f+Sl+v/io/p/wsmt//Cv8H/Eo24/0HF8f82wfD/LLzv/yK47v8atO3/EbHs/wut6/8Gq+r/A6np/wCm
+        6P8Apeb/AKLl/wCh5P8IbJD/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/BC/h/wQv3/8FL9z/BS3Z/wYt
+        1v8GLNL/ByvP/wgqy/8IKcb/CSnC/8K/wf8Sjrv/Uszy/0fH8f87w/H/Mb7v/ye67/8et+7/FbPt/w6v
+        6/8IrOv/BKnp/wGo6P8Apef/AKPl/wluk//Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf/Cv8H/wr/B/8K/
+        wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/xKRvf9j0/P/WM/z/0zK8f9BxfH/N8Hw/yy8
+        7/8iuO7/GbTt/xGx7P8Lruv/Bqrq/wOo6f8Apuf/CnGV/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAADCv8H/E5LA/3Ta8/9q1fP/XtHz/1LM
+        8v9Hx/H/O8Pw/zG+7/8nu+//Hrbt/xay7f8Or+v/CKzq/wSq6f8Kc5j/wr/B/wAAAAAAAAAAAAAAAAAA
+        AADCv8H/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAMK/wf8UlMH/hOD1/3rc
+        9f9v2PP/ZNTy/1jO8v9NyvH/Qsbx/zbB8P8svO//I7ju/xm07f8SsOz/C67r/wt2m//Cv8H/AAAAAAAA
+        AAAAAAAAAAAAAMK/wf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwr/B/xSW
+        w/+T5vb/iuL1/3/e9P912vT/adbz/13R8/9SzPL/R8jx/zzD8P8xvvD/J7rv/x627v8Vsuz/C3ie/8K/
+        wf8AAAAAAAAAAAAAAAAAAAAAwr/B/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AADCv8H/FJbG/57r9/+X6Pb/juT1/4Th9f963fX/b9j0/2PT8/9Yz/L/TMrx/0HF8f83wO//LLzv/yK4
+        7v8MeqH/wr/B/wAAAAAAAAAAAAAAAAAAAADCv8H/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAMK/wf8VmMf/qO/3/6Lt9/+b6vb/kub2/4rj9f9/3vX/dNrz/2rV8/9d0fP/Uszy/0fI
+        8f88w/D/Mr7v/w19pP/Cv8H/AAAAAAAAAAAAAAAAAAAAAMK/wf8AAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAwr/B/xWZyP8UmMf/FZfF/xSVw/8TlML/E5K//xOQvf8Sjrv/EYy4/xGK
+        tv8QiLL/D4Ww/w+Erf8Pgar/Dn+n/8K/wf8AAAAAAAAAAAAAAAAAAAAAwr/B/8K/wf/Cv8H/wr/B/8K/
+        wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/
+        wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/8K/wf/Cv8H/wr/B/wAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAP//
+        /////////////8AAAAPe+AAD3vgAA974AAPe+AAD3vgAA974AAPAAAADwAAAA8AAAAPAAAADwAAAA8AA
+        AAPAAAADwAAAA8AAAAPAAAADwAAAA8AAAAPAAAAD3/gAA9/4AAPf+AAD3/gAA9/4AAPf+AADwAAAA///
+        ////////KAAAABAAAAAgAAAAAQAgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwMDA/8DA
+        wP/AwMD/wMDA/8DAwP/AwMD/wMDA/8DAwP/AwMD/wMDA/8DAwP/AwMD/wMDA/8DAwP8AAAAAAAAAAMDA
+        wP8AAAAAAAAAAMDAwP8AAAAAwMDA/8F2R/+9bj//umc6/7diNf+3YjX/wMDA/wAAAADAwMD/AAAAAAAA
+        AADAwMD/AAAAAAAAAADAwMD/AAAAAMDAwP/RkmD//7aP//+ldP/8kl3/vW0//8DAwP8AAAAAwMDA/wAA
+        AAAAAAAAwMDA/8DAwP/AwMD/wMDA/8DAwP/AwMD/3ap2///Cov//to7//6V0/8uJWP/AwMD/AAAAAMDA
+        wP8AAAAAAAAAAMDAwP8THI7/FBqF/xYYfP8XFnP/wMDA/+Cvev/gr3r/4K96/92qdv/ao3D/wMDA/wAA
+        AADAwMD/AAAAAAAAAADAwMD/ECCd/2Fn3P8zOc//FRmC/8DAwP/AwMD/wMDA/8DAwP/AwMD/wMDA/8DA
+        wP/AwMD/wMDA/wAAAAAAAAAAwMDA/w0krP+Pler/YWbd/xIcj//AwMD/DHmf/wpzmP8Ib5L/B2uO/wdq
+        jf8Gao3/B2qN/8DAwP8AAAAAAAAAAMDAwP8KJrv/r7Tz/5CU6v8PIJ//wMDA/w+Dq/87y/z/Kcb8/xrD
+        /P8QwPv/EMD7/wdqjf/AwMD/AAAAAAAAAADAwMD/CCrI/woowP8LJrf/DSSu/8DAwP8Sjbj/Zdb9/0/Q
+        /P88y/v/Kcf7/xrC+/8IbZD/wMDA/wAAAAAAAAAAwMDA/8DAwP/AwMD/wMDA/8DAwP/AwMD/FpfG/43h
+        /f962/3/Zdb8/0/Q/P87zPz/CXSZ/8DAwP8AAAAAAAAAAMDAwP8AAAAAAAAAAAAAAAAAAAAAwMDA/xif
+        z/+u6f7/n+X9/47h/f953P3/ZNb9/w19pP/AwMD/AAAAAAAAAADAwMD/AAAAAAAAAAAAAAAAAAAAAMDA
+        wP8apNX/uez+/7ns/v+u6f7/oOX9/43h/f8Rh7H/wMDA/wAAAAAAAAAAwMDA/wAAAAAAAAAAAAAAAAAA
+        AADAwMD/GqTV/xqk1f8apNX/GaHR/xecy/8WmMb/FJK+/8DAwP8AAAAAAAAAAMDAwP/AwMD/wMDA/8DA
+        wP/AwMD/wMDA/8DAwP/AwMD/wMDA/8DAwP/AwMD/wMDA/8DAwP/AwMD/AAAAAAAAAAAAAAAAAAAAAAAA
+        AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD//wAAgAEAALQF
+        wf+0BQAAgAUAAIAFAACAAQAAgAHB/4ABAACAAQAAgAEAALwBAAC8AQAAvAHB/4ABbP///5H/
+</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>编辑或添加[Trojan]服务器</value>
   </data>

v2rayN/v2rayN/Forms/AddServerForm.Designer.cs

@@ -33,29 +33,6 @@
             this.groupBox1 = new System.Windows.Forms.GroupBox();
             this.btnGUID = new System.Windows.Forms.Button();
             this.label13 = new System.Windows.Forms.Label();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.label24 = new System.Windows.Forms.Label();
-            this.label23 = new System.Windows.Forms.Label();
-            this.panTlsMore = new System.Windows.Forms.Panel();
-            this.label21 = new System.Windows.Forms.Label();
-            this.cmbAllowInsecure = new System.Windows.Forms.ComboBox();
-            this.label9 = new System.Windows.Forms.Label();
-            this.label20 = new System.Windows.Forms.Label();
-            this.txtPath = new System.Windows.Forms.TextBox();
-            this.cmbNetwork = new System.Windows.Forms.ComboBox();
-            this.label7 = new System.Windows.Forms.Label();
-            this.label19 = new System.Windows.Forms.Label();
-            this.label18 = new System.Windows.Forms.Label();
-            this.label17 = new System.Windows.Forms.Label();
-            this.label16 = new System.Windows.Forms.Label();
-            this.label14 = new System.Windows.Forms.Label();
-            this.label15 = new System.Windows.Forms.Label();
-            this.cmbStreamSecurity = new System.Windows.Forms.ComboBox();
-            this.label12 = new System.Windows.Forms.Label();
-            this.txtRequestHost = new System.Windows.Forms.TextBox();
-            this.label11 = new System.Windows.Forms.Label();
-            this.label10 = new System.Windows.Forms.Label();
-            this.cmbHeaderType = new System.Windows.Forms.ComboBox();
             this.label8 = new System.Windows.Forms.Label();
             this.cmbSecurity = new System.Windows.Forms.ComboBox();
             this.txtRemarks = new System.Windows.Forms.TextBox();
@@ -78,11 +55,12 @@
             this.MenuItemImportServer = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
             this.MenuItemImportClipboard = new System.Windows.Forms.ToolStripMenuItem();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.transportControl = new v2rayN.Forms.ServerTransportControl();
             this.groupBox1.SuspendLayout();
-            this.groupBox2.SuspendLayout();
-            this.panTlsMore.SuspendLayout();
             this.panel2.SuspendLayout();
             this.menuServer.SuspendLayout();
+            this.panel3.SuspendLayout();
             this.SuspendLayout();
             // 
             // btnClose
@@ -97,7 +75,6 @@
             // 
             this.groupBox1.Controls.Add(this.btnGUID);
             this.groupBox1.Controls.Add(this.label13);
-            this.groupBox1.Controls.Add(this.groupBox2);
             this.groupBox1.Controls.Add(this.label8);
             this.groupBox1.Controls.Add(this.cmbSecurity);
             this.groupBox1.Controls.Add(this.txtRemarks);
@@ -127,175 +104,6 @@
             resources.ApplyResources(this.label13, "label13");
             this.label13.Name = "label13";
             // 
-            // groupBox2
-            // 
-            this.groupBox2.Controls.Add(this.label24);
-            this.groupBox2.Controls.Add(this.label23);
-            this.groupBox2.Controls.Add(this.panTlsMore);
-            this.groupBox2.Controls.Add(this.label9);
-            this.groupBox2.Controls.Add(this.label20);
-            this.groupBox2.Controls.Add(this.txtPath);
-            this.groupBox2.Controls.Add(this.cmbNetwork);
-            this.groupBox2.Controls.Add(this.label7);
-            this.groupBox2.Controls.Add(this.label19);
-            this.groupBox2.Controls.Add(this.label18);
-            this.groupBox2.Controls.Add(this.label17);
-            this.groupBox2.Controls.Add(this.label16);
-            this.groupBox2.Controls.Add(this.label14);
-            this.groupBox2.Controls.Add(this.label15);
-            this.groupBox2.Controls.Add(this.cmbStreamSecurity);
-            this.groupBox2.Controls.Add(this.label12);
-            this.groupBox2.Controls.Add(this.txtRequestHost);
-            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;
-            // 
-            // label24
-            // 
-            resources.ApplyResources(this.label24, "label24");
-            this.label24.Name = "label24";
-            // 
-            // label23
-            // 
-            resources.ApplyResources(this.label23, "label23");
-            this.label23.Name = "label23";
-            // 
-            // panTlsMore
-            // 
-            this.panTlsMore.Controls.Add(this.label21);
-            this.panTlsMore.Controls.Add(this.cmbAllowInsecure);
-            resources.ApplyResources(this.panTlsMore, "panTlsMore");
-            this.panTlsMore.Name = "panTlsMore";
-            // 
-            // label21
-            // 
-            resources.ApplyResources(this.label21, "label21");
-            this.label21.Name = "label21";
-            // 
-            // 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";
-            // 
-            // label9
-            // 
-            resources.ApplyResources(this.label9, "label9");
-            this.label9.Name = "label9";
-            // 
-            // label20
-            // 
-            resources.ApplyResources(this.label20, "label20");
-            this.label20.Name = "label20";
-            // 
-            // txtPath
-            // 
-            resources.ApplyResources(this.txtPath, "txtPath");
-            this.txtPath.Name = "txtPath";
-            // 
-            // cmbNetwork
-            // 
-            this.cmbNetwork.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbNetwork.FormattingEnabled = true;
-            this.cmbNetwork.Items.AddRange(new object[] {
-            resources.GetString("cmbNetwork.Items"),
-            resources.GetString("cmbNetwork.Items1"),
-            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);
-            // 
-            // label7
-            // 
-            resources.ApplyResources(this.label7, "label7");
-            this.label7.Name = "label7";
-            // 
-            // label19
-            // 
-            resources.ApplyResources(this.label19, "label19");
-            this.label19.Name = "label19";
-            // 
-            // label18
-            // 
-            resources.ApplyResources(this.label18, "label18");
-            this.label18.Name = "label18";
-            // 
-            // label17
-            // 
-            resources.ApplyResources(this.label17, "label17");
-            this.label17.Name = "label17";
-            // 
-            // label16
-            // 
-            resources.ApplyResources(this.label16, "label16");
-            this.label16.Name = "label16";
-            // 
-            // label14
-            // 
-            resources.ApplyResources(this.label14, "label14");
-            this.label14.Name = "label14";
-            // 
-            // label15
-            // 
-            resources.ApplyResources(this.label15, "label15");
-            this.label15.Name = "label15";
-            // 
-            // 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);
-            // 
-            // label12
-            // 
-            resources.ApplyResources(this.label12, "label12");
-            this.label12.Name = "label12";
-            // 
-            // txtRequestHost
-            // 
-            resources.ApplyResources(this.txtRequestHost, "txtRequestHost");
-            this.txtRequestHost.Name = "txtRequestHost";
-            // 
-            // label11
-            // 
-            resources.ApplyResources(this.label11, "label11");
-            this.label11.Name = "label11";
-            // 
-            // label10
-            // 
-            resources.ApplyResources(this.label10, "label10");
-            this.label10.Name = "label10";
-            // 
-            // cmbHeaderType
-            // 
-            this.cmbHeaderType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.cmbHeaderType.FormattingEnabled = true;
-            this.cmbHeaderType.Items.AddRange(new object[] {
-            resources.GetString("cmbHeaderType.Items"),
-            resources.GetString("cmbHeaderType.Items1"),
-            resources.GetString("cmbHeaderType.Items2"),
-            resources.GetString("cmbHeaderType.Items3"),
-            resources.GetString("cmbHeaderType.Items4"),
-            resources.GetString("cmbHeaderType.Items5"),
-            resources.GetString("cmbHeaderType.Items6")});
-            resources.ApplyResources(this.cmbHeaderType, "cmbHeaderType");
-            this.cmbHeaderType.Name = "cmbHeaderType";
-            // 
             // label8
             // 
             resources.ApplyResources(this.label8, "label8");
@@ -309,7 +117,8 @@
             resources.GetString("cmbSecurity.Items"),
             resources.GetString("cmbSecurity.Items1"),
             resources.GetString("cmbSecurity.Items2"),
-            resources.GetString("cmbSecurity.Items3")});
+            resources.GetString("cmbSecurity.Items3"),
+            resources.GetString("cmbSecurity.Items4")});
             resources.ApplyResources(this.cmbSecurity, "cmbSecurity");
             this.cmbSecurity.Name = "cmbSecurity";
             // 
@@ -427,12 +236,25 @@
             resources.ApplyResources(this.MenuItemImportClipboard, "MenuItemImportClipboard");
             this.MenuItemImportClipboard.Click += new System.EventHandler(this.MenuItemImportClipboard_Click);
             // 
+            // panel3
+            // 
+            this.panel3.Controls.Add(this.transportControl);
+            resources.ApplyResources(this.panel3, "panel3");
+            this.panel3.Name = "panel3";
+            // 
+            // transportControl
+            // 
+            this.transportControl.AllowXtls = false;
+            resources.ApplyResources(this.transportControl, "transportControl");
+            this.transportControl.Name = "transportControl";
+            // 
             // AddServerForm
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnClose;
             this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.panel3);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.menuServer);
@@ -441,13 +263,10 @@
             this.Load += new System.EventHandler(this.AddServerForm_Load);
             this.groupBox1.ResumeLayout(false);
             this.groupBox1.PerformLayout();
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
-            this.panTlsMore.ResumeLayout(false);
-            this.panTlsMore.PerformLayout();
             this.panel2.ResumeLayout(false);
             this.menuServer.ResumeLayout(false);
             this.menuServer.PerformLayout();
+            this.panel3.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -470,39 +289,18 @@
         private System.Windows.Forms.TextBox txtAddress;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.ComboBox cmbSecurity;
-        private System.Windows.Forms.ComboBox cmbNetwork;
-        private System.Windows.Forms.Label label7;
-        private System.Windows.Forms.Label label9;
         private System.Windows.Forms.Label label8;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Panel panel2;
-        private System.Windows.Forms.TextBox txtRequestHost;
-        private System.Windows.Forms.Label label10;
-        private System.Windows.Forms.Label label11;
-        private System.Windows.Forms.ComboBox cmbHeaderType;
-        private System.Windows.Forms.Label label12;
-        private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.Label label13;
         private System.Windows.Forms.MenuStrip menuServer;
         private System.Windows.Forms.ToolStripMenuItem MenuItem1;
         private System.Windows.Forms.ToolStripMenuItem MenuItemImportClient;
         private System.Windows.Forms.ToolStripMenuItem MenuItemImportServer;
-        private System.Windows.Forms.Label label15;
-        private System.Windows.Forms.ComboBox cmbStreamSecurity;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
         private System.Windows.Forms.ToolStripMenuItem MenuItemImportClipboard;
         private System.Windows.Forms.Button btnGUID;
-        private System.Windows.Forms.Label label16;
-        private System.Windows.Forms.Label label14;
-        private System.Windows.Forms.Label label17;
-        private System.Windows.Forms.Label label18;
-        private System.Windows.Forms.Label label19;
-        private System.Windows.Forms.TextBox txtPath;
-        private System.Windows.Forms.Label label20;
-        private System.Windows.Forms.Label label21;
-        private System.Windows.Forms.ComboBox cmbAllowInsecure;
-        private System.Windows.Forms.Panel panTlsMore;
-        private System.Windows.Forms.Label label24;
-        private System.Windows.Forms.Label label23;
+        private System.Windows.Forms.Panel panel3;
+        private ServerTransportControl transportControl;
     }
 }

v2rayN/v2rayN/Forms/AddServerForm.cs

@@ -6,7 +6,7 @@ using v2rayN.Mode;
 namespace v2rayN.Forms
 {
     public partial class AddServerForm : BaseServerForm
-    { 
+    {
 
         public AddServerForm()
         {
@@ -37,14 +37,9 @@ namespace v2rayN.Forms
             txtId.Text = vmessItem.id;
             txtAlterId.Text = vmessItem.alterId.ToString();
             cmbSecurity.Text = vmessItem.security;
-            cmbNetwork.Text = vmessItem.network;
             txtRemarks.Text = vmessItem.remarks;
 
-            cmbHeaderType.Text = vmessItem.headerType;
-            txtRequestHost.Text = vmessItem.requestHost;
-            txtPath.Text = vmessItem.path;
-            cmbStreamSecurity.Text = vmessItem.streamSecurity;
-            cmbAllowInsecure.Text = vmessItem.allowInsecure;
+            transportControl.BindingServer(vmessItem);
         }
 
 
@@ -58,55 +53,11 @@ namespace v2rayN.Forms
             txtId.Text = "";
             txtAlterId.Text = "0";
             cmbSecurity.Text = Global.DefaultSecurity;
-            cmbNetwork.Text = Global.DefaultNetwork;
             txtRemarks.Text = "";
 
-            cmbHeaderType.Text = Global.None;
-            txtRequestHost.Text = "";
-            cmbStreamSecurity.Text = "";
-            cmbAllowInsecure.Text = "";
-            txtPath.Text = "";
+            transportControl.ClearServer(vmessItem);
         }
-
-
-        private void cmbNetwork_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            SetHeaderType();
-        }
-
-        /// <summary>
-        /// 设置伪装选项
-        /// </summary>
-        private void SetHeaderType()
-        {
-            cmbHeaderType.Items.Clear();
-
-            string network = cmbNetwork.Text;
-            if (Utils.IsNullOrEmpty(network))
-            {
-                cmbHeaderType.Items.Add(Global.None);
-                return;
-            }
-
-            cmbHeaderType.Items.Add(Global.None);
-            if (network.Equals(Global.DefaultNetwork))
-            {
-                cmbHeaderType.Items.Add(Global.TcpHeaderHttp);
-            }
-            else if (network.Equals("kcp") || network.Equals("quic"))
-            {
-                cmbHeaderType.Items.Add("srtp");
-                cmbHeaderType.Items.Add("utp");
-                cmbHeaderType.Items.Add("wechat-video");
-                cmbHeaderType.Items.Add("dtls");
-                cmbHeaderType.Items.Add("wireguard");
-            }
-            else
-            {
-            }
-            cmbHeaderType.Text = Global.None;
-        }
-
+         
         private void btnOK_Click(object sender, EventArgs e)
         {
             string address = txtAddress.Text;
@@ -114,15 +65,8 @@ namespace v2rayN.Forms
             string id = txtId.Text;
             string alterId = txtAlterId.Text;
             string security = cmbSecurity.Text;
-            string network = cmbNetwork.Text;
             string remarks = txtRemarks.Text;
 
-            string headerType = cmbHeaderType.Text;
-            string requestHost = txtRequestHost.Text;
-            string path = txtPath.Text;
-            string streamSecurity = cmbStreamSecurity.Text;
-            string allowInsecure = cmbAllowInsecure.Text;
-
             if (Utils.IsNullOrEmpty(address))
             {
                 UI.Show(UIRes.I18N("FillServerAddress"));
@@ -144,20 +88,15 @@ namespace v2rayN.Forms
                 return;
             }
 
+            transportControl.EndBindingServer();
+
             vmessItem.address = address;
             vmessItem.port = Utils.ToInt(port);
             vmessItem.id = id;
             vmessItem.alterId = Utils.ToInt(alterId);
             vmessItem.security = security;
-            vmessItem.network = network;
             vmessItem.remarks = remarks;
 
-            vmessItem.headerType = headerType;
-            vmessItem.requestHost = requestHost.Replace(" ", "");
-            vmessItem.path = path.Replace(" ", "");
-            vmessItem.streamSecurity = streamSecurity;
-            vmessItem.allowInsecure = allowInsecure;
-
             if (ConfigHandler.AddServer(ref config, vmessItem, EditIndex) == 0)
             {
                 this.DialogResult = DialogResult.OK;
@@ -178,19 +117,6 @@ namespace v2rayN.Forms
             this.DialogResult = DialogResult.Cancel;
         }
 
-        private void cmbStreamSecurity_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            string security = cmbStreamSecurity.Text;
-            if (Utils.IsNullOrEmpty(security))
-            {
-                panTlsMore.Hide();
-            }
-            else
-            {
-                panTlsMore.Show();
-            }
-        }
-
         #region 导入客户端/服务端配置
 
         /// <summary>
@@ -232,31 +158,29 @@ namespace v2rayN.Forms
                 return;
             }
             string msg;
-            VmessItem vmessItem;
+            VmessItem vmessItemTemp;
             if (type.Equals(1))
             {
-                vmessItem = V2rayConfigHandler.ImportFromClientConfig(fileName, out msg);
+                vmessItemTemp = V2rayConfigHandler.ImportFromClientConfig(fileName, out msg);
             }
             else
             {
-                vmessItem = V2rayConfigHandler.ImportFromServerConfig(fileName, out msg);
+                vmessItemTemp = V2rayConfigHandler.ImportFromServerConfig(fileName, out msg);
             }
-            if (vmessItem == null)
+            if (vmessItemTemp == null)
             {
                 UI.ShowWarning(msg);
                 return;
             }
+            vmessItem = vmessItemTemp;
 
             txtAddress.Text = vmessItem.address;
             txtPort.Text = vmessItem.port.ToString();
             txtId.Text = vmessItem.id;
             txtAlterId.Text = vmessItem.alterId.ToString();
             txtRemarks.Text = vmessItem.remarks;
-            cmbNetwork.Text = vmessItem.network;
-            cmbHeaderType.Text = vmessItem.headerType;
-            txtRequestHost.Text = vmessItem.requestHost;
-            txtPath.Text = vmessItem.path;
-            cmbStreamSecurity.Text = vmessItem.streamSecurity;
+
+            transportControl.BindingServer(vmessItem);
         }
 
         /// <summary>
@@ -268,23 +192,21 @@ namespace v2rayN.Forms
         {
             ClearServer();
 
-            VmessItem vmessItem = ShareHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out string msg);
-            if (vmessItem == null)
+            VmessItem vmessItemTemp = ShareHandler.ImportFromClipboardConfig(Utils.GetClipboardData(), out string msg);
+            if (vmessItemTemp == null)
             {
                 UI.ShowWarning(msg);
                 return;
             }
+            vmessItem = vmessItemTemp;
 
             txtAddress.Text = vmessItem.address;
             txtPort.Text = vmessItem.port.ToString();
             txtId.Text = vmessItem.id;
             txtAlterId.Text = vmessItem.alterId.ToString();
             txtRemarks.Text = vmessItem.remarks;
-            cmbNetwork.Text = vmessItem.network;
-            cmbHeaderType.Text = vmessItem.headerType;
-            txtRequestHost.Text = vmessItem.requestHost;
-            txtPath.Text = vmessItem.path;
-            cmbStreamSecurity.Text = vmessItem.streamSecurity;
+
+            transportControl.BindingServer(vmessItem);
         }
         #endregion
 

v2rayN/v2rayN/Forms/AddServerForm.resx

@@ -171,7 +171,7 @@
     <value>True</value>
   </data>
   <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
-    <value>285, 175</value>
+    <value>411, 175</value>
   </data>
   <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
     <value>113, 12</value>
@@ -194,654 +194,11 @@
   <data name="&gt;&gt;label13.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="label24.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="label24.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="label24.Location" type="System.Drawing.Point, System.Drawing">
-    <value>529, 207</value>
-  </data>
-  <data name="label24.Size" type="System.Drawing.Size, System.Drawing">
-    <value>119, 12</value>
-  </data>
-  <data name="label24.TabIndex" type="System.Int32, mscorlib">
-    <value>35</value>
-  </data>
-  <data name="label24.Text" xml:space="preserve">
-    <value>3)QUIC key/Kcp seed</value>
-  </data>
-  <data name="&gt;&gt;label24.Name" xml:space="preserve">
-    <value>label24</value>
-  </data>
-  <data name="&gt;&gt;label24.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label24.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label24.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="label23.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label23.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="label23.Location" type="System.Drawing.Point, System.Drawing">
-    <value>465, 146</value>
-  </data>
-  <data name="label23.Size" type="System.Drawing.Size, System.Drawing">
-    <value>89, 12</value>
-  </data>
-  <data name="label23.TabIndex" type="System.Int32, mscorlib">
-    <value>34</value>
-  </data>
-  <data name="label23.Text" xml:space="preserve">
-    <value>4)QUIC securty</value>
-  </data>
-  <data name="&gt;&gt;label23.Name" xml:space="preserve">
-    <value>label23</value>
-  </data>
-  <data name="&gt;&gt;label23.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label23.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label23.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="label21.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label21.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 11</value>
-  </data>
-  <data name="label21.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 12</value>
-  </data>
-  <data name="label21.TabIndex" type="System.Int32, mscorlib">
-    <value>31</value>
-  </data>
-  <data name="label21.Text" xml:space="preserve">
-    <value>allowInsecure</value>
-  </data>
-  <data name="&gt;&gt;label21.Name" xml:space="preserve">
-    <value>label21</value>
-  </data>
-  <data name="&gt;&gt;label21.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label21.Parent" xml:space="preserve">
-    <value>panTlsMore</value>
-  </data>
-  <data name="&gt;&gt;label21.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="cmbAllowInsecure.Items" xml:space="preserve">
-    <value />
-  </data>
-  <data name="cmbAllowInsecure.Items1" xml:space="preserve">
-    <value>true</value>
-  </data>
-  <data name="cmbAllowInsecure.Items2" xml:space="preserve">
-    <value>false</value>
-  </data>
-  <data name="cmbAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
-    <value>107, 7</value>
-  </data>
-  <data name="cmbAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
-    <value>91, 20</value>
-  </data>
-  <data name="cmbAllowInsecure.TabIndex" type="System.Int32, mscorlib">
-    <value>30</value>
-  </data>
-  <data name="&gt;&gt;cmbAllowInsecure.Name" xml:space="preserve">
-    <value>cmbAllowInsecure</value>
-  </data>
-  <data name="&gt;&gt;cmbAllowInsecure.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbAllowInsecure.Parent" xml:space="preserve">
-    <value>panTlsMore</value>
-  </data>
-  <data name="&gt;&gt;cmbAllowInsecure.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="panTlsMore.Location" type="System.Drawing.Point, System.Drawing">
-    <value>284, 234</value>
-  </data>
-  <data name="panTlsMore.Size" type="System.Drawing.Size, System.Drawing">
-    <value>338, 35</value>
-  </data>
-  <data name="panTlsMore.TabIndex" type="System.Int32, mscorlib">
-    <value>33</value>
-  </data>
-  <data name="&gt;&gt;panTlsMore.Name" xml:space="preserve">
-    <value>panTlsMore</value>
-  </data>
-  <data name="&gt;&gt;panTlsMore.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panTlsMore.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;panTlsMore.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="label9.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
-    <value>350, 32</value>
-  </data>
-  <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>113, 12</value>
-  </data>
-  <data name="label9.TabIndex" type="System.Int32, mscorlib">
-    <value>15</value>
-  </data>
-  <data name="label9.Text" xml:space="preserve">
-    <value>*Default value tcp</value>
-  </data>
-  <data name="&gt;&gt;label9.Name" xml:space="preserve">
-    <value>label9</value>
-  </data>
-  <data name="&gt;&gt;label9.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label9.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label9.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="label20.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label20.Location" type="System.Drawing.Point, System.Drawing">
-    <value>464, 130</value>
-  </data>
-  <data name="label20.Size" type="System.Drawing.Size, System.Drawing">
-    <value>203, 12</value>
-  </data>
-  <data name="label20.TabIndex" type="System.Int32, mscorlib">
-    <value>29</value>
-  </data>
-  <data name="label20.Text" xml:space="preserve">
-    <value>3)h2 host Separated by commas (,)</value>
-  </data>
-  <data name="&gt;&gt;label20.Name" xml:space="preserve">
-    <value>label20</value>
-  </data>
-  <data name="&gt;&gt;label20.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label20.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label20.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="txtPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 169</value>
-  </data>
-  <data name="txtPath.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="txtPath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>396, 54</value>
-  </data>
-  <data name="txtPath.TabIndex" type="System.Int32, mscorlib">
-    <value>28</value>
-  </data>
-  <data name="&gt;&gt;txtPath.Name" xml:space="preserve">
-    <value>txtPath</value>
-  </data>
-  <data name="&gt;&gt;txtPath.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtPath.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;txtPath.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="cmbNetwork.Items" xml:space="preserve">
-    <value>tcp</value>
-  </data>
-  <data name="cmbNetwork.Items1" xml:space="preserve">
-    <value>kcp</value>
-  </data>
-  <data name="cmbNetwork.Items2" xml:space="preserve">
-    <value>ws</value>
-  </data>
-  <data name="cmbNetwork.Items3" xml:space="preserve">
-    <value>h2</value>
-  </data>
-  <data name="cmbNetwork.Items4" xml:space="preserve">
-    <value>quic</value>
-  </data>
-  <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
-    <value>192, 28</value>
-  </data>
-  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 20</value>
-  </data>
-  <data name="cmbNetwork.TabIndex" type="System.Int32, mscorlib">
-    <value>12</value>
-  </data>
-  <data name="&gt;&gt;cmbNetwork.Name" xml:space="preserve">
-    <value>cmbNetwork</value>
-  </data>
-  <data name="&gt;&gt;cmbNetwork.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbNetwork.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;cmbNetwork.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="label7.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 32</value>
-  </data>
-  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>167, 12</value>
-  </data>
-  <data name="label7.TabIndex" type="System.Int32, mscorlib">
-    <value>13</value>
-  </data>
-  <data name="label7.Text" xml:space="preserve">
-    <value>Transport protocol(network)</value>
-  </data>
-  <data name="&gt;&gt;label7.Name" xml:space="preserve">
-    <value>label7</value>
-  </data>
-  <data name="&gt;&gt;label7.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label7.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
-  <data name="label19.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label19.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 169</value>
-  </data>
-  <data name="label19.Size" type="System.Drawing.Size, System.Drawing">
-    <value>29, 12</value>
-  </data>
-  <data name="label19.TabIndex" type="System.Int32, mscorlib">
-    <value>27</value>
-  </data>
-  <data name="label19.Text" xml:space="preserve">
-    <value>Path</value>
-  </data>
-  <data name="&gt;&gt;label19.Name" xml:space="preserve">
-    <value>label19</value>
-  </data>
-  <data name="&gt;&gt;label19.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label19.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label19.ZOrder" xml:space="preserve">
-    <value>8</value>
-  </data>
-  <data name="label18.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label18.Location" type="System.Drawing.Point, System.Drawing">
-    <value>529, 189</value>
-  </data>
-  <data name="label18.Size" type="System.Drawing.Size, System.Drawing">
-    <value>59, 12</value>
-  </data>
-  <data name="label18.TabIndex" type="System.Int32, mscorlib">
-    <value>26</value>
-  </data>
-  <data name="label18.Text" xml:space="preserve">
-    <value>2)h2 path</value>
-  </data>
-  <data name="&gt;&gt;label18.Name" xml:space="preserve">
-    <value>label18</value>
-  </data>
-  <data name="&gt;&gt;label18.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label18.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label18.ZOrder" xml:space="preserve">
-    <value>9</value>
-  </data>
-  <data name="label17.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label17.Location" type="System.Drawing.Point, System.Drawing">
-    <value>464, 115</value>
-  </data>
-  <data name="label17.Size" type="System.Drawing.Size, System.Drawing">
-    <value>59, 12</value>
-  </data>
-  <data name="label17.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
-  </data>
-  <data name="label17.Text" xml:space="preserve">
-    <value>2)ws host</value>
-  </data>
-  <data name="&gt;&gt;label17.Name" xml:space="preserve">
-    <value>label17</value>
-  </data>
-  <data name="&gt;&gt;label17.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label17.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label17.ZOrder" xml:space="preserve">
-    <value>10</value>
-  </data>
-  <data name="label16.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label16.Location" type="System.Drawing.Point, System.Drawing">
-    <value>529, 172</value>
-  </data>
-  <data name="label16.Size" type="System.Drawing.Size, System.Drawing">
-    <value>59, 12</value>
-  </data>
-  <data name="label16.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
-  </data>
-  <data name="label16.Text" xml:space="preserve">
-    <value>1)ws path</value>
-  </data>
-  <data name="&gt;&gt;label16.Name" xml:space="preserve">
-    <value>label16</value>
-  </data>
-  <data name="&gt;&gt;label16.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label16.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label16.ZOrder" xml:space="preserve">
-    <value>11</value>
-  </data>
-  <data name="label14.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label14.Location" type="System.Drawing.Point, System.Drawing">
-    <value>464, 100</value>
-  </data>
-  <data name="label14.Size" type="System.Drawing.Size, System.Drawing">
-    <value>215, 12</value>
-  </data>
-  <data name="label14.TabIndex" type="System.Int32, mscorlib">
-    <value>23</value>
-  </data>
-  <data name="label14.Text" xml:space="preserve">
-    <value>1)http host Separated by commas (,)</value>
-  </data>
-  <data name="&gt;&gt;label14.Name" xml:space="preserve">
-    <value>label14</value>
-  </data>
-  <data name="&gt;&gt;label14.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label14.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label14.ZOrder" xml:space="preserve">
-    <value>12</value>
-  </data>
-  <data name="label15.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label15.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 243</value>
-  </data>
-  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
-    <value>23, 12</value>
-  </data>
-  <data name="label15.TabIndex" type="System.Int32, mscorlib">
-    <value>22</value>
-  </data>
-  <data name="label15.Text" xml:space="preserve">
-    <value>TLS</value>
-  </data>
-  <data name="&gt;&gt;label15.Name" xml:space="preserve">
-    <value>label15</value>
-  </data>
-  <data name="&gt;&gt;label15.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label15.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label15.ZOrder" xml:space="preserve">
-    <value>13</value>
-  </data>
-  <data name="cmbStreamSecurity.Items" xml:space="preserve">
-    <value />
-  </data>
-  <data name="cmbStreamSecurity.Items1" xml:space="preserve">
-    <value>tls</value>
-  </data>
-  <data name="cmbStreamSecurity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 239</value>
-  </data>
-  <data name="cmbStreamSecurity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 20</value>
-  </data>
-  <data name="cmbStreamSecurity.TabIndex" type="System.Int32, mscorlib">
-    <value>21</value>
-  </data>
-  <data name="&gt;&gt;cmbStreamSecurity.Name" xml:space="preserve">
-    <value>cmbStreamSecurity</value>
-  </data>
-  <data name="&gt;&gt;cmbStreamSecurity.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbStreamSecurity.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;cmbStreamSecurity.ZOrder" xml:space="preserve">
-    <value>14</value>
-  </data>
-  <data name="label12.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
-    <value>282, 66</value>
-  </data>
-  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
-    <value>299, 12</value>
-  </data>
-  <data name="label12.TabIndex" type="System.Int32, mscorlib">
-    <value>20</value>
-  </data>
-  <data name="label12.Text" xml:space="preserve">
-    <value>*tcp or kcp or QUIC camouflage type, default none</value>
-  </data>
-  <data name="&gt;&gt;label12.Name" xml:space="preserve">
-    <value>label12</value>
-  </data>
-  <data name="&gt;&gt;label12.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label12.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label12.ZOrder" xml:space="preserve">
-    <value>15</value>
-  </data>
-  <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
-    <value>158, 100</value>
-  </data>
-  <data name="txtRequestHost.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
-    <value>300, 53</value>
-  </data>
-  <data name="txtRequestHost.TabIndex" type="System.Int32, mscorlib">
-    <value>16</value>
-  </data>
-  <data name="&gt;&gt;txtRequestHost.Name" xml:space="preserve">
-    <value>txtRequestHost</value>
-  </data>
-  <data name="&gt;&gt;txtRequestHost.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtRequestHost.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;txtRequestHost.ZOrder" xml:space="preserve">
-    <value>16</value>
-  </data>
-  <data name="label11.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label11.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 66</value>
-  </data>
-  <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 12</value>
-  </data>
-  <data name="label11.TabIndex" type="System.Int32, mscorlib">
-    <value>19</value>
-  </data>
-  <data name="label11.Text" xml:space="preserve">
-    <value>Camouflage type</value>
-  </data>
-  <data name="&gt;&gt;label11.Name" xml:space="preserve">
-    <value>label11</value>
-  </data>
-  <data name="&gt;&gt;label11.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label11.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label11.ZOrder" xml:space="preserve">
-    <value>17</value>
-  </data>
-  <data name="label10.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label10.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 100</value>
-  </data>
-  <data name="label10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 12</value>
-  </data>
-  <data name="label10.TabIndex" type="System.Int32, mscorlib">
-    <value>17</value>
-  </data>
-  <data name="label10.Text" xml:space="preserve">
-    <value>Camouflage domain(host)</value>
-  </data>
-  <data name="&gt;&gt;label10.Name" xml:space="preserve">
-    <value>label10</value>
-  </data>
-  <data name="&gt;&gt;label10.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label10.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;label10.ZOrder" xml:space="preserve">
-    <value>18</value>
-  </data>
-  <data name="cmbHeaderType.Items" xml:space="preserve">
-    <value>none</value>
-  </data>
-  <data name="cmbHeaderType.Items1" xml:space="preserve">
-    <value>http</value>
-  </data>
-  <data name="cmbHeaderType.Items2" xml:space="preserve">
-    <value>srtp</value>
-  </data>
-  <data name="cmbHeaderType.Items3" xml:space="preserve">
-    <value>utp</value>
-  </data>
-  <data name="cmbHeaderType.Items4" xml:space="preserve">
-    <value>wechat-video</value>
-  </data>
-  <data name="cmbHeaderType.Items5" xml:space="preserve">
-    <value>dtls</value>
-  </data>
-  <data name="cmbHeaderType.Items6" xml:space="preserve">
-    <value>wireguard</value>
-  </data>
-  <data name="cmbHeaderType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 64</value>
-  </data>
-  <data name="cmbHeaderType.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 20</value>
-  </data>
-  <data name="cmbHeaderType.TabIndex" type="System.Int32, mscorlib">
-    <value>18</value>
-  </data>
-  <data name="&gt;&gt;cmbHeaderType.Name" xml:space="preserve">
-    <value>cmbHeaderType</value>
-  </data>
-  <data name="&gt;&gt;cmbHeaderType.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;cmbHeaderType.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;cmbHeaderType.ZOrder" xml:space="preserve">
-    <value>19</value>
-  </data>
-  <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
-  <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 215</value>
-  </data>
-  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>723, 281</value>
-  </data>
-  <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
-    <value>21</value>
-  </data>
-  <data name="groupBox2.Text" xml:space="preserve">
-    <value>Transport</value>
-  </data>
-  <data name="&gt;&gt;groupBox2.Name" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;groupBox2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;groupBox2.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
-  <data name="&gt;&gt;groupBox2.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
   <data name="label8.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="label8.Location" type="System.Drawing.Point, System.Drawing">
-    <value>353, 147</value>
+    <value>411, 147</value>
   </data>
   <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
     <value>119, 12</value>
@@ -862,7 +219,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>2</value>
   </data>
   <data name="cmbSecurity.Items" xml:space="preserve">
     <value>aes-128-gcm</value>
@@ -876,14 +233,17 @@
   <data name="cmbSecurity.Items3" xml:space="preserve">
     <value>none</value>
   </data>
+  <data name="cmbSecurity.Items4" xml:space="preserve">
+    <value>zero</value>
+  </data>
   <data name="cmbSecurity.Location" type="System.Drawing.Point, System.Drawing">
     <value>195, 143</value>
   </data>
   <data name="cmbSecurity.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 20</value>
+    <value>210, 20</value>
   </data>
   <data name="cmbSecurity.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
+    <value>4</value>
   </data>
   <data name="&gt;&gt;cmbSecurity.Name" xml:space="preserve">
     <value>cmbSecurity</value>
@@ -895,16 +255,16 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;cmbSecurity.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>3</value>
   </data>
   <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 171</value>
   </data>
   <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>143, 21</value>
+    <value>278, 21</value>
   </data>
   <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
+    <value>5</value>
   </data>
   <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
     <value>txtRemarks</value>
@@ -916,7 +276,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>4</value>
   </data>
   <data name="label6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -943,7 +303,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>5</value>
   </data>
   <data name="label5.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -970,7 +330,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>6</value>
   </data>
   <data name="txtAlterId.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 114</value>
@@ -979,7 +339,7 @@
     <value>143, 21</value>
   </data>
   <data name="txtAlterId.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
+    <value>3</value>
   </data>
   <data name="&gt;&gt;txtAlterId.Name" xml:space="preserve">
     <value>txtAlterId</value>
@@ -991,7 +351,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtAlterId.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>7</value>
   </data>
   <data name="label4.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1018,7 +378,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>8</value>
   </data>
   <data name="txtId.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 85</value>
@@ -1027,7 +387,7 @@
     <value>278, 21</value>
   </data>
   <data name="txtId.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
+    <value>2</value>
   </data>
   <data name="&gt;&gt;txtId.Name" xml:space="preserve">
     <value>txtId</value>
@@ -1039,7 +399,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtId.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>9</value>
   </data>
   <data name="label3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1066,7 +426,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>10</value>
   </data>
   <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 56</value>
@@ -1075,7 +435,7 @@
     <value>143, 21</value>
   </data>
   <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;txtPort.Name" xml:space="preserve">
     <value>txtPort</value>
@@ -1087,7 +447,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>11</value>
   </data>
   <data name="label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1114,7 +474,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>12</value>
   </data>
   <data name="txtAddress.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 27</value>
@@ -1123,7 +483,7 @@
     <value>359, 21</value>
   </data>
   <data name="txtAddress.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
+    <value>0</value>
   </data>
   <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
     <value>txtAddress</value>
@@ -1135,7 +495,7 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>13</value>
   </data>
   <data name="label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1162,8 +522,9 @@
     <value>groupBox1</value>
   </data>
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>14</value>
   </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
   </data>
@@ -1171,7 +532,7 @@
     <value>0, 35</value>
   </data>
   <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>729, 499</value>
+    <value>729, 216</value>
   </data>
   <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -1219,7 +580,7 @@
     <value>Bottom</value>
   </data>
   <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 534</value>
+    <value>0, 481</value>
   </data>
   <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
     <value>729, 60</value>
@@ -1237,7 +598,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
   </data>
   <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Top</value>
@@ -1261,7 +622,7 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
   </data>
   <metadata name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
@@ -1312,19 +673,67 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;menuServer.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
+  </data>
+  <data name="transportControl.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="transportControl.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="transportControl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>729, 230</value>
+  </data>
+  <data name="transportControl.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;transportControl.Name" xml:space="preserve">
+    <value>transportControl</value>
+  </data>
+  <data name="&gt;&gt;transportControl.Type" xml:space="preserve">
+    <value>v2rayN.Forms.ServerTransportControl, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;transportControl.Parent" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="&gt;&gt;transportControl.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="panel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Bottom</value>
+  </data>
+  <data name="panel3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 251</value>
+  </data>
+  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>729, 230</value>
+  </data>
+  <data name="panel3.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="&gt;&gt;panel3.Name" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="&gt;&gt;panel3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;panel3.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;panel3.ZOrder" xml:space="preserve">
+    <value>1</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>114</value>
+    <value>25</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 12</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>729, 594</value>
+    <value>729, 541</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Edit or add a [VMess] server</value>

v2rayN/v2rayN/Forms/AddServerForm.zh-Hans.resx

@@ -120,39 +120,24 @@
   <data name="btnClose.Text" xml:space="preserve">
     <value>取消(&amp;C)</value>
   </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>服务器</value>
-  </data>
   <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>底层传输方式(transport)</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>149, 12</value>
   </data>
-  <data name="label24.Text" xml:space="preserve">
-    <value>3)QUIC 加密密钥/Kcp seed</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>167, 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>
+    <value>180, 7</value>
   </data>
   <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
     <value>350, 36</value>
@@ -160,15 +145,9 @@
   <data name="label9.Size" type="System.Drawing.Size, System.Drawing">
     <value>143, 12</value>
   </data>
-  <data name="label9.Text" xml:space="preserve">
-    <value>*默认tcp,选错会无法连接</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="txtPath.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 168</value>
   </data>
@@ -184,33 +163,21 @@
   <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="label19.Location" type="System.Drawing.Point, System.Drawing">
     <value>9, 168</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>
-  <data name="label14.Text" xml:space="preserve">
-    <value>1)http host中间逗号(,)隔开</value>
-  </data>
   <data name="label15.Location" type="System.Drawing.Point, System.Drawing">
     <value>9, 237</value>
   </data>
   <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
     <value>107, 12</value>
   </data>
-  <data name="label15.Text" xml:space="preserve">
-    <value>底层传输安全(tls)</value>
-  </data>
   <data name="cmbStreamSecurity.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 237</value>
   </data>
@@ -220,9 +187,6 @@
   <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>
   <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 102</value>
   </data>
@@ -235,18 +199,12 @@
   <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="label10.Location" type="System.Drawing.Point, System.Drawing">
     <value>9, 102</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="cmbHeaderType.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 67</value>
   </data>
@@ -298,15 +256,12 @@
   <data name="label1.Text" xml:space="preserve">
     <value>地址(address)</value>
   </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>服务器</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>
-  </data>
-  <data name="MenuItem1.Text" xml:space="preserve">
-    <value>导入配置文件</value>
-  </data>
   <data name="MenuItemImportClient.Size" type="System.Drawing.Size, System.Drawing">
     <value>171, 22</value>
   </data>
@@ -328,6 +283,12 @@
   <data name="MenuItemImportClipboard.Text" xml:space="preserve">
     <value>从剪贴板导入URL</value>
   </data>
+  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>92, 21</value>
+  </data>
+  <data name="MenuItem1.Text" xml:space="preserve">
+    <value>导入配置文件</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>编辑或添加[VMess]服务器</value>
   </data>

v2rayN/v2rayN/Forms/MainForm.Designer.cs

@@ -66,6 +66,23 @@
             this.menuExport2SubContent = new System.Windows.Forms.ToolStripMenuItem();
             this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
             this.qrCodeControl = new v2rayN.Forms.QRCodeControl();
+            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.gbMsgTitle = new System.Windows.Forms.GroupBox();
+            this.txtMsgBox = new System.Windows.Forms.TextBox();
+            this.cmsMsgBox = new System.Windows.Forms.ContextMenuStrip(this.components);
+            this.menuMsgBoxSelectAll = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuMsgBoxCopy = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuMsgBoxCopyAll = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuMsgBoxAddRoutingRule = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuMsgBoxFilter = new System.Windows.Forms.ToolStripMenuItem();
+            this.ssMain = new System.Windows.Forms.StatusStrip();
+            this.toolSslInboundInfo = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslBlank1 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslRoutingRule = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslBlank2 = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslServerSpeed = new System.Windows.Forms.ToolStripStatusLabel();
+            this.toolSslBlank4 = new System.Windows.Forms.ToolStripStatusLabel();
             this.notifyMain = new System.Windows.Forms.NotifyIcon(this.components);
             this.cmsMain = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.menuSysAgentMode = new System.Windows.Forms.ToolStripMenuItem();
@@ -74,6 +91,7 @@
             this.menuKeepNothing = new System.Windows.Forms.ToolStripMenuItem();
             this.menuRoutings = new System.Windows.Forms.ToolStripMenuItem();
             this.menuServers = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuServers2 = new System.Windows.Forms.ToolStripComboBox();
             this.toolStripSeparator13 = new System.Windows.Forms.ToolStripSeparator();
             this.menuAddServers2 = new System.Windows.Forms.ToolStripMenuItem();
             this.menuScanScreen2 = new System.Windows.Forms.ToolStripMenuItem();
@@ -81,19 +99,6 @@
             this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
             this.menuExit = new System.Windows.Forms.ToolStripMenuItem();
             this.bgwScan = new System.ComponentModel.BackgroundWorker();
-            this.groupBox1 = new System.Windows.Forms.GroupBox();
-            this.groupBox2 = new System.Windows.Forms.GroupBox();
-            this.txtMsgBox = new System.Windows.Forms.TextBox();
-            this.ssMain = new System.Windows.Forms.StatusStrip();
-            this.toolSslSocksPortLab = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolSslSocksPort = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolSslBlank1 = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolSslHttpPortLab = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolSslHttpPort = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolSslBlank2 = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolSslBlank3 = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolSslServerSpeed = new System.Windows.Forms.ToolStripStatusLabel();
-            this.toolSslBlank4 = new System.Windows.Forms.ToolStripStatusLabel();
             this.panel1 = new System.Windows.Forms.Panel();
             this.tsMain = new System.Windows.Forms.ToolStrip();
             this.toolStripSeparator4 = new System.Windows.Forms.ToolStripSeparator();
@@ -105,6 +110,8 @@
             this.tsbSetting = new System.Windows.Forms.ToolStripDropDownButton();
             this.tsbOptionSetting = new System.Windows.Forms.ToolStripMenuItem();
             this.tsbRoutingSetting = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator14 = new System.Windows.Forms.ToolStripSeparator();
+            this.tsbBackupGuiNConfig = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator5 = new System.Windows.Forms.ToolStripSeparator();
             this.tsbReload = new System.Windows.Forms.ToolStripButton();
             this.toolStripSeparator7 = new System.Windows.Forms.ToolStripSeparator();
@@ -112,6 +119,9 @@
             this.tsbCheckUpdateN = new System.Windows.Forms.ToolStripMenuItem();
             this.tsbCheckUpdateCore = new System.Windows.Forms.ToolStripMenuItem();
             this.tsbCheckUpdateXrayCore = new System.Windows.Forms.ToolStripMenuItem();
+            this.toolStripSeparator15 = new System.Windows.Forms.ToolStripSeparator();
+            this.tsbCheckUpdateGeoSite = new System.Windows.Forms.ToolStripMenuItem();
+            this.tsbCheckUpdateGeoIP = new System.Windows.Forms.ToolStripMenuItem();
             this.toolStripSeparator10 = new System.Windows.Forms.ToolStripSeparator();
             this.tsbHelp = new System.Windows.Forms.ToolStripDropDownButton();
             this.tsbAbout = new System.Windows.Forms.ToolStripMenuItem();
@@ -127,10 +137,15 @@
             this.scMain.Panel2.SuspendLayout();
             this.scMain.SuspendLayout();
             this.cmsLv.SuspendLayout();
-            this.cmsMain.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).BeginInit();
+            this.splitContainer1.Panel1.SuspendLayout();
+            this.splitContainer1.Panel2.SuspendLayout();
+            this.splitContainer1.SuspendLayout();
             this.groupBox1.SuspendLayout();
-            this.groupBox2.SuspendLayout();
+            this.gbMsgTitle.SuspendLayout();
+            this.cmsMsgBox.SuspendLayout();
             this.ssMain.SuspendLayout();
+            this.cmsMain.SuspendLayout();
             this.tsMain.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -208,6 +223,7 @@
             this.menuExport2ShareUrl,
             this.menuExport2SubContent});
             this.cmsLv.Name = "cmsLv";
+            this.cmsLv.OwnerItem = this.tsbServer;
             // 
             // menuAddVmessServer
             // 
@@ -403,6 +419,135 @@
             resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
             this.qrCodeControl.Name = "qrCodeControl";
             // 
+            // splitContainer1
+            // 
+            resources.ApplyResources(this.splitContainer1, "splitContainer1");
+            this.splitContainer1.Name = "splitContainer1";
+            // 
+            // splitContainer1.Panel1
+            // 
+            resources.ApplyResources(this.splitContainer1.Panel1, "splitContainer1.Panel1");
+            this.splitContainer1.Panel1.Controls.Add(this.groupBox1);
+            // 
+            // splitContainer1.Panel2
+            // 
+            resources.ApplyResources(this.splitContainer1.Panel2, "splitContainer1.Panel2");
+            this.splitContainer1.Panel2.Controls.Add(this.gbMsgTitle);
+            // 
+            // groupBox1
+            // 
+            resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Controls.Add(this.scMain);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.TabStop = false;
+            // 
+            // gbMsgTitle
+            // 
+            resources.ApplyResources(this.gbMsgTitle, "gbMsgTitle");
+            this.gbMsgTitle.Controls.Add(this.txtMsgBox);
+            this.gbMsgTitle.Controls.Add(this.ssMain);
+            this.gbMsgTitle.Name = "gbMsgTitle";
+            this.gbMsgTitle.TabStop = false;
+            // 
+            // txtMsgBox
+            // 
+            resources.ApplyResources(this.txtMsgBox, "txtMsgBox");
+            this.txtMsgBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(49)))), ((int)(((byte)(52)))));
+            this.txtMsgBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
+            this.txtMsgBox.ContextMenuStrip = this.cmsMsgBox;
+            this.txtMsgBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(226)))), ((int)(((byte)(228)))));
+            this.txtMsgBox.Name = "txtMsgBox";
+            this.txtMsgBox.ReadOnly = true;
+            this.txtMsgBox.KeyDown += new System.Windows.Forms.KeyEventHandler(this.txtMsgBox_KeyDown);
+            // 
+            // cmsMsgBox
+            // 
+            resources.ApplyResources(this.cmsMsgBox, "cmsMsgBox");
+            this.cmsMsgBox.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.menuMsgBoxSelectAll,
+            this.menuMsgBoxCopy,
+            this.menuMsgBoxCopyAll,
+            this.menuMsgBoxAddRoutingRule,
+            this.menuMsgBoxFilter});
+            this.cmsMsgBox.Name = "cmsMsgBox";
+            // 
+            // menuMsgBoxSelectAll
+            // 
+            resources.ApplyResources(this.menuMsgBoxSelectAll, "menuMsgBoxSelectAll");
+            this.menuMsgBoxSelectAll.Name = "menuMsgBoxSelectAll";
+            this.menuMsgBoxSelectAll.Click += new System.EventHandler(this.menuMsgBoxSelectAll_Click);
+            // 
+            // menuMsgBoxCopy
+            // 
+            resources.ApplyResources(this.menuMsgBoxCopy, "menuMsgBoxCopy");
+            this.menuMsgBoxCopy.Name = "menuMsgBoxCopy";
+            this.menuMsgBoxCopy.Click += new System.EventHandler(this.menuMsgBoxCopy_Click);
+            // 
+            // menuMsgBoxCopyAll
+            // 
+            resources.ApplyResources(this.menuMsgBoxCopyAll, "menuMsgBoxCopyAll");
+            this.menuMsgBoxCopyAll.Name = "menuMsgBoxCopyAll";
+            this.menuMsgBoxCopyAll.Click += new System.EventHandler(this.menuMsgBoxCopyAll_Click);
+            // 
+            // menuMsgBoxAddRoutingRule
+            // 
+            resources.ApplyResources(this.menuMsgBoxAddRoutingRule, "menuMsgBoxAddRoutingRule");
+            this.menuMsgBoxAddRoutingRule.Name = "menuMsgBoxAddRoutingRule";
+            this.menuMsgBoxAddRoutingRule.Click += new System.EventHandler(this.menuMsgBoxAddRoutingRule_Click);
+            // 
+            // menuMsgBoxFilter
+            // 
+            resources.ApplyResources(this.menuMsgBoxFilter, "menuMsgBoxFilter");
+            this.menuMsgBoxFilter.Name = "menuMsgBoxFilter";
+            this.menuMsgBoxFilter.Click += new System.EventHandler(this.menuMsgBoxFilter_Click);
+            // 
+            // ssMain
+            // 
+            resources.ApplyResources(this.ssMain, "ssMain");
+            this.ssMain.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.ssMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.toolSslInboundInfo,
+            this.toolSslBlank1,
+            this.toolSslRoutingRule,
+            this.toolSslBlank2,
+            this.toolSslServerSpeed,
+            this.toolSslBlank4});
+            this.ssMain.Name = "ssMain";
+            this.ssMain.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.ssMain_ItemClicked);
+            // 
+            // toolSslInboundInfo
+            // 
+            resources.ApplyResources(this.toolSslInboundInfo, "toolSslInboundInfo");
+            this.toolSslInboundInfo.Name = "toolSslInboundInfo";
+            // 
+            // toolSslBlank1
+            // 
+            resources.ApplyResources(this.toolSslBlank1, "toolSslBlank1");
+            this.toolSslBlank1.Name = "toolSslBlank1";
+            this.toolSslBlank1.Spring = true;
+            // 
+            // toolSslRoutingRule
+            // 
+            resources.ApplyResources(this.toolSslRoutingRule, "toolSslRoutingRule");
+            this.toolSslRoutingRule.Name = "toolSslRoutingRule";
+            // 
+            // toolSslBlank2
+            // 
+            resources.ApplyResources(this.toolSslBlank2, "toolSslBlank2");
+            this.toolSslBlank2.Name = "toolSslBlank2";
+            this.toolSslBlank2.Spring = true;
+            // 
+            // toolSslServerSpeed
+            // 
+            resources.ApplyResources(this.toolSslServerSpeed, "toolSslServerSpeed");
+            this.toolSslServerSpeed.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
+            this.toolSslServerSpeed.Name = "toolSslServerSpeed";
+            // 
+            // toolSslBlank4
+            // 
+            resources.ApplyResources(this.toolSslBlank4, "toolSslBlank4");
+            this.toolSslBlank4.Name = "toolSslBlank4";
+            // 
             // notifyMain
             // 
             resources.ApplyResources(this.notifyMain, "notifyMain");
@@ -417,6 +562,7 @@
             this.menuSysAgentMode,
             this.menuRoutings,
             this.menuServers,
+            this.menuServers2,
             this.toolStripSeparator13,
             this.menuAddServers2,
             this.menuScanScreen2,
@@ -465,6 +611,14 @@
             resources.ApplyResources(this.menuServers, "menuServers");
             this.menuServers.Name = "menuServers";
             // 
+            // menuServers2
+            // 
+            resources.ApplyResources(this.menuServers2, "menuServers2");
+            this.menuServers2.BackColor = System.Drawing.SystemColors.Window;
+            this.menuServers2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.menuServers2.DropDownWidth = 500;
+            this.menuServers2.Name = "menuServers2";
+            // 
             // toolStripSeparator13
             // 
             resources.ApplyResources(this.toolStripSeparator13, "toolStripSeparator13");
@@ -505,96 +659,6 @@
             this.bgwScan.DoWork += new System.ComponentModel.DoWorkEventHandler(this.bgwScan_DoWork);
             this.bgwScan.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.bgwScan_ProgressChanged);
             // 
-            // groupBox1
-            // 
-            resources.ApplyResources(this.groupBox1, "groupBox1");
-            this.groupBox1.Controls.Add(this.scMain);
-            this.groupBox1.Name = "groupBox1";
-            this.groupBox1.TabStop = false;
-            // 
-            // groupBox2
-            // 
-            resources.ApplyResources(this.groupBox2, "groupBox2");
-            this.groupBox2.Controls.Add(this.txtMsgBox);
-            this.groupBox2.Controls.Add(this.ssMain);
-            this.groupBox2.Name = "groupBox2";
-            this.groupBox2.TabStop = false;
-            // 
-            // txtMsgBox
-            // 
-            resources.ApplyResources(this.txtMsgBox, "txtMsgBox");
-            this.txtMsgBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(49)))), ((int)(((byte)(52)))));
-            this.txtMsgBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.txtMsgBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(226)))), ((int)(((byte)(228)))));
-            this.txtMsgBox.Name = "txtMsgBox";
-            this.txtMsgBox.ReadOnly = true;
-            // 
-            // ssMain
-            // 
-            resources.ApplyResources(this.ssMain, "ssMain");
-            this.ssMain.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.ssMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.toolSslSocksPortLab,
-            this.toolSslSocksPort,
-            this.toolSslBlank1,
-            this.toolSslHttpPortLab,
-            this.toolSslHttpPort,
-            this.toolSslBlank2,
-            this.toolSslBlank3,
-            this.toolSslServerSpeed,
-            this.toolSslBlank4});
-            this.ssMain.Name = "ssMain";
-            this.ssMain.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.ssMain_ItemClicked);
-            // 
-            // toolSslSocksPortLab
-            // 
-            resources.ApplyResources(this.toolSslSocksPortLab, "toolSslSocksPortLab");
-            this.toolSslSocksPortLab.Name = "toolSslSocksPortLab";
-            // 
-            // toolSslSocksPort
-            // 
-            resources.ApplyResources(this.toolSslSocksPort, "toolSslSocksPort");
-            this.toolSslSocksPort.Name = "toolSslSocksPort";
-            // 
-            // toolSslBlank1
-            // 
-            resources.ApplyResources(this.toolSslBlank1, "toolSslBlank1");
-            this.toolSslBlank1.Name = "toolSslBlank1";
-            this.toolSslBlank1.Spring = true;
-            // 
-            // toolSslHttpPortLab
-            // 
-            resources.ApplyResources(this.toolSslHttpPortLab, "toolSslHttpPortLab");
-            this.toolSslHttpPortLab.Name = "toolSslHttpPortLab";
-            // 
-            // toolSslHttpPort
-            // 
-            resources.ApplyResources(this.toolSslHttpPort, "toolSslHttpPort");
-            this.toolSslHttpPort.Name = "toolSslHttpPort";
-            // 
-            // toolSslBlank2
-            // 
-            resources.ApplyResources(this.toolSslBlank2, "toolSslBlank2");
-            this.toolSslBlank2.Name = "toolSslBlank2";
-            this.toolSslBlank2.Spring = true;
-            // 
-            // toolSslBlank3
-            // 
-            resources.ApplyResources(this.toolSslBlank3, "toolSslBlank3");
-            this.toolSslBlank3.Name = "toolSslBlank3";
-            this.toolSslBlank3.Spring = true;
-            // 
-            // toolSslServerSpeed
-            // 
-            resources.ApplyResources(this.toolSslServerSpeed, "toolSslServerSpeed");
-            this.toolSslServerSpeed.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Text;
-            this.toolSslServerSpeed.Name = "toolSslServerSpeed";
-            // 
-            // toolSslBlank4
-            // 
-            resources.ApplyResources(this.toolSslBlank4, "toolSslBlank4");
-            this.toolSslBlank4.Name = "toolSslBlank4";
-            // 
             // panel1
             // 
             resources.ApplyResources(this.panel1, "panel1");
@@ -668,7 +732,9 @@
             resources.ApplyResources(this.tsbSetting, "tsbSetting");
             this.tsbSetting.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbOptionSetting,
-            this.tsbRoutingSetting});
+            this.tsbRoutingSetting,
+            this.toolStripSeparator14,
+            this.tsbBackupGuiNConfig});
             this.tsbSetting.Image = global::v2rayN.Properties.Resources.option;
             this.tsbSetting.Name = "tsbSetting";
             // 
@@ -684,6 +750,17 @@
             this.tsbRoutingSetting.Name = "tsbRoutingSetting";
             this.tsbRoutingSetting.Click += new System.EventHandler(this.tsbRoutingSetting_Click);
             // 
+            // toolStripSeparator14
+            // 
+            resources.ApplyResources(this.toolStripSeparator14, "toolStripSeparator14");
+            this.toolStripSeparator14.Name = "toolStripSeparator14";
+            // 
+            // tsbBackupGuiNConfig
+            // 
+            resources.ApplyResources(this.tsbBackupGuiNConfig, "tsbBackupGuiNConfig");
+            this.tsbBackupGuiNConfig.Name = "tsbBackupGuiNConfig";
+            this.tsbBackupGuiNConfig.Click += new System.EventHandler(this.tsbBackupGuiNConfig_Click);
+            // 
             // toolStripSeparator5
             // 
             resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5");
@@ -706,7 +783,10 @@
             this.tsbCheckUpdate.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbCheckUpdateN,
             this.tsbCheckUpdateCore,
-            this.tsbCheckUpdateXrayCore});
+            this.tsbCheckUpdateXrayCore,
+            this.toolStripSeparator15,
+            this.tsbCheckUpdateGeoSite,
+            this.tsbCheckUpdateGeoIP});
             this.tsbCheckUpdate.Image = global::v2rayN.Properties.Resources.checkupdate;
             this.tsbCheckUpdate.Name = "tsbCheckUpdate";
             // 
@@ -728,6 +808,23 @@
             this.tsbCheckUpdateXrayCore.Name = "tsbCheckUpdateXrayCore";
             this.tsbCheckUpdateXrayCore.Click += new System.EventHandler(this.tsbCheckUpdateXrayCore_Click);
             // 
+            // toolStripSeparator15
+            // 
+            resources.ApplyResources(this.toolStripSeparator15, "toolStripSeparator15");
+            this.toolStripSeparator15.Name = "toolStripSeparator15";
+            // 
+            // tsbCheckUpdateGeoSite
+            // 
+            resources.ApplyResources(this.tsbCheckUpdateGeoSite, "tsbCheckUpdateGeoSite");
+            this.tsbCheckUpdateGeoSite.Name = "tsbCheckUpdateGeoSite";
+            this.tsbCheckUpdateGeoSite.Click += new System.EventHandler(this.tsbCheckUpdateGeoSite_Click);
+            // 
+            // tsbCheckUpdateGeoIP
+            // 
+            resources.ApplyResources(this.tsbCheckUpdateGeoIP, "tsbCheckUpdateGeoIP");
+            this.tsbCheckUpdateGeoIP.Name = "tsbCheckUpdateGeoIP";
+            this.tsbCheckUpdateGeoIP.Click += new System.EventHandler(this.tsbCheckUpdateGeoIP_Click);
+            // 
             // toolStripSeparator10
             // 
             resources.ApplyResources(this.toolStripSeparator10, "toolStripSeparator10");
@@ -797,8 +894,7 @@
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.Controls.Add(this.groupBox1);
-            this.Controls.Add(this.groupBox2);
+            this.Controls.Add(this.splitContainer1);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.tsMain);
             this.MaximizeBox = true;
@@ -814,12 +910,17 @@
             ((System.ComponentModel.ISupportInitialize)(this.scMain)).EndInit();
             this.scMain.ResumeLayout(false);
             this.cmsLv.ResumeLayout(false);
-            this.cmsMain.ResumeLayout(false);
+            this.splitContainer1.Panel1.ResumeLayout(false);
+            this.splitContainer1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainer1)).EndInit();
+            this.splitContainer1.ResumeLayout(false);
             this.groupBox1.ResumeLayout(false);
-            this.groupBox2.ResumeLayout(false);
-            this.groupBox2.PerformLayout();
+            this.gbMsgTitle.ResumeLayout(false);
+            this.gbMsgTitle.PerformLayout();
+            this.cmsMsgBox.ResumeLayout(false);
             this.ssMain.ResumeLayout(false);
             this.ssMain.PerformLayout();
+            this.cmsMain.ResumeLayout(false);
             this.tsMain.ResumeLayout(false);
             this.tsMain.PerformLayout();
             this.ResumeLayout(false);
@@ -830,7 +931,7 @@
 #endregion
 
         private System.Windows.Forms.GroupBox groupBox1;
-        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.GroupBox gbMsgTitle;
         private System.Windows.Forms.TextBox txtMsgBox;
         private v2rayN.Base.ListViewFlickerFree lvServers;
         private System.Windows.Forms.NotifyIcon notifyMain;
@@ -894,13 +995,7 @@
         private System.Windows.Forms.ToolStripButton tsbPromotion;
         private System.Windows.Forms.ToolStripMenuItem menuAddSocksServer;
         private System.Windows.Forms.StatusStrip ssMain;
-        private System.Windows.Forms.ToolStripStatusLabel toolSslSocksPort;
-        private System.Windows.Forms.ToolStripStatusLabel toolSslHttpPort;
-        private System.Windows.Forms.ToolStripStatusLabel toolSslBlank2;
         private System.Windows.Forms.ToolStripStatusLabel toolSslBlank1;
-        private System.Windows.Forms.ToolStripStatusLabel toolSslBlank3;
-        private System.Windows.Forms.ToolStripStatusLabel toolSslSocksPortLab;
-        private System.Windows.Forms.ToolStripStatusLabel toolSslHttpPortLab;
         private System.Windows.Forms.ToolStripStatusLabel toolSslServerSpeed;
         private System.Windows.Forms.ToolStripStatusLabel toolSslBlank4;
         private System.Windows.Forms.ToolStripMenuItem menuRemoveDuplicateServer;
@@ -921,6 +1016,22 @@
         private System.Windows.Forms.ToolStripMenuItem menuClearServerStatistics;
         private System.Windows.Forms.ToolStripMenuItem menuRoutings;
         private System.Windows.Forms.ToolStripSeparator toolStripSeparator13;
+        private System.Windows.Forms.ContextMenuStrip cmsMsgBox;
+        private System.Windows.Forms.ToolStripMenuItem menuMsgBoxSelectAll;
+        private System.Windows.Forms.ToolStripMenuItem menuMsgBoxCopy;
+        private System.Windows.Forms.ToolStripMenuItem menuMsgBoxAddRoutingRule;
+        private System.Windows.Forms.ToolStripMenuItem menuMsgBoxCopyAll;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator14;
+        private System.Windows.Forms.ToolStripMenuItem tsbBackupGuiNConfig;
+        private System.Windows.Forms.ToolStripSeparator toolStripSeparator15;
+        private System.Windows.Forms.ToolStripMenuItem tsbCheckUpdateGeoSite;
+        private System.Windows.Forms.ToolStripMenuItem tsbCheckUpdateGeoIP;
+        private System.Windows.Forms.SplitContainer splitContainer1;
+        private System.Windows.Forms.ToolStripMenuItem menuMsgBoxFilter;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslInboundInfo;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslRoutingRule;
+        private System.Windows.Forms.ToolStripStatusLabel toolSslBlank2;
+        private System.Windows.Forms.ToolStripComboBox menuServers2;
     }
 }
 

v2rayN/v2rayN/Forms/MainForm.cs

@@ -11,6 +11,7 @@ using v2rayN.Tool;
 using System.Diagnostics;
 using System.Drawing;
 using System.Net;
+using System.Text.RegularExpressions;
 
 namespace v2rayN.Forms
 {
@@ -19,6 +20,7 @@ namespace v2rayN.Forms
         private V2rayHandler v2rayHandler;
         private List<int> lvSelecteds = new List<int>();
         private StatisticsHandler statistics = null;
+        private string MsgFilter = string.Empty;
 
         #region Window 事件
 
@@ -33,21 +35,20 @@ namespace v2rayN.Forms
 
             Application.ApplicationExit += (sender, args) =>
             {
-                v2rayHandler.V2rayStop();
-
-                //HttpProxyHandle.CloseHttpAgent(config);
-                HttpProxyHandle.UpdateSysProxy(config, true);
-
-                ConfigHandler.SaveConfig(ref config);
-                statistics?.SaveToFile();
-                statistics?.Close();
+                MyAppExit(false);
             };
         }
 
         private void MainForm_Load(object sender, EventArgs e)
         {
-            ConfigHandler.LoadConfig(ref config);
+            if (ConfigHandler.LoadConfig(ref config) != 0)
+            {
+                UI.ShowWarning($"Loading GUI configuration file is abnormal,please restart the application{Environment.NewLine}加载GUI配置文件异常,请重启应用");
+                Environment.Exit(0);
+                return;
+            }
             ConfigHandler.InitBuiltinRouting(ref config);
+            MainFormHandler.Instance.BackupGuiNConfig(config, true);
             v2rayHandler = new V2rayHandler();
             v2rayHandler.ProcessEvent += v2rayHandler_ProcessEvent;
 
@@ -55,6 +56,7 @@ namespace v2rayN.Forms
             {
                 statistics = new StatisticsHandler(config, UpdateStatisticsHandler);
             }
+            MainFormHandler.Instance.UpdateTask(config, UpdateTaskHandler);
         }
 
         private void MainForm_VisibleChanged(object sender, EventArgs e)
@@ -85,12 +87,21 @@ namespace v2rayN.Forms
 
         private void MainForm_FormClosing(object sender, FormClosingEventArgs e)
         {
-            if (e.CloseReason == CloseReason.UserClosing)
+            switch (e.CloseReason)
             {
-                StorageUI();
-                e.Cancel = true;
-                HideForm();
-                return;
+                case CloseReason.UserClosing:
+                    StorageUI();
+                    e.Cancel = true;
+                    HideForm();
+                    break;
+                case CloseReason.ApplicationExitCall:
+                case CloseReason.FormOwnerClosing:
+                case CloseReason.TaskManagerClosing:
+                    MyAppExit(false);
+                    break;
+                case CloseReason.WindowsShutDown:
+                    MyAppExit(true);
+                    break;
             }
         }
 
@@ -105,26 +116,28 @@ namespace v2rayN.Forms
 
             //}
         }
+        private void MyAppExit(bool blWindowsShutDown)
+        {
+            try
+            {
+                v2rayHandler.V2rayStop();
 
+                //HttpProxyHandle.CloseHttpAgent(config);
+                if (blWindowsShutDown)
+                {
+                    HttpProxyHandle.ResetIEProxy4WindowsShutDown();
+                }
+                else
+                {
+                    HttpProxyHandle.UpdateSysProxy(config, true);
+                }
 
-        //private const int WM_QUERYENDSESSION = 0x0011;
-        //protected override void WndProc(ref Message m)
-        //{
-        //    switch (m.Msg)
-        //    {
-        //        case WM_QUERYENDSESSION:
-        //            Utils.SaveLog("Windows shutdown UnsetProxy");
-
-        //            ConfigHandler.ToJsonFile(config);
-        //            statistics?.SaveToFile();
-        //            ProxySetting.UnsetProxy();
-        //            m.Result = (IntPtr)1;
-        //            break;
-        //        default:
-        //            base.WndProc(ref m);
-        //            break;
-        //    }
-        //}
+                ConfigHandler.SaveConfig(ref config);
+                statistics?.SaveToFile();
+                statistics?.Close();
+            }
+            catch { }
+        }
 
         private void RestoreUI()
         {
@@ -189,6 +202,7 @@ namespace v2rayN.Forms
             lvServers.Columns.Add(UIRes.I18N("LvPort"), 50);
             lvServers.Columns.Add(UIRes.I18N("LvEncryptionMethod"), 90);
             lvServers.Columns.Add(UIRes.I18N("LvTransportProtocol"), 70);
+            lvServers.Columns.Add(UIRes.I18N("LvTLS"), 70);
             lvServers.Columns.Add(UIRes.I18N("LvSubscription"), 50);
             lvServers.Columns.Add(UIRes.I18N("LvTestResults"), 70, HorizontalAlignment.Right);
 
@@ -245,6 +259,7 @@ namespace v2rayN.Forms
                 Utils.AddSubItem(lvItem, EServerColName.port.ToString(), item.port.ToString());
                 Utils.AddSubItem(lvItem, EServerColName.security.ToString(), item.security);
                 Utils.AddSubItem(lvItem, EServerColName.network.ToString(), item.network);
+                Utils.AddSubItem(lvItem, EServerColName.streamSecurity.ToString(), item.streamSecurity);
                 Utils.AddSubItem(lvItem, EServerColName.subRemarks.ToString(), item.getSubRemarks(config));
                 Utils.AddSubItem(lvItem, EServerColName.testResult.ToString(), item.testResult);
                 if (stats)
@@ -283,25 +298,56 @@ namespace v2rayN.Forms
         private void RefreshServersMenu()
         {
             menuServers.DropDownItems.Clear();
+            menuServers2.SelectedIndexChanged -= MenuServers2_SelectedIndexChanged;
+            menuServers2.Items.Clear();
+            menuServers.Visible = false;
+            menuServers2.Visible = false;
 
-            List<ToolStripMenuItem> lst = new List<ToolStripMenuItem>();
-            for (int k = 0; k < config.vmess.Count; k++)
+            if (config.vmess.Count > 20)
             {
-                VmessItem item = config.vmess[k];
-                string name = item.getSummary();
+                for (int k = 0; k < config.vmess.Count; k++)
+                {
+                    VmessItem item = config.vmess[k];
+                    string name = item.getSummary();
+
+                    if (config.index.Equals(k))
+                    {
+                        name = $"√ {name}";
+                    }
+                    menuServers2.Items.Add(name);
 
-                ToolStripMenuItem ts = new ToolStripMenuItem(name)
-                {
-                    Tag = k
-                };
-                if (config.index.Equals(k))
-                {
-                    ts.Checked = true;
                 }
-                ts.Click += new EventHandler(ts_Click);
-                lst.Add(ts);
+                menuServers2.SelectedIndex = config.index;
+                menuServers2.SelectedIndexChanged += MenuServers2_SelectedIndexChanged;
+                menuServers2.Visible = true;
             }
-            menuServers.DropDownItems.AddRange(lst.ToArray());
+            else
+            {
+                List<ToolStripMenuItem> lst = new List<ToolStripMenuItem>();
+                for (int k = 0; k < config.vmess.Count; k++)
+                {
+                    VmessItem item = config.vmess[k];
+                    string name = item.getSummary();
+
+                    ToolStripMenuItem ts = new ToolStripMenuItem(name)
+                    {
+                        Tag = k
+                    };
+                    if (config.index.Equals(k))
+                    {
+                        ts.Checked = true;
+                    }
+                    ts.Click += new EventHandler(ts_Click);
+                    lst.Add(ts);
+                }
+                menuServers.DropDownItems.AddRange(lst.ToArray());
+                menuServers.Visible = true;
+            }
+        }
+
+        private void MenuServers2_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            SetDefaultServer(((ToolStripComboBox)sender).SelectedIndex);
         }
 
         private void ts_Click(object sender, EventArgs e)
@@ -339,8 +385,8 @@ namespace v2rayN.Forms
 
         private void DisplayToolStatus()
         {
-            toolSslSocksPort.Text = $"{Global.Loopback}:{config.inbound[0].localPort}";
-            toolSslHttpPort.Text = $"{Global.Loopback}:{Global.httpPort}";
+            toolSslInboundInfo.Text = $"{Global.InboundSocks} {Global.Loopback}:{config.inbound[0].localPort} | "
+             + $"{ Global.InboundHttp} { Global.Loopback}:{Global.httpPort}";
 
             notifyMain.Icon = MainFormHandler.Instance.GetNotifyIcon(config, this.Icon);
         }
@@ -565,24 +611,18 @@ namespace v2rayN.Forms
             {
                 return;
             }
-            for (int k = lvSelecteds.Count - 1; k >= 0; k--)
-            {
-                ConfigHandler.RemoveServer(ref config, lvSelecteds[k]);
-            }
+
+            ConfigHandler.RemoveServer(ref config, lvSelecteds);
+
             RefreshServers();
             LoadV2ray();
-
         }
 
         private void menuRemoveDuplicateServer_Click(object sender, EventArgs e)
         {
-            Utils.DedupServerList(config.vmess, out List<VmessItem> servers, config.keepOlderDedupl);
             int oldCount = config.vmess.Count;
-            int newCount = servers.Count;
-            if (servers != null)
-            {
-                config.vmess = servers;
-            }
+            ConfigHandler.DedupServerList(ref config);
+            int newCount = config.vmess.Count;
             RefreshServers();
             LoadV2ray();
             UI.Show(string.Format(UIRes.I18N("RemoveDuplicateServerResult"), oldCount, newCount));
@@ -655,7 +695,8 @@ namespace v2rayN.Forms
 
         private void tsbTestMe_Click(object sender, EventArgs e)
         {
-            string result = httpProxyTest() + "ms";
+            SpeedtestHandler statistics = new SpeedtestHandler(ref config);
+            string result = statistics.RunAvailabilityCheck() + "ms";
             AppendText(false, string.Format(UIRes.I18N("TestMeOutput"), result));
         }
 
@@ -667,12 +708,6 @@ namespace v2rayN.Forms
             }
         }
 
-        private int httpProxyTest()
-        {
-            SpeedtestHandler statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "", UpdateSpeedtestHandler);
-            return statistics.RunAvailabilityCheck();
-        }
-
         private void menuExport2ClientConfig_Click(object sender, EventArgs e)
         {
             int index = GetLvSelectedIndex();
@@ -883,6 +918,10 @@ namespace v2rayN.Forms
             UpdateSubscriptionProcess();
         }
 
+        private void tsbBackupGuiNConfig_Click(object sender, EventArgs e)
+        {
+            MainFormHandler.Instance.BackupGuiNConfig(config);
+        }
         #endregion
 
 
@@ -922,6 +961,13 @@ namespace v2rayN.Forms
             }
             else
             {
+                if (!Utils.IsNullOrEmpty(MsgFilter))
+                {
+                    if (!Regex.IsMatch(text, MsgFilter))
+                    {
+                        return;
+                    }
+                }
                 //this.txtMsgBox.AppendText(text);
                 ShowMsg(text);
             }
@@ -949,7 +995,10 @@ namespace v2rayN.Forms
         /// </summary>
         private void ClearMsg()
         {
-            this.txtMsgBox.Clear();
+            txtMsgBox.Invoke((Action)delegate
+            {
+                txtMsgBox.Clear();
+            });
         }
 
         /// <summary>
@@ -1072,6 +1121,15 @@ namespace v2rayN.Forms
             }
         }
 
+        private void UpdateTaskHandler(bool success, string msg)
+        {
+            AppendText(false, msg);
+            if (success)
+            {
+                Global.reloadV2ray = true;
+                LoadV2ray();
+            }
+        }
         #endregion
 
         #region 移动服务器
@@ -1168,88 +1226,17 @@ namespace v2rayN.Forms
 
         #region CheckUpdate
 
-        private void askToDownload(DownloadHandle downloadHandle, string url)
-        {
-            if (UI.ShowYesNo(string.Format(UIRes.I18N("DownloadYesNo"), url)) == DialogResult.Yes)
-            {
-                if (httpProxyTest() > 0)
-                {
-                    int httpPort = config.GetLocalPort(Global.InboundHttp);
-                    WebProxy webProxy = new WebProxy(Global.Loopback, httpPort);
-                    downloadHandle.DownloadFileAsync(url, webProxy, 600);
-                }
-                else
-                {
-                    downloadHandle.DownloadFileAsync(url, null, 600);
-                }
-            }
-        }
         private void tsbCheckUpdateN_Click(object sender, EventArgs e)
         {
-            //System.Diagnostics.Process.Start(Global.UpdateUrl);
-            DownloadHandle downloadHandle = null;
-            if (downloadHandle == null)
+            void _updateUI(bool success, string msg)
             {
-                downloadHandle = new DownloadHandle();
-                downloadHandle.AbsoluteCompleted += (sender2, args) =>
+                AppendText(false, msg);
+                if (success)
                 {
-                    if (args.Success)
-                    {
-                        AppendText(false, string.Format(UIRes.I18N("MsgParsingSuccessfully"), "v2rayN"));
-
-                        string url = args.Msg;
-                        this.Invoke((MethodInvoker)(delegate
-                        {
-                            askToDownload(downloadHandle, url);
-                        }));
-                    }
-                    else
-                    {
-                        AppendText(false, args.Msg);
-                    }
-                };
-                downloadHandle.UpdateCompleted += (sender2, args) =>
-                {
-                    if (args.Success)
-                    {
-                        AppendText(false, UIRes.I18N("MsgDownloadV2rayCoreSuccessfully"));
-
-                        try
-                        {
-                            string fileName = Utils.GetPath(downloadHandle.DownloadFileName);
-                            Process process = new Process
-                            {
-                                StartInfo = new ProcessStartInfo
-                                {
-                                    FileName = "v2rayUpgrade.exe",
-                                    Arguments = "\"" + fileName + "\"",
-                                    WorkingDirectory = Utils.StartupPath()
-                                }
-                            };
-                            process.Start();
-                            if (process.Id > 0)
-                            {
-                                menuExit_Click(null, null);
-                            }
-                        }
-                        catch (Exception ex)
-                        {
-                            AppendText(false, ex.Message);
-                        }
-                    }
-                    else
-                    {
-                        AppendText(false, args.Msg);
-                    }
-                };
-                downloadHandle.Error += (sender2, args) =>
-                {
-                    AppendText(true, args.GetException().Message);
-                };
-            }
-
-            AppendText(false, string.Format(UIRes.I18N("MsgStartUpdating"), "v2rayN"));
-            downloadHandle.CheckUpdateAsync("v2rayN");
+                    menuExit_Click(null, null);
+                }
+            };
+            (new UpdateHandle()).CheckUpdateGuiN(config, _updateUI);
         }
 
         private void tsbCheckUpdateCore_Click(object sender, EventArgs e)
@@ -1264,67 +1251,51 @@ namespace v2rayN.Forms
 
         private void CheckUpdateCore(string type)
         {
-            DownloadHandle downloadHandle = null;
-            if (downloadHandle == null)
+            void _updateUI(bool success, string msg)
             {
-                downloadHandle = new DownloadHandle();
-                downloadHandle.AbsoluteCompleted += (sender2, args) =>
+                AppendText(false, msg);
+                if (success)
                 {
-                    if (args.Success)
-                    {
-                        AppendText(false, string.Format(UIRes.I18N("MsgParsingSuccessfully"), "v2rayCore"));
+                    CloseV2ray();
 
-                        string url = args.Msg;
-                        this.Invoke((MethodInvoker)(delegate
-                        {
-                            askToDownload(downloadHandle, url);
-                        }));
-                    }
-                    else
-                    {
-                        AppendText(false, args.Msg);
-                    }
-                };
-                downloadHandle.UpdateCompleted += (sender2, args) =>
+                    string fileName = Utils.GetPath(Utils.GetDownloadFileName(msg));
+                    FileManager.ZipExtractToFile(fileName, config.ignoreGeoUpdateCore ? "geo" : "");
+
+                    AppendText(false, UIRes.I18N("MsgUpdateV2rayCoreSuccessfullyMore"));
+
+                    Global.reloadV2ray = true;
+                    LoadV2ray();
+
+                    AppendText(false, UIRes.I18N("MsgUpdateV2rayCoreSuccessfully"));
+                }
+            };
+            (new UpdateHandle()).CheckUpdateCore(type, config, _updateUI);
+        }
+
+        private void tsbCheckUpdateGeoSite_Click(object sender, EventArgs e)
+        {
+            (new UpdateHandle()).UpdateGeoFile("geosite", config, (bool success, string msg) =>
+            {
+                AppendText(false, msg);
+                if (success)
                 {
-                    if (args.Success)
-                    {
-                        AppendText(false, UIRes.I18N("MsgDownloadV2rayCoreSuccessfully"));
-                        AppendText(false, UIRes.I18N("MsgUnpacking"));
+                    Global.reloadV2ray = true;
+                    LoadV2ray();
+                }
+            });
+        }
 
-                        try
-                        {
-                            CloseV2ray();
-
-                            string fileName = downloadHandle.DownloadFileName;
-                            fileName = Utils.GetPath(fileName);
-                            FileManager.ZipExtractToFile(fileName, config.ignoreGeoUpdateCore ? "geo" : "");
-
-                            AppendText(false, UIRes.I18N("MsgUpdateV2rayCoreSuccessfullyMore"));
-
-                            Global.reloadV2ray = true;
-                            LoadV2ray();
-
-                            AppendText(false, UIRes.I18N("MsgUpdateV2rayCoreSuccessfully"));
-                        }
-                        catch (Exception ex)
-                        {
-                            AppendText(false, ex.Message);
-                        }
-                    }
-                    else
-                    {
-                        AppendText(false, args.Msg);
-                    }
-                };
-                downloadHandle.Error += (sender2, args) =>
+        private void tsbCheckUpdateGeoIP_Click(object sender, EventArgs e)
+        {
+            (new UpdateHandle()).UpdateGeoFile("geoip", config, (bool success, string msg) =>
+            {
+                AppendText(false, msg);
+                if (success)
                 {
-                    AppendText(true, args.GetException().Message);
-                };
-            }
-
-            AppendText(false, string.Format(UIRes.I18N("MsgStartUpdating"), "v2rayCore"));
-            downloadHandle.CheckUpdateAsync(type);
+                    Global.reloadV2ray = true;
+                    LoadV2ray();
+                }
+            });
         }
         #endregion
 
@@ -1398,68 +1369,16 @@ namespace v2rayN.Forms
         /// </summary>
         private void UpdateSubscriptionProcess()
         {
-            AppendText(false, UIRes.I18N("MsgUpdateSubscriptionStart"));
-
-            if (config.subItem == null || config.subItem.Count <= 0)
+            void _updateUI(bool success, string msg)
             {
-                AppendText(false, UIRes.I18N("MsgNoValidSubscription"));
-                return;
-            }
-
-            for (int k = 1; k <= config.subItem.Count; k++)
-            {
-                string id = config.subItem[k - 1].id.TrimEx();
-                string url = config.subItem[k - 1].url.TrimEx();
-                string hashCode = $"{k}->";
-                if (config.subItem[k - 1].enabled == false)
+                AppendText(false, msg);
+                if (success)
                 {
-                    continue;
-                }
-                if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url))
-                {
-                    AppendText(false, $"{hashCode}{UIRes.I18N("MsgNoValidSubscription")}");
-                    continue;
+                    RefreshServers();
                 }
+            };
 
-                DownloadHandle downloadHandle3 = new DownloadHandle();
-                downloadHandle3.UpdateCompleted += (sender2, args) =>
-                {
-                    if (args.Success)
-                    {
-                        AppendText(false, $"{hashCode}{UIRes.I18N("MsgGetSubscriptionSuccessfully")}");
-                        string result = Utils.Base64Decode(args.Msg);
-                        if (Utils.IsNullOrEmpty(result))
-                        {
-                            AppendText(false, $"{hashCode}{UIRes.I18N("MsgSubscriptionDecodingFailed")}");
-                            return;
-                        }
-
-                        ConfigHandler.RemoveServerViaSubid(ref config, id);
-                        AppendText(false, $"{hashCode}{UIRes.I18N("MsgClearSubscription")}");
-                        RefreshServers();
-                        int ret = MainFormHandler.Instance.AddBatchServers(config, result, id);
-                        if (ret > 0)
-                        {
-                        }
-                        else
-                        {
-                            AppendText(false, $"{hashCode}{UIRes.I18N("MsgFailedImportSubscription")}");
-                        }
-                        AppendText(false, $"{hashCode}{UIRes.I18N("MsgUpdateSubscriptionEnd")}");
-                    }
-                    else
-                    {
-                        AppendText(false, args.Msg);
-                    }
-                };
-                downloadHandle3.Error += (sender2, args) =>
-                {
-                    AppendText(true, args.GetException().Message);
-                };
-
-                downloadHandle3.WebDownloadString(url);
-                AppendText(false, $"{hashCode}{UIRes.I18N("MsgStartGettingSubscriptions")}");
-            }
+            (new UpdateHandle()).UpdateSubscriptionProcess(config, _updateUI);
         }
 
         private void tsbQRCodeSwitch_CheckedChanged(object sender, EventArgs e)
@@ -1500,12 +1419,23 @@ namespace v2rayN.Forms
         /// </summary>
         private void RefreshRoutingsMenu()
         {
+            menuRoutings.Visible = config.enableRoutingAdvanced;
+            if (!config.enableRoutingAdvanced)
+            {
+                toolSslRoutingRule.Text = string.Empty;
+                return;
+            }
+
             menuRoutings.DropDownItems.Clear();
 
             List<ToolStripMenuItem> lst = new List<ToolStripMenuItem>();
             for (int k = 0; k < config.routings.Count; k++)
             {
                 var item = config.routings[k];
+                if (item.locked == true)
+                {
+                    continue;
+                }
                 string name = item.remarks;
 
                 ToolStripMenuItem ts = new ToolStripMenuItem(name)
@@ -1515,6 +1445,7 @@ namespace v2rayN.Forms
                 if (config.routingIndex.Equals(k))
                 {
                     ts.Checked = true;
+                    toolSslRoutingRule.Text = item.remarks;
                 }
                 ts.Click += new EventHandler(ts_Routing_Click);
                 lst.Add(ts);
@@ -1541,5 +1472,61 @@ namespace v2rayN.Forms
         }
         #endregion
 
+        #region MsgBoxMenu
+        private void menuMsgBoxSelectAll_Click(object sender, EventArgs e)
+        {
+            this.txtMsgBox.Focus();
+            this.txtMsgBox.SelectAll();
+        }
+
+        private void menuMsgBoxCopy_Click(object sender, EventArgs e)
+        {
+            var data = this.txtMsgBox.SelectedText.TrimEx();
+            Utils.SetClipboardData(data);
+        }
+
+        private void menuMsgBoxCopyAll_Click(object sender, EventArgs e)
+        {
+            var data = this.txtMsgBox.Text;
+            Utils.SetClipboardData(data);
+        }
+        private void menuMsgBoxAddRoutingRule_Click(object sender, EventArgs e)
+        {
+            menuMsgBoxCopy_Click(null, null);
+            tsbRoutingSetting_Click(null, null);
+        }
+
+        private void txtMsgBox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Control)
+            {
+                switch (e.KeyCode)
+                {
+                    case Keys.A:
+                        menuMsgBoxSelectAll_Click(null, null);
+                        break;
+                    case Keys.C:
+                        menuMsgBoxCopy_Click(null, null);
+                        break;
+                    case Keys.V:
+                        menuMsgBoxAddRoutingRule_Click(null, null);
+                        break;
+
+                }
+            }
+
+        }
+        private void menuMsgBoxFilter_Click(object sender, EventArgs e)
+        {
+            var fm = new MsgFilterSetForm();
+            fm.MsgFilter = MsgFilter;
+            if (fm.ShowDialog() == DialogResult.OK)
+            {
+                MsgFilter = fm.MsgFilter;
+                gbMsgTitle.Text = string.Format(UIRes.I18N("MsgInformationTitle"), MsgFilter);
+            }
+        }
+        #endregion
+
     }
 }

v2rayN/v2rayN/Forms/MainForm.zh-Hans.resx

@@ -292,6 +292,12 @@
   <data name="menuExport2SubContent.Text" xml:space="preserve">
     <value>批量导出订阅内容至剪贴板(多选)</value>
   </data>
+  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>73, 53</value>
+  </data>
+  <data name="tsbServer.Text" xml:space="preserve">
+    <value>  服务器  </value>
+  </data>
   <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
     <value>301, 622</value>
   </data>
@@ -312,11 +318,101 @@
         ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw==
 </value>
   </data>
-  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>73, 53</value>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>服务器列表</value>
   </data>
-  <data name="tsbServer.Text" xml:space="preserve">
-    <value>  服务器  </value>
+  <data name="gbMsgTitle.Text" xml:space="preserve">
+    <value>信息</value>
+  </data>
+  <data name="cmsMsgBox.Size" type="System.Drawing.Size, System.Drawing">
+    <value>222, 114</value>
+  </data>
+  <data name="menuMsgBoxSelectAll.Size" type="System.Drawing.Size, System.Drawing">
+    <value>221, 22</value>
+  </data>
+  <data name="menuMsgBoxSelectAll.Text" xml:space="preserve">
+    <value>全选 (Ctrl+A)</value>
+  </data>
+  <data name="menuMsgBoxCopy.Size" type="System.Drawing.Size, System.Drawing">
+    <value>221, 22</value>
+  </data>
+  <data name="menuMsgBoxCopy.Text" xml:space="preserve">
+    <value>复制 (Ctrl+C)</value>
+  </data>
+  <data name="menuMsgBoxCopyAll.Size" type="System.Drawing.Size, System.Drawing">
+    <value>221, 22</value>
+  </data>
+  <data name="menuMsgBoxCopyAll.Text" xml:space="preserve">
+    <value>复制所有</value>
+  </data>
+  <data name="menuMsgBoxAddRoutingRule.Size" type="System.Drawing.Size, System.Drawing">
+    <value>221, 22</value>
+  </data>
+  <data name="menuMsgBoxAddRoutingRule.Text" xml:space="preserve">
+    <value>快速添加路由规则 (Ctrl+V)</value>
+  </data>
+  <data name="menuMsgBoxFilter.Size" type="System.Drawing.Size, System.Drawing">
+    <value>221, 22</value>
+  </data>
+  <data name="menuMsgBoxFilter.Text" xml:space="preserve">
+    <value>设置信息过滤器</value>
+  </data>
+  <data name="toolSslServerSpeed.Text" xml:space="preserve">
+    <value>网速显示未启用</value>
+  </data>
+  <data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>260, 22</value>
+  </data>
+  <data name="menuSysAgentMode.Text" xml:space="preserve">
+    <value>系统代理</value>
+  </data>
+  <data name="menuRoutings.Size" type="System.Drawing.Size, System.Drawing">
+    <value>260, 22</value>
+  </data>
+  <data name="menuRoutings.Text" xml:space="preserve">
+    <value>路由</value>
+  </data>
+  <data name="menuServers.Size" type="System.Drawing.Size, System.Drawing">
+    <value>260, 22</value>
+  </data>
+  <data name="menuServers.Text" xml:space="preserve">
+    <value>服务器</value>
+  </data>
+  <data name="menuServers2.ToolTipText" xml:space="preserve">
+    <value>服务器</value>
+  </data>
+  <data name="toolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>257, 6</value>
+  </data>
+  <data name="menuAddServers2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>260, 22</value>
+  </data>
+  <data name="menuAddServers2.Text" xml:space="preserve">
+    <value>从剪贴板导入批量URL</value>
+  </data>
+  <data name="menuScanScreen2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>260, 22</value>
+  </data>
+  <data name="menuScanScreen2.Text" xml:space="preserve">
+    <value>扫描屏幕上的二维码</value>
+  </data>
+  <data name="menuUpdateSubscriptions.Size" type="System.Drawing.Size, System.Drawing">
+    <value>260, 22</value>
+  </data>
+  <data name="menuUpdateSubscriptions.Text" xml:space="preserve">
+    <value>更新订阅</value>
+  </data>
+  <data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>257, 6</value>
+  </data>
+  <data name="menuExit.Size" type="System.Drawing.Size, System.Drawing">
+    <value>260, 22</value>
+  </data>
+  <data name="menuExit.Text" xml:space="preserve">
+    <value>退出</value>
+  </data>
+  <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>261, 199</value>
   </data>
   <data name="menuKeepClear.Size" type="System.Drawing.Size, System.Drawing">
     <value>172, 22</value>
@@ -336,108 +432,57 @@
   <data name="menuKeepNothing.Text" xml:space="preserve">
     <value>不改变系统代理</value>
   </data>
-  <data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
-  </data>
-  <data name="menuSysAgentMode.Text" xml:space="preserve">
-    <value>系统代理</value>
-  </data>
-  <data name="menuRoutings.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
-  </data>
-  <data name="menuRoutings.Text" xml:space="preserve">
-    <value>路由</value>
-  </data>
-  <data name="menuServers.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
-  </data>
-  <data name="menuServers.Text" xml:space="preserve">
-    <value>服务器</value>
-  </data>
-  <data name="toolStripSeparator13.Size" type="System.Drawing.Size, System.Drawing">
-    <value>192, 6</value>
-  </data>
-  <data name="menuAddServers2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
-  </data>
-  <data name="menuAddServers2.Text" xml:space="preserve">
-    <value>从剪贴板导入批量URL</value>
-  </data>
-  <data name="menuScanScreen2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
-  </data>
-  <data name="menuScanScreen2.Text" xml:space="preserve">
-    <value>扫描屏幕上的二维码</value>
-  </data>
-  <data name="menuUpdateSubscriptions.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
-  </data>
-  <data name="menuUpdateSubscriptions.Text" xml:space="preserve">
-    <value>更新订阅</value>
-  </data>
-  <data name="toolStripSeparator2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>192, 6</value>
-  </data>
-  <data name="menuExit.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
-  </data>
-  <data name="menuExit.Text" xml:space="preserve">
-    <value>退出</value>
-  </data>
-  <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>196, 192</value>
-  </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>服务器列表</value>
-  </data>
-  <data name="toolSslServerSpeed.Text" xml:space="preserve">
-    <value>网速显示未启用</value>
-  </data>
-  <data name="groupBox2.Text" xml:space="preserve">
-    <value>信息</value>
-  </data>
-  <data name="tsbSubSetting.Size" type="System.Drawing.Size, System.Drawing">
-    <value>180, 22</value>
-  </data>
-  <data name="tsbSubSetting.Text" xml:space="preserve">
-    <value>订阅设置</value>
-  </data>
-  <data name="tsbSubUpdate.Size" type="System.Drawing.Size, System.Drawing">
-    <value>180, 22</value>
-  </data>
-  <data name="tsbSubUpdate.Text" xml:space="preserve">
-    <value>更新订阅</value>
-  </data>
   <data name="tsbSub.Size" type="System.Drawing.Size, System.Drawing">
     <value>61, 53</value>
   </data>
   <data name="tsbSub.Text" xml:space="preserve">
     <value>  订阅  </value>
   </data>
+  <data name="tsbSubSetting.Size" type="System.Drawing.Size, System.Drawing">
+    <value>124, 22</value>
+  </data>
+  <data name="tsbSubSetting.Text" xml:space="preserve">
+    <value>订阅设置</value>
+  </data>
+  <data name="tsbSubUpdate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>124, 22</value>
+  </data>
+  <data name="tsbSubUpdate.Text" xml:space="preserve">
+    <value>更新订阅</value>
+  </data>
   <data name="tsbQRCodeSwitch.Size" type="System.Drawing.Size, System.Drawing">
     <value>52, 53</value>
   </data>
   <data name="tsbQRCodeSwitch.Text" xml:space="preserve">
     <value>  分享  </value>
   </data>
-  <data name="tsbOptionSetting.Size" type="System.Drawing.Size, System.Drawing">
-    <value>124, 22</value>
-  </data>
-  <data name="tsbOptionSetting.Text" xml:space="preserve">
-    <value>参数设置</value>
-  </data>
-  <data name="tsbRoutingSetting.Size" type="System.Drawing.Size, System.Drawing">
-    <value>124, 22</value>
-  </data>
-  <data name="tsbRoutingSetting.Text" xml:space="preserve">
-    <value>路由设置</value>
-  </data>
   <data name="tsbSetting.Size" type="System.Drawing.Size, System.Drawing">
     <value>61, 53</value>
   </data>
   <data name="tsbSetting.Text" xml:space="preserve">
     <value>  设置  </value>
   </data>
+  <data name="tsbOptionSetting.Size" type="System.Drawing.Size, System.Drawing">
+    <value>189, 22</value>
+  </data>
+  <data name="tsbOptionSetting.Text" xml:space="preserve">
+    <value>参数设置</value>
+  </data>
+  <data name="tsbRoutingSetting.Size" type="System.Drawing.Size, System.Drawing">
+    <value>189, 22</value>
+  </data>
+  <data name="tsbRoutingSetting.Text" xml:space="preserve">
+    <value>路由设置</value>
+  </data>
+  <data name="toolStripSeparator14.Size" type="System.Drawing.Size, System.Drawing">
+    <value>186, 6</value>
+  </data>
+  <data name="tsbBackupGuiNConfig.Size" type="System.Drawing.Size, System.Drawing">
+    <value>189, 22</value>
+  </data>
+  <data name="tsbBackupGuiNConfig.Text" xml:space="preserve">
+    <value>备份v2rayN配置文件</value>
+  </data>
   <data name="tsbReload.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
@@ -455,35 +500,38 @@
   <data name="tsbReload.Text" xml:space="preserve">
     <value>  重启服务  </value>
   </data>
-  <data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing">
-    <value>135, 22</value>
-  </data>
-  <data name="tsbCheckUpdateN.Text" xml:space="preserve">
-    <value>v2rayN</value>
-  </data>
-  <data name="tsbCheckUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
-    <value>135, 22</value>
-  </data>
-  <data name="tsbCheckUpdateCore.Text" xml:space="preserve">
-    <value>v2fly-Core</value>
-  </data>
-  <data name="tsbCheckUpdateXrayCore.Size" type="System.Drawing.Size, System.Drawing">
-    <value>135, 22</value>
-  </data>
-  <data name="tsbCheckUpdateXrayCore.Text" xml:space="preserve">
-    <value>Xray-Core</value>
-  </data>
   <data name="tsbCheckUpdate.Size" type="System.Drawing.Size, System.Drawing">
     <value>85, 53</value>
   </data>
   <data name="tsbCheckUpdate.Text" xml:space="preserve">
     <value>  检查更新  </value>
   </data>
-  <data name="tsbAbout.Text" xml:space="preserve">
-    <value>v2rayN 项目</value>
+  <data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing">
+    <value>168, 22</value>
   </data>
-  <data name="tsbV2rayWebsite.Text" xml:space="preserve">
-    <value>V2Ray 官网</value>
+  <data name="tsbCheckUpdateN.Text" xml:space="preserve">
+    <value>v2rayN</value>
+  </data>
+  <data name="tsbCheckUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
+    <value>168, 22</value>
+  </data>
+  <data name="tsbCheckUpdateCore.Text" xml:space="preserve">
+    <value>v2fly-Core</value>
+  </data>
+  <data name="tsbCheckUpdateXrayCore.Size" type="System.Drawing.Size, System.Drawing">
+    <value>168, 22</value>
+  </data>
+  <data name="tsbCheckUpdateXrayCore.Text" xml:space="preserve">
+    <value>Xray-Core</value>
+  </data>
+  <data name="toolStripSeparator15.Size" type="System.Drawing.Size, System.Drawing">
+    <value>165, 6</value>
+  </data>
+  <data name="tsbCheckUpdateGeoSite.Size" type="System.Drawing.Size, System.Drawing">
+    <value>168, 22</value>
+  </data>
+  <data name="tsbCheckUpdateGeoIP.Size" type="System.Drawing.Size, System.Drawing">
+    <value>168, 22</value>
   </data>
   <data name="tsbHelp.Size" type="System.Drawing.Size, System.Drawing">
     <value>69, 53</value>
@@ -491,6 +539,12 @@
   <data name="tsbHelp.Text" xml:space="preserve">
     <value>   帮助   </value>
   </data>
+  <data name="tsbAbout.Text" xml:space="preserve">
+    <value>v2rayN 项目</value>
+  </data>
+  <data name="tsbV2rayWebsite.Text" xml:space="preserve">
+    <value>V2Ray 官网</value>
+  </data>
   <data name="tsbPromotion.Size" type="System.Drawing.Size, System.Drawing">
     <value>68, 53</value>
   </data>

v2rayN/v2rayN/Forms/MsgFilterSetForm.Designer.cs

@@ -0,0 +1,98 @@
+namespace v2rayN.Forms
+{
+    partial class MsgFilterSetForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MsgFilterSetForm));
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.txtMsgFilter = new System.Windows.Forms.TextBox();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.btnClose = new System.Windows.Forms.Button();
+            this.btnOK = new System.Windows.Forms.Button();
+            this.groupBox1.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // groupBox1
+            // 
+            resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Controls.Add(this.txtMsgFilter);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.TabStop = false;
+            // 
+            // txtMsgFilter
+            // 
+            resources.ApplyResources(this.txtMsgFilter, "txtMsgFilter");
+            this.txtMsgFilter.Name = "txtMsgFilter";
+            // 
+            // panel2
+            // 
+            resources.ApplyResources(this.panel2, "panel2");
+            this.panel2.Controls.Add(this.btnClose);
+            this.panel2.Controls.Add(this.btnOK);
+            this.panel2.Name = "panel2";
+            // 
+            // btnClose
+            // 
+            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);
+            // 
+            // btnOK
+            // 
+            resources.ApplyResources(this.btnOK, "btnOK");
+            this.btnOK.Name = "btnOK";
+            this.btnOK.UseVisualStyleBackColor = true;
+            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+            // 
+            // MsgFilterSetForm
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.groupBox1);
+            this.Controls.Add(this.panel2);
+            this.Name = "MsgFilterSetForm";
+            this.Load += new System.EventHandler(this.MsgFilterSetForm_Load);
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.TextBox txtMsgFilter;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Button btnClose;
+        private System.Windows.Forms.Button btnOK;
+    }
+}

v2rayN/v2rayN/Forms/MsgFilterSetForm.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Data;
+using System.Drawing;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace v2rayN.Forms
+{
+    public partial class MsgFilterSetForm : BaseForm
+    {
+        public string MsgFilter { get; set; }
+
+        public MsgFilterSetForm()
+        {
+            InitializeComponent();
+        }
+
+        private void MsgFilterSetForm_Load(object sender, EventArgs e)
+        {
+            txtMsgFilter.Text = MsgFilter;
+        }
+
+        private void btnOK_Click(object sender, EventArgs e)
+        {
+            MsgFilter = txtMsgFilter.Text;
+            this.DialogResult = DialogResult.OK;
+        }
+
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.Cancel;
+        }
+    }
+}

v2rayN/v2rayN/Forms/MsgFilterSetForm.resx

@@ -0,0 +1,267 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="&gt;&gt;txtMsgFilter.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;txtMsgFilter.Name" xml:space="preserve">
+    <value>txtMsgFilter</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>&amp;OK</value>
+  </data>
+  <data name="btnClose.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnClose.Text" xml:space="preserve">
+    <value>&amp;Cancel</value>
+  </data>
+  <data name="&gt;&gt;txtMsgFilter.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="txtMsgFilter.Location" type="System.Drawing.Point, System.Drawing">
+    <value>41, 29</value>
+  </data>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>490, 60</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="txtMsgFilter.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+    <value>396, 17</value>
+  </data>
+  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+    <value>9</value>
+  </data>
+  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="btnOK.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>MsgFilterSetForm</value>
+  </data>
+  <data name="txtMsgFilter.Size" type="System.Drawing.Size, System.Drawing">
+    <value>409, 21</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 76</value>
+  </data>
+  <data name="&gt;&gt;txtMsgFilter.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Bottom</value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>490, 76</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
+    <value>btnClose</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>Filter</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
+    <value>btnOK</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>490, 136</value>
+  </data>
+  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>303, 17</value>
+  </data>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
+  </data>
+  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>MsgFilterSetForm</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+</root>

v2rayN/v2rayN/Forms/MsgFilterSetForm.zh-Hans.resx

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="groupBox1.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>
+  <data name="$this.Text" xml:space="preserve">
+    <value>设置过滤器</value>
+  </data>
+</root>

v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs

@@ -69,6 +69,8 @@
             this.txtKcpmtu = new System.Windows.Forms.TextBox();
             this.label6 = new System.Windows.Forms.Label();
             this.tabPage7 = new System.Windows.Forms.TabPage();
+            this.txtautoUpdateInterval = new System.Windows.Forms.TextBox();
+            this.label15 = new System.Windows.Forms.Label();
             this.chkIgnoreGeoUpdateCore = new System.Windows.Forms.CheckBox();
             this.cmbCoreType = new System.Windows.Forms.ComboBox();
             this.label4 = new System.Windows.Forms.Label();
@@ -78,6 +80,11 @@
             this.chkEnableStatistics = new System.Windows.Forms.CheckBox();
             this.chkAllowLANConn = new System.Windows.Forms.CheckBox();
             this.chkAutoRun = new System.Windows.Forms.CheckBox();
+            this.tabPage3 = new System.Windows.Forms.TabPage();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.label13 = new System.Windows.Forms.Label();
+            this.label12 = new System.Windows.Forms.Label();
+            this.txtsystemProxyExceptions = new System.Windows.Forms.TextBox();
             this.panel2 = new System.Windows.Forms.Panel();
             this.btnOK = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
@@ -87,6 +94,8 @@
             this.tabPage2.SuspendLayout();
             this.tabPage6.SuspendLayout();
             this.tabPage7.SuspendLayout();
+            this.tabPage3.SuspendLayout();
+            this.groupBox2.SuspendLayout();
             this.panel2.SuspendLayout();
             this.SuspendLayout();
             // 
@@ -104,6 +113,7 @@
             this.tabControl1.Controls.Add(this.tabPage2);
             this.tabControl1.Controls.Add(this.tabPage6);
             this.tabControl1.Controls.Add(this.tabPage7);
+            this.tabControl1.Controls.Add(this.tabPage3);
             resources.ApplyResources(this.tabControl1, "tabControl1");
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
@@ -363,6 +373,8 @@
             // 
             // tabPage7
             // 
+            this.tabPage7.Controls.Add(this.txtautoUpdateInterval);
+            this.tabPage7.Controls.Add(this.label15);
             this.tabPage7.Controls.Add(this.chkIgnoreGeoUpdateCore);
             this.tabPage7.Controls.Add(this.cmbCoreType);
             this.tabPage7.Controls.Add(this.label4);
@@ -376,6 +388,16 @@
             this.tabPage7.Name = "tabPage7";
             this.tabPage7.UseVisualStyleBackColor = true;
             // 
+            // txtautoUpdateInterval
+            // 
+            resources.ApplyResources(this.txtautoUpdateInterval, "txtautoUpdateInterval");
+            this.txtautoUpdateInterval.Name = "txtautoUpdateInterval";
+            // 
+            // label15
+            // 
+            resources.ApplyResources(this.label15, "label15");
+            this.label15.Name = "label15";
+            // 
             // chkIgnoreGeoUpdateCore
             // 
             resources.ApplyResources(this.chkIgnoreGeoUpdateCore, "chkIgnoreGeoUpdateCore");
@@ -433,6 +455,37 @@
             this.chkAutoRun.Name = "chkAutoRun";
             this.chkAutoRun.UseVisualStyleBackColor = true;
             // 
+            // tabPage3
+            // 
+            this.tabPage3.Controls.Add(this.groupBox2);
+            resources.ApplyResources(this.tabPage3, "tabPage3");
+            this.tabPage3.Name = "tabPage3";
+            this.tabPage3.UseVisualStyleBackColor = true;
+            // 
+            // groupBox2
+            // 
+            this.groupBox2.Controls.Add(this.label13);
+            this.groupBox2.Controls.Add(this.label12);
+            this.groupBox2.Controls.Add(this.txtsystemProxyExceptions);
+            resources.ApplyResources(this.groupBox2, "groupBox2");
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.TabStop = false;
+            // 
+            // label13
+            // 
+            resources.ApplyResources(this.label13, "label13");
+            this.label13.Name = "label13";
+            // 
+            // label12
+            // 
+            resources.ApplyResources(this.label12, "label12");
+            this.label12.Name = "label12";
+            // 
+            // txtsystemProxyExceptions
+            // 
+            resources.ApplyResources(this.txtsystemProxyExceptions, "txtsystemProxyExceptions");
+            this.txtsystemProxyExceptions.Name = "txtsystemProxyExceptions";
+            // 
             // panel2
             // 
             this.panel2.Controls.Add(this.btnClose);
@@ -473,6 +526,9 @@
             this.tabPage6.PerformLayout();
             this.tabPage7.ResumeLayout(false);
             this.tabPage7.PerformLayout();
+            this.tabPage3.ResumeLayout(false);
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
             this.panel2.ResumeLayout(false);
             this.ResumeLayout(false);
 
@@ -532,5 +588,12 @@
         private System.Windows.Forms.ComboBox cmbCoreType;
         private System.Windows.Forms.Label label4;
         private System.Windows.Forms.CheckBox chkIgnoreGeoUpdateCore;
+        private System.Windows.Forms.TabPage tabPage3;
+        private System.Windows.Forms.TextBox txtsystemProxyExceptions;
+        private System.Windows.Forms.Label label12;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.Label label13;
+        private System.Windows.Forms.TextBox txtautoUpdateInterval;
+        private System.Windows.Forms.Label label15;
     }
 }

v2rayN/v2rayN/Forms/OptionSettingForm.cs

@@ -65,8 +65,9 @@ namespace v2rayN.Forms
             //remoteDNS
             txtremoteDNS.Text = config.remoteDNS;
 
-
             chkdefAllowInsecure.Checked = config.defAllowInsecure;
+
+            txtsystemProxyExceptions.Text = config.systemProxyExceptions;
         }
 
 
@@ -122,6 +123,7 @@ namespace v2rayN.Forms
 
             chkIgnoreGeoUpdateCore.Checked = config.ignoreGeoUpdateCore;
             cmbCoreType.SelectedIndex = (int)config.coreType;
+            txtautoUpdateInterval.Text = config.autoUpdateInterval.ToString();
         }
         private void btnOK_Click(object sender, EventArgs e)
         {
@@ -179,6 +181,21 @@ namespace v2rayN.Forms
                 UI.Show(UIRes.I18N("PleaseSelectProtocol"));
                 return -1;
             }
+
+            var remoteDNS = txtremoteDNS.Text.TrimEx();
+            var obj = Utils.ParseJson(remoteDNS);
+            if (obj != null && obj.ContainsKey("servers"))
+            {
+            }
+            else
+            {
+                if (remoteDNS.Contains("{") || remoteDNS.Contains("}"))
+                {
+                    UI.Show(UIRes.I18N("FillCorrectDNSText"));
+                    return -1;
+                }
+            }
+
             config.inbound[0].localPort = Utils.ToInt(localPort);
             config.inbound[0].protocol = protocol;
             config.inbound[0].udpEnabled = udpEnabled;
@@ -225,12 +242,13 @@ namespace v2rayN.Forms
             //Mux
             config.muxEnabled = muxEnabled;
 
-            //remoteDNS
+            //remoteDNS          
             config.remoteDNS = txtremoteDNS.Text.TrimEx();
 
-
             config.defAllowInsecure = chkdefAllowInsecure.Checked;
 
+            config.systemProxyExceptions = txtsystemProxyExceptions.Text.TrimEx();
+
             return 0;
         }
 
@@ -288,6 +306,7 @@ namespace v2rayN.Forms
 
             config.ignoreGeoUpdateCore = chkIgnoreGeoUpdateCore.Checked;
             config.coreType = (ECoreType)cmbCoreType.SelectedIndex;
+            config.autoUpdateInterval = Utils.ToInt(txtautoUpdateInterval.Text);
 
             return 0;
         }

v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx

@@ -121,11 +121,23 @@
     <value>取消(&amp;C)</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>662, 469</value>
+  </data>
+  <data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>654, 443</value>
+  </data>
+  <data name="tabPage1.Text" xml:space="preserve">
+    <value>  Core:基础设置  </value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>648, 437</value>
+  </data>
   <data name="chkdefAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
     <value>336, 16</value>
   </data>
   <data name="chkdefAllowInsecure.Text" xml:space="preserve">
-    <value>底层传输安全选tls时，默认跳过证书验证(allowInsecure)</value>
+    <value>传输层安全选tls时，默认跳过证书验证(allowInsecure)</value>
   </data>
   <data name="chksniffingEnabled2.Size" type="System.Drawing.Size, System.Drawing">
     <value>96, 16</value>
@@ -139,8 +151,11 @@
   <data name="chksniffingEnabled.Text" xml:space="preserve">
     <value>开启流量探测</value>
   </data>
+  <data name="chkmuxEnabled.Size" type="System.Drawing.Size, System.Drawing">
+    <value>114, 16</value>
+  </data>
   <data name="chkmuxEnabled.Text" xml:space="preserve">
-    <value>开启Mux多路复用(默认开启)</value>
+    <value>开启Mux多路复用</value>
   </data>
   <data name="chkAllowIn2.Size" type="System.Drawing.Size, System.Drawing">
     <value>102, 16</value>
@@ -190,14 +205,11 @@
   <data name="label2.Text" xml:space="preserve">
     <value>本地监听端口</value>
   </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>648, 437</value>
-  </data>
-  <data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
     <value>654, 443</value>
   </data>
-  <data name="tabPage1.Text" xml:space="preserve">
-    <value>  Core:基础设置  </value>
+  <data name="tabPage2.Text" xml:space="preserve">
+    <value>  Core:DNS设置  </value>
   </data>
   <data name="linkDnsObjectDoc.Size" type="System.Drawing.Size, System.Drawing">
     <value>161, 12</value>
@@ -211,18 +223,27 @@
   <data name="label14.Text" xml:space="preserve">
     <value>自定义DNS(可多个,用逗号(,)隔开)</value>
   </data>
-  <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>654, 443</value>
-  </data>
-  <data name="tabPage2.Text" xml:space="preserve">
-    <value>  Core:DNS设置  </value>
-  </data>
   <data name="tabPage6.Size" type="System.Drawing.Size, System.Drawing">
     <value>654, 443</value>
   </data>
   <data name="tabPage6.Text" xml:space="preserve">
     <value>  Core:KCP设置  </value>
   </data>
+  <data name="tabPage7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>654, 443</value>
+  </data>
+  <data name="tabPage7.Text" xml:space="preserve">
+    <value>  v2rayN设置  </value>
+  </data>
+  <data name="txtautoUpdateInterval.Location" type="System.Drawing.Point, System.Drawing">
+    <value>255, 156</value>
+  </data>
+  <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
+    <value>191, 12</value>
+  </data>
+  <data name="label15.Text" xml:space="preserve">
+    <value>自动更新Geo文件的间隔(单位小时)</value>
+  </data>
   <data name="chkIgnoreGeoUpdateCore.Size" type="System.Drawing.Size, System.Drawing">
     <value>150, 16</value>
   </data>
@@ -265,21 +286,36 @@
   <data name="chkAutoRun.Text" xml:space="preserve">
     <value>开机自动启动(可能会不成功)</value>
   </data>
-  <data name="tabPage7.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
     <value>654, 443</value>
   </data>
-  <data name="tabPage7.Text" xml:space="preserve">
-    <value>  v2rayN设置  </value>
+  <data name="tabPage3.Text" xml:space="preserve">
+    <value>  系统代理设置  </value>
   </data>
-  <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>662, 469</value>
+  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>654, 443</value>
   </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>确定(&amp;O)</value>
+  <data name="groupBox2.Text" xml:space="preserve">
+    <value>例外</value>
+  </data>
+  <data name="label13.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</value>
+  </data>
+  <data name="label13.Text" xml:space="preserve">
+    <value>使用分号(;)分隔</value>
+  </data>
+  <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
+    <value>239, 12</value>
+  </data>
+  <data name="label12.Text" xml:space="preserve">
+    <value>对于下列字符开头的地址不使用代理服务器:</value>
   </data>
   <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 479</value>
   </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>确定(&amp;O)</value>
+  </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
     <value>662, 539</value>
   </data>

v2rayN/v2rayN/Forms/RoutingRuleQuicklyAddForm.Designer.cs

@@ -0,0 +1,170 @@
+namespace v2rayN.Forms
+{
+    partial class RoutingRuleQuicklyAddForm
+    {
+        /// <summary>
+        /// Required designer variable.
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary>
+        /// Clean up any resources being used.
+        /// </summary>
+        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region Windows Form Designer generated code
+
+        /// <summary>
+        /// Required method for Designer support - do not modify
+        /// the contents of this method with the code editor.
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RoutingRuleQuicklyAddForm));
+            this.panel1 = new System.Windows.Forms.Panel();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.label4 = new System.Windows.Forms.Label();
+            this.cmbOutboundTag = new System.Windows.Forms.ComboBox();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.btnClose = new System.Windows.Forms.Button();
+            this.btnOK = new System.Windows.Forms.Button();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.txtIP = new System.Windows.Forms.TextBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.txtDomain = new System.Windows.Forms.TextBox();
+            this.panel3.SuspendLayout();
+            this.panel4.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // panel1
+            // 
+            resources.ApplyResources(this.panel1, "panel1");
+            this.panel1.Name = "panel1";
+            // 
+            // panel3
+            // 
+            resources.ApplyResources(this.panel3, "panel3");
+            this.panel3.Controls.Add(this.label4);
+            this.panel3.Controls.Add(this.cmbOutboundTag);
+            this.panel3.Name = "panel3";
+            // 
+            // label4
+            // 
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.Name = "label4";
+            // 
+            // cmbOutboundTag
+            // 
+            resources.ApplyResources(this.cmbOutboundTag, "cmbOutboundTag");
+            this.cmbOutboundTag.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbOutboundTag.FormattingEnabled = true;
+            this.cmbOutboundTag.Items.AddRange(new object[] {
+            resources.GetString("cmbOutboundTag.Items"),
+            resources.GetString("cmbOutboundTag.Items1"),
+            resources.GetString("cmbOutboundTag.Items2")});
+            this.cmbOutboundTag.Name = "cmbOutboundTag";
+            // 
+            // panel4
+            // 
+            resources.ApplyResources(this.panel4, "panel4");
+            this.panel4.Controls.Add(this.btnClose);
+            this.panel4.Controls.Add(this.btnOK);
+            this.panel4.Name = "panel4";
+            // 
+            // btnClose
+            // 
+            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);
+            // 
+            // btnOK
+            // 
+            resources.ApplyResources(this.btnOK, "btnOK");
+            this.btnOK.Name = "btnOK";
+            this.btnOK.UseVisualStyleBackColor = true;
+            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+            // 
+            // panel2
+            // 
+            resources.ApplyResources(this.panel2, "panel2");
+            this.panel2.Controls.Add(this.groupBox2);
+            this.panel2.Controls.Add(this.groupBox1);
+            this.panel2.Name = "panel2";
+            // 
+            // groupBox2
+            // 
+            resources.ApplyResources(this.groupBox2, "groupBox2");
+            this.groupBox2.Controls.Add(this.txtIP);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.TabStop = false;
+            // 
+            // txtIP
+            // 
+            resources.ApplyResources(this.txtIP, "txtIP");
+            this.txtIP.Name = "txtIP";
+            // 
+            // groupBox1
+            // 
+            resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Controls.Add(this.txtDomain);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.TabStop = false;
+            // 
+            // txtDomain
+            // 
+            resources.ApplyResources(this.txtDomain, "txtDomain");
+            this.txtDomain.Name = "txtDomain";
+            // 
+            // RoutingRuleQuicklyAddForm
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnClose;
+            this.Controls.Add(this.panel2);
+            this.Controls.Add(this.panel4);
+            this.Controls.Add(this.panel3);
+            this.Controls.Add(this.panel1);
+            this.Name = "RoutingRuleQuicklyAddForm";
+            this.Load += new System.EventHandler(this.RoutingRuleQuicklyAddForm_Load);
+            this.panel3.ResumeLayout(false);
+            this.panel3.PerformLayout();
+            this.panel4.ResumeLayout(false);
+            this.panel2.ResumeLayout(false);
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.Panel panel1;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.ComboBox cmbOutboundTag;
+        private System.Windows.Forms.Panel panel4;
+        private System.Windows.Forms.Button btnClose;
+        private System.Windows.Forms.Button btnOK;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.TextBox txtDomain;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.TextBox txtIP;
+    }
+}

v2rayN/v2rayN/Forms/RoutingRuleQuicklyAddForm.cs

@@ -0,0 +1,73 @@
+using System;
+using System.Windows.Forms;
+using v2rayN.Handler;
+using v2rayN.Mode;
+
+namespace v2rayN.Forms
+{
+    public partial class RoutingRuleQuicklyAddForm : BaseForm
+    {
+        public string domain
+        {
+            get; set;
+        }
+        private RulesItem rulesItem;
+
+        public RoutingRuleQuicklyAddForm()
+        {
+            InitializeComponent();
+        }
+
+        private void RoutingRuleQuicklyAddForm_Load(object sender, EventArgs e)
+        {
+            rulesItem = new RulesItem();
+            ClearBind();
+        }
+
+        private void EndBindingData()
+        {
+            if (rulesItem != null)
+            {
+                rulesItem.outboundTag = cmbOutboundTag.Text;
+                rulesItem.domain = Utils.String2List(txtDomain.Text);
+                rulesItem.ip = Utils.String2List(txtIP.Text);
+            }
+        }
+
+        private void ClearBind()
+        {
+            cmbOutboundTag.Text = Global.agentTag;
+            txtDomain.Text = domain;
+        }
+        private void btnOK_Click(object sender, EventArgs e)
+        {
+            EndBindingData();
+            var hasRule = false;
+            if (rulesItem.domain != null && rulesItem.domain.Count > 0)
+            {
+                hasRule = true;
+            }
+            if (rulesItem.ip != null && rulesItem.ip.Count > 0)
+            {
+                hasRule = true;
+            }
+            if (!hasRule)
+            {
+                return;
+            }
+            if (ConfigHandler.InsertRoutingRuleItem(ref config, rulesItem) == 0)
+            {
+                this.DialogResult = DialogResult.OK;
+            }
+            else
+            {
+                UI.ShowWarning(UIRes.I18N("OperationFailed"));
+            }
+        }
+
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            this.DialogResult = DialogResult.Cancel;
+        }
+    }
+}

v2rayN/v2rayN/Forms/RoutingRuleQuicklyAddForm.resx

@@ -0,0 +1,462 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="&gt;&gt;txtIP.Name" xml:space="preserve">
+    <value>txtIP</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="panel3.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="cmbOutboundTag.Size" type="System.Drawing.Size, System.Drawing">
+    <value>119, 20</value>
+  </data>
+  <data name="&gt;&gt;panel4.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="txtDomain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="txtDomain.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 17</value>
+  </data>
+  <data name="txtIP.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 207</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="panel4.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
+    <value>btnOK</value>
+  </data>
+  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>RoutingRuleQuicklyAddForm</value>
+  </data>
+  <data name="&gt;&gt;panel4.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="panel4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 288</value>
+  </data>
+  <data name="panel4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Bottom</value>
+  </data>
+  <data name="txtIP.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="label4.TabIndex" type="System.Int32, mscorlib">
+    <value>32</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
+    <value>panel4</value>
+  </data>
+  <data name="cmbOutboundTag.Items" xml:space="preserve">
+    <value>proxy</value>
+  </data>
+  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Left</value>
+  </data>
+  <data name="txtDomain.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
+  </data>
+  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
+  </data>
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>506, 10</value>
+  </data>
+  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;txtIP.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>Domain</value>
+  </data>
+  <data name="&gt;&gt;txtDomain.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="panel3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 10</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label4.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;panel3.Name" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="cmbOutboundTag.TabIndex" type="System.Int32, mscorlib">
+    <value>31</value>
+  </data>
+  <data name="&gt;&gt;cmbOutboundTag.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>506, 51</value>
+  </data>
+  <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="&gt;&gt;txtDomain.Name" xml:space="preserve">
+    <value>txtDomain</value>
+  </data>
+  <data name="&gt;&gt;cmbOutboundTag.Parent" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="panel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
+  </data>
+  <data name="&gt;&gt;panel4.Name" xml:space="preserve">
+    <value>panel4</value>
+  </data>
+  <data name="groupBox2.Text" xml:space="preserve">
+    <value>IP</value>
+  </data>
+  <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>280, 0</value>
+  </data>
+  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="txtIP.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 17</value>
+  </data>
+  <data name="&gt;&gt;label4.Name" xml:space="preserve">
+    <value>label4</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>outboundTag</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
+    <value>btnClose</value>
+  </data>
+  <data name="cmbOutboundTag.Items2" xml:space="preserve">
+    <value>block</value>
+  </data>
+  <data name="cmbOutboundTag.Items1" xml:space="preserve">
+    <value>direct</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;panel3.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;txtIP.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>305, 25</value>
+  </data>
+  <data name="&gt;&gt;label4.Parent" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
+  </data>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>506, 227</value>
+  </data>
+  <data name="txtDomain.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>280, 227</value>
+  </data>
+  <data name="&gt;&gt;txtDomain.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="btnOK.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>&amp;OK</value>
+  </data>
+  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cmbOutboundTag.Name" xml:space="preserve">
+    <value>cmbOutboundTag</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="panel4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>506, 60</value>
+  </data>
+  <data name="&gt;&gt;cmbOutboundTag.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;groupBox2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="btnClose.Text" xml:space="preserve">
+    <value>&amp;Cancel</value>
+  </data>
+  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>226, 227</value>
+  </data>
+  <data name="cmbOutboundTag.Location" type="System.Drawing.Point, System.Drawing">
+    <value>107, 16</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>RoutingRuleQuicklyAddForm</value>
+  </data>
+  <data name="btnClose.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="label4.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;groupBox2.Name" xml:space="preserve">
+    <value>groupBox2</value>
+  </data>
+  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>19, 20</value>
+  </data>
+  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 12</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;txtIP.Parent" xml:space="preserve">
+    <value>groupBox2</value>
+  </data>
+  <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
+    <value>panel4</value>
+  </data>
+  <data name="&gt;&gt;panel3.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 61</value>
+  </data>
+  <data name="&gt;&gt;txtDomain.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;panel4.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtDomain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>274, 207</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>506, 348</value>
+  </data>
+  <data name="txtIP.TabIndex" type="System.Int32, mscorlib">
+    <value>25</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;groupBox2.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;groupBox2.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+    <value>398, 25</value>
+  </data>
+  <data name="txtIP.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;panel3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>zh-Hans</value>
+  </metadata>
+</root>

v2rayN/v2rayN/Forms/RoutingRuleQuicklyAddForm.zh-Hans.resx

@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="label4.Text" xml:space="preserve">
+    <value>OutboundTag</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>
+  <data name="$this.Text" xml:space="preserve">
+    <value>快速添加路由规则</value>
+  </data>
+</root>

v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.Designer.cs

@@ -31,6 +31,9 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RoutingRuleSettingDetailsForm));
             this.panel1 = new System.Windows.Forms.Panel();
             this.panel3 = new System.Windows.Forms.Panel();
+            this.chkEnabled = new System.Windows.Forms.CheckBox();
+            this.clbInboundTag = new System.Windows.Forms.CheckedListBox();
+            this.label2 = new System.Windows.Forms.Label();
             this.clbProtocol = new System.Windows.Forms.CheckedListBox();
             this.label3 = new System.Windows.Forms.Label();
             this.txtPort = new System.Windows.Forms.TextBox();
@@ -60,6 +63,10 @@
             // 
             // panel3
             // 
+            resources.ApplyResources(this.panel3, "panel3");
+            this.panel3.Controls.Add(this.chkEnabled);
+            this.panel3.Controls.Add(this.clbInboundTag);
+            this.panel3.Controls.Add(this.label2);
             this.panel3.Controls.Add(this.clbProtocol);
             this.panel3.Controls.Add(this.label3);
             this.panel3.Controls.Add(this.txtPort);
@@ -67,13 +74,34 @@
             this.panel3.Controls.Add(this.labRoutingTips);
             this.panel3.Controls.Add(this.label4);
             this.panel3.Controls.Add(this.cmbOutboundTag);
-            resources.ApplyResources(this.panel3, "panel3");
             this.panel3.Name = "panel3";
             // 
+            // chkEnabled
+            // 
+            resources.ApplyResources(this.chkEnabled, "chkEnabled");
+            this.chkEnabled.Name = "chkEnabled";
+            this.chkEnabled.UseVisualStyleBackColor = true;
+            // 
+            // clbInboundTag
+            // 
+            resources.ApplyResources(this.clbInboundTag, "clbInboundTag");
+            this.clbInboundTag.CheckOnClick = true;
+            this.clbInboundTag.FormattingEnabled = true;
+            this.clbInboundTag.Items.AddRange(new object[] {
+            resources.GetString("clbInboundTag.Items"),
+            resources.GetString("clbInboundTag.Items1")});
+            this.clbInboundTag.MultiColumn = true;
+            this.clbInboundTag.Name = "clbInboundTag";
+            // 
+            // label2
+            // 
+            resources.ApplyResources(this.label2, "label2");
+            this.label2.Name = "label2";
+            // 
             // clbProtocol
             // 
-            this.clbProtocol.CheckOnClick = true;
             resources.ApplyResources(this.clbProtocol, "clbProtocol");
+            this.clbProtocol.CheckOnClick = true;
             this.clbProtocol.FormattingEnabled = true;
             this.clbProtocol.Items.AddRange(new object[] {
             resources.GetString("clbProtocol.Items"),
@@ -99,8 +127,8 @@
             // 
             // labRoutingTips
             // 
-            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
             resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
+            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
             this.labRoutingTips.Name = "labRoutingTips";
             // 
             // label4
@@ -110,26 +138,26 @@
             // 
             // cmbOutboundTag
             // 
+            resources.ApplyResources(this.cmbOutboundTag, "cmbOutboundTag");
             this.cmbOutboundTag.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbOutboundTag.FormattingEnabled = true;
             this.cmbOutboundTag.Items.AddRange(new object[] {
             resources.GetString("cmbOutboundTag.Items"),
             resources.GetString("cmbOutboundTag.Items1"),
             resources.GetString("cmbOutboundTag.Items2")});
-            resources.ApplyResources(this.cmbOutboundTag, "cmbOutboundTag");
             this.cmbOutboundTag.Name = "cmbOutboundTag";
             // 
             // panel4
             // 
+            resources.ApplyResources(this.panel4, "panel4");
             this.panel4.Controls.Add(this.btnClose);
             this.panel4.Controls.Add(this.btnOK);
-            resources.ApplyResources(this.panel4, "panel4");
             this.panel4.Name = "panel4";
             // 
             // 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);
@@ -143,15 +171,15 @@
             // 
             // panel2
             // 
+            resources.ApplyResources(this.panel2, "panel2");
             this.panel2.Controls.Add(this.groupBox2);
             this.panel2.Controls.Add(this.groupBox1);
-            resources.ApplyResources(this.panel2, "panel2");
             this.panel2.Name = "panel2";
             // 
             // groupBox2
             // 
-            this.groupBox2.Controls.Add(this.txtIP);
             resources.ApplyResources(this.groupBox2, "groupBox2");
+            this.groupBox2.Controls.Add(this.txtIP);
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.TabStop = false;
             // 
@@ -162,8 +190,8 @@
             // 
             // groupBox1
             // 
-            this.groupBox1.Controls.Add(this.txtDomain);
             resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Controls.Add(this.txtDomain);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
             // 
@@ -214,5 +242,8 @@
         private System.Windows.Forms.TextBox txtPort;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.CheckedListBox clbProtocol;
+        private System.Windows.Forms.CheckedListBox clbInboundTag;
+        private System.Windows.Forms.Label label2;
+        private System.Windows.Forms.CheckBox chkEnabled;
     }
 }

v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.cs

@@ -36,6 +36,16 @@ namespace v2rayN.Forms
             if (rulesItem != null)
             {
                 rulesItem.port = txtPort.Text.TrimEx();
+
+                var inboundTag = new List<String>();
+                for (int i = 0; i < clbInboundTag.Items.Count; i++)
+                {
+                    if (clbInboundTag.GetItemChecked(i))
+                    {
+                        inboundTag.Add(clbInboundTag.Items[i].ToString());
+                    }
+                }
+                rulesItem.inboundTag = inboundTag;
                 rulesItem.outboundTag = cmbOutboundTag.Text;
                 rulesItem.domain = Utils.String2List(txtDomain.Text);
                 rulesItem.ip = Utils.String2List(txtIP.Text);
@@ -49,6 +59,7 @@ namespace v2rayN.Forms
                     }
                 }
                 rulesItem.protocol = protocol;
+                rulesItem.enabled = chkEnabled.Checked;
             }
         }
         private void BindingData()
@@ -60,6 +71,17 @@ namespace v2rayN.Forms
                 txtDomain.Text = Utils.List2String(rulesItem.domain, true);
                 txtIP.Text = Utils.List2String(rulesItem.ip, true);
 
+                if (rulesItem.inboundTag != null)
+                {
+                    for (int i = 0; i < clbInboundTag.Items.Count; i++)
+                    {
+                        if (rulesItem.inboundTag.Contains(clbInboundTag.Items[i].ToString()))
+                        {
+                            clbInboundTag.SetItemChecked(i, true);
+                        }
+                    }
+                }
+
                 if (rulesItem.protocol != null)
                 {
                     for (int i = 0; i < clbProtocol.Items.Count; i++)
@@ -70,6 +92,7 @@ namespace v2rayN.Forms
                         }
                     }
                 }
+                chkEnabled.Checked = rulesItem.enabled;
             }
         }
         private void ClearBind()
@@ -78,6 +101,7 @@ namespace v2rayN.Forms
             cmbOutboundTag.Text = Global.agentTag;
             txtDomain.Text = string.Empty;
             txtIP.Text = string.Empty;
+            chkEnabled.Checked = true;
         }
         private void btnOK_Click(object sender, EventArgs e)
         {

v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.resx

@@ -117,484 +117,577 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Top</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
   </data>
-  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>742, 10</value>
+  <data name="&gt;&gt;clbInboundTag.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
-    <value>7</value>
-  </data>
-  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
-    <value>panel1</value>
-  </data>
-  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="clbProtocol.ColumnWidth" type="System.Int32, mscorlib">
-    <value>80</value>
-  </data>
-  <data name="clbProtocol.Items" xml:space="preserve">
-    <value>http</value>
-  </data>
-  <data name="clbProtocol.Items1" xml:space="preserve">
-    <value>tls</value>
-  </data>
-  <data name="clbProtocol.Items2" xml:space="preserve">
-    <value>bittorrent</value>
-  </data>
-  <data name="clbProtocol.Location" type="System.Drawing.Point, System.Drawing">
-    <value>347, 43</value>
+  <data name="label4.TabIndex" type="System.Int32, mscorlib">
+    <value>32</value>
   </data>
   <data name="clbProtocol.Size" type="System.Drawing.Size, System.Drawing">
     <value>245, 20</value>
   </data>
-  <data name="clbProtocol.TabIndex" type="System.Int32, mscorlib">
-    <value>39</value>
-  </data>
-  <data name="&gt;&gt;clbProtocol.Name" xml:space="preserve">
-    <value>clbProtocol</value>
-  </data>
-  <data name="&gt;&gt;clbProtocol.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;clbProtocol.Parent" xml:space="preserve">
-    <value>panel3</value>
-  </data>
-  <data name="&gt;&gt;clbProtocol.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>274, 47</value>
-  </data>
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 12</value>
-  </data>
-  <data name="label3.TabIndex" type="System.Int32, mscorlib">
-    <value>36</value>
-  </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>Protocol</value>
-  </data>
-  <data name="&gt;&gt;label3.Name" xml:space="preserve">
-    <value>label3</value>
-  </data>
-  <data name="&gt;&gt;label3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
-    <value>panel3</value>
-  </data>
-  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
-    <value>107, 43</value>
-  </data>
-  <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
-    <value>119, 21</value>
-  </data>
-  <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
-    <value>35</value>
-  </data>
-  <data name="&gt;&gt;txtPort.Name" xml:space="preserve">
-    <value>txtPort</value>
-  </data>
-  <data name="&gt;&gt;txtPort.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtPort.Parent" xml:space="preserve">
-    <value>panel3</value>
-  </data>
-  <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>19, 47</value>
-  </data>
-  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>29, 12</value>
-  </data>
-  <data name="label1.TabIndex" type="System.Int32, mscorlib">
-    <value>34</value>
-  </data>
-  <data name="label1.Text" xml:space="preserve">
-    <value>Port</value>
-  </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
-    <value>label1</value>
-  </data>
-  <data name="&gt;&gt;label1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>panel3</value>
-  </data>
-  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="labRoutingTips.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="labRoutingTips.Location" type="System.Drawing.Point, System.Drawing">
-    <value>19, 82</value>
-  </data>
-  <data name="labRoutingTips.Size" type="System.Drawing.Size, System.Drawing">
-    <value>598, 16</value>
-  </data>
-  <data name="labRoutingTips.TabIndex" type="System.Int32, mscorlib">
-    <value>33</value>
-  </data>
-  <data name="labRoutingTips.Text" xml:space="preserve">
-    <value>*Set the rules, separated by commas (,); The comma in the regular is replaced by &lt;COMMA&gt;</value>
-  </data>
-  <data name="&gt;&gt;labRoutingTips.Name" xml:space="preserve">
-    <value>labRoutingTips</value>
-  </data>
-  <data name="&gt;&gt;labRoutingTips.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;labRoutingTips.Parent" xml:space="preserve">
-    <value>panel3</value>
-  </data>
-  <data name="&gt;&gt;labRoutingTips.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="label4.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>19, 20</value>
-  </data>
-  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>71, 12</value>
-  </data>
-  <data name="label4.TabIndex" type="System.Int32, mscorlib">
-    <value>32</value>
-  </data>
-  <data name="label4.Text" xml:space="preserve">
-    <value>outboundTag</value>
-  </data>
-  <data name="&gt;&gt;label4.Name" xml:space="preserve">
-    <value>label4</value>
-  </data>
-  <data name="&gt;&gt;label4.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label4.Parent" xml:space="preserve">
-    <value>panel3</value>
-  </data>
-  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
-  <data name="cmbOutboundTag.Items" xml:space="preserve">
-    <value>proxy</value>
-  </data>
-  <data name="cmbOutboundTag.Items1" xml:space="preserve">
-    <value>direct</value>
-  </data>
-  <data name="cmbOutboundTag.Items2" xml:space="preserve">
-    <value>block</value>
-  </data>
-  <data name="cmbOutboundTag.Location" type="System.Drawing.Point, System.Drawing">
-    <value>107, 16</value>
-  </data>
-  <data name="cmbOutboundTag.Size" type="System.Drawing.Size, System.Drawing">
-    <value>119, 20</value>
+  <data name="clbProtocol.ColumnWidth" type="System.Int32, mscorlib">
+    <value>80</value>
   </data>
   <data name="cmbOutboundTag.TabIndex" type="System.Int32, mscorlib">
     <value>31</value>
   </data>
-  <data name="&gt;&gt;cmbOutboundTag.Name" xml:space="preserve">
-    <value>cmbOutboundTag</value>
+  <data name="cmbOutboundTag.Items" xml:space="preserve">
+    <value>proxy</value>
   </data>
-  <data name="&gt;&gt;cmbOutboundTag.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>4, 4, 4, 4</value>
   </data>
-  <data name="&gt;&gt;cmbOutboundTag.Parent" xml:space="preserve">
-    <value>panel3</value>
+  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
   </data>
-  <data name="&gt;&gt;cmbOutboundTag.ZOrder" xml:space="preserve">
+  <data name="&gt;&gt;panel1.Name" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;clbProtocol.Name" xml:space="preserve">
+    <value>clbProtocol</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>Protocol</value>
+  </data>
+  <data name="&gt;&gt;label1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;labRoutingTips.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;label2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="label4.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;clbProtocol.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Left</value>
+  </data>
+  <data name="clbInboundTag.ColumnWidth" type="System.Int32, mscorlib">
+    <value>80</value>
+  </data>
+  <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;groupBox2.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>29, 12</value>
+  </data>
+  <data name="&gt;&gt;clbInboundTag.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="clbInboundTag.Items1" xml:space="preserve">
+    <value>http</value>
+  </data>
+  <data name="&gt;&gt;groupBox2.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="clbProtocol.Items1" xml:space="preserve">
+    <value>tls</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>RoutingSettingDetailsForm</value>
+  </data>
+  <data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;clbProtocol.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
     <value>6</value>
   </data>
-  <data name="panel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Top</value>
+  <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
   </data>
-  <data name="panel3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 10</value>
+  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>411, 15</value>
   </data>
-  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>742, 111</value>
+  <data name="cmbOutboundTag.Size" type="System.Drawing.Size, System.Drawing">
+    <value>119, 20</value>
   </data>
-  <data name="panel3.TabIndex" type="System.Int32, mscorlib">
-    <value>8</value>
-  </data>
-  <data name="&gt;&gt;panel3.Name" xml:space="preserve">
-    <value>panel3</value>
-  </data>
-  <data name="&gt;&gt;panel3.Type" xml:space="preserve">
+  <data name="&gt;&gt;panel1.Type" xml:space="preserve">
     <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="label3.TabIndex" type="System.Int32, mscorlib">
+    <value>36</value>
+  </data>
+  <data name="panel4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Bottom</value>
+  </data>
+  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="txtIP.Size" type="System.Drawing.Size, System.Drawing">
+    <value>344, 375</value>
+  </data>
   <data name="&gt;&gt;panel3.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
-  <data name="&gt;&gt;panel3.ZOrder" xml:space="preserve">
+  <data name="labRoutingTips.Size" type="System.Drawing.Size, System.Drawing">
+    <value>598, 16</value>
+  </data>
+  <data name="&gt;&gt;txtDomain.Parent" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="labRoutingTips.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
+  <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">
+    <value>label1</value>
+  </data>
+  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>742, 395</value>
+  </data>
+  <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="&gt;&gt;cmbOutboundTag.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="label2.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;chkEnabled.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;panel3.Name" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
+    <value>panel4</value>
+  </data>
+  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="clbProtocol.Items2" xml:space="preserve">
+    <value>bittorrent</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="clbInboundTag.Items" xml:space="preserve">
+    <value>socks</value>
+  </data>
+  <data name="&gt;&gt;chkEnabled.Parent" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="labRoutingTips.Location" type="System.Drawing.Point, System.Drawing">
+    <value>19, 82</value>
+  </data>
+  <data name="txtIP.TabIndex" type="System.Int32, mscorlib">
+    <value>25</value>
+  </data>
+  <data name="clbInboundTag.Location" type="System.Drawing.Point, System.Drawing">
+    <value>347, 16</value>
+  </data>
+  <data name="txtDomain.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 17</value>
+  </data>
+  <data name="&gt;&gt;labRoutingTips.Parent" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>19, 20</value>
+  </data>
+  <data name="&gt;&gt;labRoutingTips.Name" xml:space="preserve">
+    <value>labRoutingTips</value>
+  </data>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>19, 47</value>
+  </data>
+  <data name="clbProtocol.TabIndex" type="System.Int32, mscorlib">
+    <value>39</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
+    <value>groupBox1</value>
+  </data>
+  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>RoutingRuleSettingDetailsForm</value>
+  </data>
+  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="&gt;&gt;label4.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtPort.Parent" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
+    <value>107, 43</value>
+  </data>
+  <data name="&gt;&gt;groupBox2.Name" xml:space="preserve">
+    <value>groupBox2</value>
+  </data>
+  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtDomain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>386, 375</value>
+  </data>
+  <data name="&gt;&gt;cmbOutboundTag.Parent" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="&gt;&gt;cmbOutboundTag.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
+    <value>panel2</value>
+  </data>
+  <data name="txtIP.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="&gt;&gt;panel4.Name" xml:space="preserve">
+    <value>panel4</value>
+  </data>
   <data name="btnClose.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
-  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
-    <value>504, 15</value>
+  <data name="panel3.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
+  </data>
+  <data name="&gt;&gt;panel1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="chkEnabled.TabIndex" type="System.Int32, mscorlib">
+    <value>42</value>
+  </data>
+  <data name="&gt;&gt;txtIP.Parent" xml:space="preserve">
+    <value>groupBox2</value>
+  </data>
+  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="&gt;&gt;label4.Parent" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="&gt;&gt;panel4.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtIP.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="clbProtocol.Items" xml:space="preserve">
+    <value>http</value>
+  </data>
+  <data name="&gt;&gt;txtPort.Name" xml:space="preserve">
+    <value>txtPort</value>
+  </data>
+  <data name="txtIP.Location" type="System.Drawing.Point, System.Drawing">
+    <value>3, 17</value>
+  </data>
+  <data name="&gt;&gt;panel4.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>742, 10</value>
+  </data>
+  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="txtDomain.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>Port</value>
+  </data>
+  <data name="chkEnabled.Text" xml:space="preserve">
+    <value>Enable</value>
+  </data>
+  <data name="&gt;&gt;label4.Name" xml:space="preserve">
+    <value>label4</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>&amp;OK</value>
+  </data>
+  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="&gt;&gt;labRoutingTips.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
+    <value>panel4</value>
+  </data>
+  <data name="label1.TabIndex" type="System.Int32, mscorlib">
+    <value>34</value>
+  </data>
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>274, 47</value>
+  </data>
+  <data name="label2.TabIndex" type="System.Int32, mscorlib">
+    <value>40</value>
+  </data>
+  <data name="cmbOutboundTag.Items2" xml:space="preserve">
+    <value>block</value>
+  </data>
+  <data name="labRoutingTips.TabIndex" type="System.Int32, mscorlib">
+    <value>33</value>
+  </data>
+  <data name="clbProtocol.Location" type="System.Drawing.Point, System.Drawing">
+    <value>347, 43</value>
+  </data>
+  <data name="&gt;&gt;txtDomain.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="&gt;&gt;groupBox2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
+    <value>btnOK</value>
+  </data>
+  <data name="&gt;&gt;panel3.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="txtPort.Size" type="System.Drawing.Size, System.Drawing">
+    <value>119, 21</value>
+  </data>
+  <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
+  </data>
+  <data name="&gt;&gt;txtIP.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
+    <value>panel3</value>
+  </data>
+  <data name="panel3.TabIndex" type="System.Int32, mscorlib">
+    <value>8</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
+  </data>
+  <data name="&gt;&gt;label3.Name" xml:space="preserve">
+    <value>label3</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>inboundTag</value>
+  </data>
+  <data name="panel1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
+  </data>
+  <data name="panel4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>742, 60</value>
+  </data>
+  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 121</value>
+  </data>
+  <data name="&gt;&gt;panel4.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="labRoutingTips.Text" xml:space="preserve">
+    <value>*Set the rules, separated by commas (,); The comma in the regular is replaced by &lt;COMMA&gt;</value>
+  </data>
+  <data name="clbInboundTag.Size" type="System.Drawing.Size, System.Drawing">
+    <value>245, 20</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
+    <value>btnClose</value>
+  </data>
+  <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>392, 0</value>
+  </data>
+  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>742, 111</value>
+  </data>
+  <data name="txtIP.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
+  </data>
+  <data name="&gt;&gt;chkEnabled.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="chkEnabled.Location" type="System.Drawing.Point, System.Drawing">
+    <value>617, 19</value>
+  </data>
+  <data name="panel3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 10</value>
+  </data>
+  <data name="&gt;&gt;txtPort.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtDomain.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="chkEnabled.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="&gt;&gt;label3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtIP.Name" xml:space="preserve">
+    <value>txtIP</value>
+  </data>
+  <data name="cmbOutboundTag.Items1" xml:space="preserve">
+    <value>direct</value>
+  </data>
+  <data name="&gt;&gt;label2.Name" xml:space="preserve">
+    <value>label2</value>
+  </data>
+  <data name="chkEnabled.Size" type="System.Drawing.Size, System.Drawing">
+    <value>60, 16</value>
+  </data>
+  <data name="&gt;&gt;cmbOutboundTag.Name" xml:space="preserve">
+    <value>cmbOutboundTag</value>
+  </data>
+  <data name="&gt;&gt;chkEnabled.Name" xml:space="preserve">
+    <value>chkEnabled</value>
+  </data>
+  <data name="txtDomain.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>274, 20</value>
+  </data>
+  <data name="btnOK.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>742, 576</value>
+  </data>
+  <data name="panel4.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>392, 395</value>
   </data>
   <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
   </data>
-  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
+  <data name="&gt;&gt;clbInboundTag.Name" xml:space="preserve">
+    <value>clbInboundTag</value>
+  </data>
+  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
     <value>4</value>
   </data>
   <data name="btnClose.Text" xml:space="preserve">
     <value>&amp;Cancel</value>
   </data>
-  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
-    <value>btnClose</value>
-  </data>
-  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
-    <value>panel4</value>
-  </data>
-  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="btnOK.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+  <data name="chkEnabled.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
-  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
-    <value>411, 15</value>
+  <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
-    <value>5</value>
-  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>&amp;OK</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
-    <value>btnOK</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
-    <value>panel4</value>
-  </data>
-  <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="panel4.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
-  <data name="panel4.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 516</value>
-  </data>
-  <data name="panel4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>742, 60</value>
-  </data>
-  <data name="panel4.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <data name="&gt;&gt;panel4.Name" xml:space="preserve">
-    <value>panel4</value>
-  </data>
-  <data name="&gt;&gt;panel4.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel4.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel4.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="txtIP.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="txtIP.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 17</value>
-  </data>
-  <data name="txtIP.Multiline" type="System.Boolean, mscorlib">
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="txtIP.Size" type="System.Drawing.Size, System.Drawing">
-    <value>344, 375</value>
-  </data>
-  <data name="txtIP.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
-  </data>
-  <data name="&gt;&gt;txtIP.Name" xml:space="preserve">
-    <value>txtIP</value>
-  </data>
-  <data name="&gt;&gt;txtIP.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtIP.Parent" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;txtIP.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>392, 0</value>
-  </data>
-  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>350, 395</value>
-  </data>
-  <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
   </data>
-  <data name="groupBox2.Text" xml:space="preserve">
-    <value>IP</value>
-  </data>
-  <data name="&gt;&gt;groupBox2.Name" xml:space="preserve">
-    <value>groupBox2</value>
-  </data>
-  <data name="&gt;&gt;groupBox2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;groupBox2.Parent" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="&gt;&gt;groupBox2.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="txtDomain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="txtDomain.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 17</value>
-  </data>
-  <data name="txtDomain.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="txtDomain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>386, 375</value>
-  </data>
-  <data name="txtDomain.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
-  </data>
   <data name="&gt;&gt;txtDomain.Name" xml:space="preserve">
     <value>txtDomain</value>
   </data>
-  <data name="&gt;&gt;txtDomain.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="clbInboundTag.TabIndex" type="System.Int32, mscorlib">
+    <value>41</value>
   </data>
-  <data name="&gt;&gt;txtDomain.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="groupBox2.Text" xml:space="preserve">
+    <value>IP</value>
   </data>
-  <data name="&gt;&gt;txtDomain.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="&gt;&gt;clbInboundTag.Parent" xml:space="preserve">
+    <value>panel3</value>
   </data>
-  <data name="groupBox1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Left</value>
+  <data name="&gt;&gt;panel3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>392, 395</value>
+  <data name="panel4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 516</value>
   </data>
-  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>3</value>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 12</value>
+  </data>
+  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>350, 395</value>
+  </data>
+  <data name="&gt;&gt;clbProtocol.Parent" xml:space="preserve">
+    <value>panel3</value>
   </data>
   <data name="groupBox1.Text" xml:space="preserve">
     <value>Domain</value>
   </data>
-  <data name="&gt;&gt;groupBox1.Name" xml:space="preserve">
-    <value>groupBox1</value>
+  <data name="txtDomain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+    <value>504, 15</value>
+  </data>
+  <data name="cmbOutboundTag.Location" type="System.Drawing.Point, System.Drawing">
+    <value>107, 16</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>outboundTag</value>
   </data>
   <data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
     <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;groupBox1.Parent" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
-  </data>
-  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 121</value>
-  </data>
-  <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>742, 395</value>
-  </data>
-  <data name="panel2.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
-  </data>
-  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
-    <value>panel2</value>
-  </data>
-  <data name="&gt;&gt;panel2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
+    <value>35</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 12</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>742, 576</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>RoutingSettingDetailsForm</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>RoutingRuleSettingDetailsForm</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>v2rayN.Forms.BaseForm, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
-  </data>
 </root>

v2rayN/v2rayN/Forms/RoutingRuleSettingDetailsForm.zh-Hans.resx

@@ -117,21 +117,42 @@
   <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="chkEnabled.Location" type="System.Drawing.Point, System.Drawing">
+    <value>670, 18</value>
+  </data>
+  <data name="clbInboundTag.Location" type="System.Drawing.Point, System.Drawing">
+    <value>372, 16</value>
+  </data>
+  <data name="clbInboundTag.Size" type="System.Drawing.Size, System.Drawing">
+    <value>272, 20</value>
+  </data>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>279, 20</value>
+  </data>
+  <data name="clbProtocol.Location" type="System.Drawing.Point, System.Drawing">
+    <value>372, 46</value>
+  </data>
+  <data name="clbProtocol.Size" type="System.Drawing.Size, System.Drawing">
+    <value>272, 20</value>
+  </data>
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>279, 50</value>
+  </data>
+  <data name="txtPort.Location" type="System.Drawing.Point, System.Drawing">
+    <value>120, 46</value>
+  </data>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>19, 50</value>
+  </data>
   <data name="labRoutingTips.Text" xml:space="preserve">
     <value>*设置的路由规则,用逗号(,)分隔;正则中的逗号用&lt;COMMA&gt;替代</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
-    <value>71, 12</value>
-  </data>
   <data name="label4.Text" xml:space="preserve">
     <value>OutboundTag</value>
   </data>
-  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>29, 12</value>
-  </data>
-  <data name="label2.Text" xml:space="preserve">
-    <value>别名</value>
+  <data name="cmbOutboundTag.Location" type="System.Drawing.Point, System.Drawing">
+    <value>120, 16</value>
   </data>
   <data name="btnClose.Text" xml:space="preserve">
     <value>取消(&amp;C)</value>
@@ -139,6 +160,13 @@
   <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="txtIP.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
+    <value>Vertical</value>
+  </data>
+  <data name="txtDomain.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
+    <value>Vertical</value>
+  </data>
   <data name="$this.Text" xml:space="preserve">
     <value>路由规则详情设置</value>
   </data>

v2rayN/v2rayN/Forms/RoutingRuleSettingForm.Designer.cs

@@ -34,6 +34,10 @@
             this.panel2 = new System.Windows.Forms.Panel();
             this.btnOK = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.label5 = new System.Windows.Forms.Label();
+            this.btnBrowse = new System.Windows.Forms.Button();
+            this.txtCustomIcon = new System.Windows.Forms.TextBox();
+            this.label4 = new System.Windows.Forms.Label();
             this.label1 = new System.Windows.Forms.Label();
             this.txtUrl = new System.Windows.Forms.TextBox();
             this.label3 = new System.Windows.Forms.Label();
@@ -91,6 +95,10 @@
             // panel1
             // 
             resources.ApplyResources(this.panel1, "panel1");
+            this.panel1.Controls.Add(this.label5);
+            this.panel1.Controls.Add(this.btnBrowse);
+            this.panel1.Controls.Add(this.txtCustomIcon);
+            this.panel1.Controls.Add(this.label4);
             this.panel1.Controls.Add(this.label1);
             this.panel1.Controls.Add(this.txtUrl);
             this.panel1.Controls.Add(this.label3);
@@ -98,6 +106,28 @@
             this.panel1.Controls.Add(this.label2);
             this.panel1.Name = "panel1";
             // 
+            // label5
+            // 
+            resources.ApplyResources(this.label5, "label5");
+            this.label5.Name = "label5";
+            // 
+            // btnBrowse
+            // 
+            resources.ApplyResources(this.btnBrowse, "btnBrowse");
+            this.btnBrowse.Name = "btnBrowse";
+            this.btnBrowse.UseVisualStyleBackColor = true;
+            this.btnBrowse.Click += new System.EventHandler(this.btnBrowse_Click);
+            // 
+            // txtCustomIcon
+            // 
+            resources.ApplyResources(this.txtCustomIcon, "txtCustomIcon");
+            this.txtCustomIcon.Name = "txtCustomIcon";
+            // 
+            // label4
+            // 
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.Name = "label4";
+            // 
             // label1
             // 
             resources.ApplyResources(this.label1, "label1");
@@ -155,6 +185,7 @@
             this.menuMoveDown,
             this.menuMoveBottom});
             this.cmsLv.Name = "cmsLv";
+            this.cmsLv.OwnerItem = this.MenuItem1;
             // 
             // menuAdd
             // 
@@ -318,5 +349,9 @@
         private System.Windows.Forms.TextBox txtUrl;
         private System.Windows.Forms.Label label3;
         private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.TextBox txtCustomIcon;
+        private System.Windows.Forms.Label label4;
+        private System.Windows.Forms.Button btnBrowse;
+        private System.Windows.Forms.Label label5;
     }
 }

v2rayN/v2rayN/Forms/RoutingRuleSettingForm.cs

@@ -38,6 +38,7 @@ namespace v2rayN.Forms
 
             txtRemarks.Text = routingItem.remarks ?? string.Empty;
             txtUrl.Text = routingItem.url ?? string.Empty;
+            txtCustomIcon.Text = routingItem.customIcon ?? string.Empty;
 
             InitRoutingsView();
             RefreshRoutingsView();
@@ -57,9 +58,11 @@ namespace v2rayN.Forms
             lvRoutings.Columns.Add("", 30);
             lvRoutings.Columns.Add("outboundTag", 80);
             lvRoutings.Columns.Add("port", 80);
-            lvRoutings.Columns.Add("protocol", 100);
+            lvRoutings.Columns.Add("protocol", 80);
+            lvRoutings.Columns.Add("inboundTag", 80);
             lvRoutings.Columns.Add("domain", 160);
-            lvRoutings.Columns.Add("ip", 160);
+            lvRoutings.Columns.Add("ip", 160); 
+            lvRoutings.Columns.Add("enable", 60);
 
             lvRoutings.EndUpdate();
         }
@@ -77,8 +80,10 @@ namespace v2rayN.Forms
                 Utils.AddSubItem(lvItem, "outboundTag", item.outboundTag);
                 Utils.AddSubItem(lvItem, "port", item.port);
                 Utils.AddSubItem(lvItem, "protocol", Utils.List2String(item.protocol));
+                Utils.AddSubItem(lvItem, "inboundTag", Utils.List2String(item.inboundTag));
                 Utils.AddSubItem(lvItem, "domain", Utils.List2String(item.domain));
                 Utils.AddSubItem(lvItem, "ip", Utils.List2String(item.ip));
+                Utils.AddSubItem(lvItem, "enable", item.enabled.ToString());
 
                 if (lvItem != null) lvRoutings.Items.Add(lvItem);
             }
@@ -89,6 +94,7 @@ namespace v2rayN.Forms
         {
             routingItem.remarks = txtRemarks.Text.Trim();
             routingItem.url = txtUrl.Text.Trim();
+            routingItem.customIcon = txtCustomIcon.Text.Trim();
 
             if (ConfigHandler.AddRoutingItem(ref config, routingItem, EditIndex) == 0)
             {
@@ -104,6 +110,14 @@ namespace v2rayN.Forms
         {
             this.DialogResult = DialogResult.Cancel;
         }
+        private void btnBrowse_Click(object sender, EventArgs e)
+        {
+            OpenFileDialog openFileDialog1 = new OpenFileDialog();
+            openFileDialog1.Filter = "PNG|*.png";
+            openFileDialog1.ShowDialog();
+            txtCustomIcon.Text = openFileDialog1.FileName;
+
+        }
 
         private void lvRoutings_DoubleClick(object sender, EventArgs e)
         {
@@ -194,7 +208,7 @@ namespace v2rayN.Forms
             fm.rulesItem = new RulesItem();
             if (fm.ShowDialog() == DialogResult.OK)
             {
-                routingItem.rules.Add(fm.rulesItem);
+                routingItem.rules.Insert(0, fm.rulesItem);
                 RefreshRoutingsView();
             }
         }
@@ -227,7 +241,7 @@ namespace v2rayN.Forms
             if (lst.Count > 0)
             {
                 Utils.SetClipboardData(Utils.ToJson(lst));
-                UI.Show(UIRes.I18N("OperationSuccess"));
+                //UI.Show(UIRes.I18N("OperationSuccess"));
             }
 
         }
@@ -294,7 +308,7 @@ namespace v2rayN.Forms
                 return;
             }
 
-            if (ConfigHandler.AddBatchRoutingRules(ref routingItem, result) == 0)
+            if (AddBatchRoutingRules(ref routingItem, result) == 0)
             {
                 RefreshRoutingsView();
                 UI.Show(UIRes.I18N("OperationSuccess"));
@@ -304,7 +318,7 @@ namespace v2rayN.Forms
         private void menuImportRulesFromClipboard_Click(object sender, EventArgs e)
         {
             string clipboardData = Utils.GetClipboardData();
-            if (ConfigHandler.AddBatchRoutingRules(ref routingItem, clipboardData) == 0)
+            if (AddBatchRoutingRules(ref routingItem, clipboardData) == 0)
             {
                 RefreshRoutingsView();
                 UI.Show(UIRes.I18N("OperationSuccess"));
@@ -320,15 +334,25 @@ namespace v2rayN.Forms
             }
             DownloadHandle downloadHandle = new DownloadHandle();
             string clipboardData = downloadHandle.WebDownloadStringSync(url);
-            if (ConfigHandler.AddBatchRoutingRules(ref routingItem, clipboardData) == 0)
+            if (AddBatchRoutingRules(ref routingItem, clipboardData) == 0)
             {
                 RefreshRoutingsView();
                 UI.Show(UIRes.I18N("OperationSuccess"));
             }
         }
+        private int AddBatchRoutingRules(ref RoutingItem routingItem, string clipboardData)
+        {
+            bool blReplace = false;
+            if (UI.ShowYesNo(UIRes.I18N("AddBatchRoutingRulesYesNo")) == DialogResult.No)
+            {
+                blReplace = true;
+            }
+            return ConfigHandler.AddBatchRoutingRules(ref routingItem, clipboardData, blReplace);
+        }
+
+
 
         #endregion
-
-
+               
     }
 }

v2rayN/v2rayN/Forms/RoutingRuleSettingForm.resx

@@ -134,6 +134,9 @@
   <data name="&gt;&gt;menuImportRulesFromUrl.Name" xml:space="preserve">
     <value>menuImportRulesFromUrl</value>
   </data>
+  <data name="&gt;&gt;label5.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="menuMoveDown.Text" xml:space="preserve">
     <value>Down (D)</value>
   </data>
@@ -145,7 +148,7 @@
     <value>32</value>
   </data>
   <data name="&gt;&gt;txtUrl.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>5</value>
   </data>
   <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
     <value>47, 12</value>
@@ -153,6 +156,12 @@
   <data name="menuMoveBottom.Text" xml:space="preserve">
     <value>Move to bottom (B)</value>
   </data>
+  <data name="&gt;&gt;label4.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
+  <data name="label5.TabIndex" type="System.Int32, mscorlib">
+    <value>40</value>
+  </data>
   <data name="panel2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Bottom</value>
   </data>
@@ -162,11 +171,11 @@
   <data name="&gt;&gt;panel1.Name" xml:space="preserve">
     <value>panel1</value>
   </data>
-  <data name="&gt;&gt;menuServer.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
+    <value>3</value>
   </data>
-  <data name="&gt;&gt;menuSelectAll.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="btnBrowse.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
   </data>
   <data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
@@ -177,8 +186,8 @@
   <data name="&gt;&gt;menuServer.ZOrder" xml:space="preserve">
     <value>4</value>
   </data>
-  <data name="&gt;&gt;tabPage2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="label4.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
   <data name="&gt;&gt;menuMoveUp.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -201,6 +210,9 @@
   <data name="&gt;&gt;tabControl2.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
+  <data name="&gt;&gt;txtUrl.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
   <data name="&gt;&gt;menuMoveBottom.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -217,7 +229,7 @@
     <value>tabPage2</value>
   </data>
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>4</value>
   </data>
   <data name="menuExportSelectedRules.Size" type="System.Drawing.Size, System.Drawing">
     <value>202, 22</value>
@@ -234,6 +246,9 @@
   <data name="label3.TabIndex" type="System.Int32, mscorlib">
     <value>33</value>
   </data>
+  <data name="&gt;&gt;btnBrowse.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;MenuItem1.Name" xml:space="preserve">
     <value>MenuItem1</value>
   </data>
@@ -241,7 +256,7 @@
     <value>0</value>
   </data>
   <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>754, 362</value>
+    <value>754, 231</value>
   </data>
   <data name="&gt;&gt;tabControl2.ZOrder" xml:space="preserve">
     <value>1</value>
@@ -253,10 +268,13 @@
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>8</value>
   </data>
-  <data name="tabControl2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
+  <data name="&gt;&gt;txtCustomIcon.Name" xml:space="preserve">
+    <value>txtCustomIcon</value>
+  </data>
+  <data name="label5.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
   <data name="menuServer.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
@@ -273,11 +291,11 @@
   <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
     <value>95, 21</value>
   </data>
-  <data name="&gt;&gt;txtUrl.Parent" xml:space="preserve">
-    <value>panel1</value>
+  <data name="label5.Text" xml:space="preserve">
+    <value>PNG(128*128)</value>
   </data>
-  <data name="&gt;&gt;menuServer.Name" xml:space="preserve">
-    <value>menuServer</value>
+  <data name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
+    <value>panel1</value>
   </data>
   <data name="label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -318,14 +336,14 @@
   <data name="&gt;&gt;toolStripSeparator3.Name" xml:space="preserve">
     <value>toolStripSeparator3</value>
   </data>
-  <data name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
-    <value>panel1</value>
+  <data name="&gt;&gt;label5.Name" xml:space="preserve">
+    <value>label5</value>
   </data>
   <data name="&gt;&gt;lvRoutings.Parent" xml:space="preserve">
     <value>tabPage2</value>
   </data>
-  <data name="&gt;&gt;toolStripMenuItem1.Name" xml:space="preserve">
-    <value>toolStripMenuItem1</value>
+  <data name="txtUrl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>644, 48</value>
   </data>
   <data name="&gt;&gt;menuMoveBottom.Name" xml:space="preserve">
     <value>menuMoveBottom</value>
@@ -333,6 +351,9 @@
   <data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 25</value>
   </data>
+  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
+    <value>18, 105</value>
+  </data>
   <data name="&gt;&gt;txtRemarks.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -346,7 +367,7 @@
     <value>202, 22</value>
   </data>
   <data name="tabControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>762, 388</value>
+    <value>762, 257</value>
   </data>
   <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
     <value>1</value>
@@ -354,8 +375,14 @@
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>RoutingRuleSettingForm</value>
   </data>
-  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
-    <value>panel2</value>
+  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>166, 21</value>
+  </data>
+  <data name="&gt;&gt;label4.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnBrowse.Parent" xml:space="preserve">
+    <value>panel1</value>
   </data>
   <data name="menuMoveDown.Size" type="System.Drawing.Size, System.Drawing">
     <value>202, 22</value>
@@ -363,6 +390,15 @@
   <data name="&gt;&gt;menuMoveTop.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;menuServer.Name" xml:space="preserve">
+    <value>menuServer</value>
+  </data>
+  <data name="&gt;&gt;menuSelectAll.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label4.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
   <data name="&gt;&gt;menuServer.Type" xml:space="preserve">
     <value>System.Windows.Forms.MenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -402,6 +438,9 @@
   <data name="lvRoutings.Location" type="System.Drawing.Point, System.Drawing">
     <value>3, 3</value>
   </data>
+  <data name="label5.Location" type="System.Drawing.Point, System.Drawing">
+    <value>10, 117</value>
+  </data>
   <data name="&gt;&gt;menuImportRulesFromClipboard.Name" xml:space="preserve">
     <value>menuImportRulesFromClipboard</value>
   </data>
@@ -415,13 +454,13 @@
     <value>menuAdd</value>
   </data>
   <data name="tabControl2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 127</value>
+    <value>0, 167</value>
   </data>
   <data name="menuImportRulesFromFile.Size" type="System.Drawing.Size, System.Drawing">
     <value>247, 22</value>
   </data>
-  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
-    <value>panel2</value>
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
   </data>
   <data name="menuMoveTop.Text" xml:space="preserve">
     <value>Move to top (T)</value>
@@ -430,13 +469,19 @@
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>762, 102</value>
+    <value>762, 142</value>
   </data>
   <data name="&gt;&gt;txtUrl.Name" xml:space="preserve">
     <value>txtUrl</value>
   </data>
   <data name="lvRoutings.Size" type="System.Drawing.Size, System.Drawing">
-    <value>748, 356</value>
+    <value>748, 225</value>
+  </data>
+  <data name="btnBrowse.Location" type="System.Drawing.Point, System.Drawing">
+    <value>660, 104</value>
+  </data>
+  <data name="&gt;&gt;menuServer.Parent" xml:space="preserve">
+    <value>$this</value>
   </data>
   <data name="lvRoutings.Items" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
@@ -458,17 +503,29 @@
   <data name="txtUrl.TabIndex" type="System.Int32, mscorlib">
     <value>34</value>
   </data>
+  <data name="&gt;&gt;txtCustomIcon.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;btnBrowse.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;label4.Name" xml:space="preserve">
+    <value>label4</value>
+  </data>
   <data name="btnOK.Text" xml:space="preserve">
     <value>&amp;OK</value>
   </data>
   <data name="&gt;&gt;label3.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="label5.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
   <data name="menuImportRulesFromUrl.Size" type="System.Drawing.Size, System.Drawing">
     <value>247, 22</value>
   </data>
-  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
+    <value>panel2</value>
   </data>
   <data name="label1.TabIndex" type="System.Int32, mscorlib">
     <value>35</value>
@@ -476,6 +533,9 @@
   <data name="&gt;&gt;lvRoutings.Type" xml:space="preserve">
     <value>v2rayN.Base.ListViewFlickerFree, v2rayN, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 12</value>
+  </data>
   <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
     <value>18, 45</value>
   </data>
@@ -485,26 +545,20 @@
   <data name="txtUrl.Location" type="System.Drawing.Point, System.Drawing">
     <value>91, 45</value>
   </data>
-  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>166, 21</value>
-  </data>
   <data name="&gt;&gt;menuImportRulesFromClipboard.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="tabPage2.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="txtUrl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>644, 48</value>
-  </data>
   <data name="&gt;&gt;menuMoveDown.Name" xml:space="preserve">
     <value>menuMoveDown</value>
   </data>
+  <data name="&gt;&gt;panel2.Name" xml:space="preserve">
+    <value>panel2</value>
+  </data>
   <data name="menuAdd.Size" type="System.Drawing.Size, System.Drawing">
     <value>202, 22</value>
   </data>
-  <data name="menuExportSelectedRules.Text" xml:space="preserve">
-    <value>Export Selected Rules</value>
+  <data name="&gt;&gt;tabPage2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;menuImportRulesFromFile.Name" xml:space="preserve">
     <value>menuImportRulesFromFile</value>
@@ -524,6 +578,15 @@
   <data name="panel2.TabIndex" type="System.Int32, mscorlib">
     <value>7</value>
   </data>
+  <data name="txtUrl.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
+    <value>Vertical</value>
+  </data>
+  <data name="btnBrowse.Text" xml:space="preserve">
+    <value>&amp;Browse</value>
+  </data>
+  <data name="&gt;&gt;txtCustomIcon.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;label1.Parent" xml:space="preserve">
     <value>panel1</value>
   </data>
@@ -543,7 +606,7 @@
     <value>3, 3, 3, 3</value>
   </data>
   <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 515</value>
+    <value>0, 424</value>
   </data>
   <data name="&gt;&gt;menuMoveUp.Name" xml:space="preserve">
     <value>menuMoveUp</value>
@@ -551,21 +614,45 @@
   <data name="tabPage2.Text" xml:space="preserve">
     <value>RuleList</value>
   </data>
+  <data name="&gt;&gt;toolStripMenuItem1.Name" xml:space="preserve">
+    <value>toolStripMenuItem1</value>
+  </data>
+  <data name="txtCustomIcon.Size" type="System.Drawing.Size, System.Drawing">
+    <value>563, 21</value>
+  </data>
+  <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
   <data name="menuSelectAll.Text" xml:space="preserve">
     <value>Select All (Ctrl+A)</value>
   </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
     <value>53, 12</value>
   </data>
+  <data name="tabControl2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>18, 13</value>
+  </data>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
     <value>6, 12</value>
   </data>
+  <data name="txtCustomIcon.TabIndex" type="System.Int32, mscorlib">
+    <value>37</value>
+  </data>
   <data name="&gt;&gt;menuExportSelectedRules.Name" xml:space="preserve">
     <value>menuExportSelectedRules</value>
   </data>
   <data name="label1.Text" xml:space="preserve">
     <value>Optional</value>
   </data>
+  <data name="menuExportSelectedRules.Text" xml:space="preserve">
+    <value>Export Selected Rules</value>
+  </data>
+  <data name="label4.TabIndex" type="System.Int32, mscorlib">
+    <value>36</value>
+  </data>
   <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
     <value>91, 13</value>
   </data>
@@ -587,6 +674,9 @@
   <data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
     <value>202, 22</value>
   </data>
+  <data name="txtCustomIcon.Location" type="System.Drawing.Point, System.Drawing">
+    <value>91, 105</value>
+  </data>
   <data name="&gt;&gt;label2.Name" xml:space="preserve">
     <value>label2</value>
   </data>
@@ -596,18 +686,30 @@
   <data name="txtUrl.Multiline" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>18, 13</value>
+  <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
   <data name="btnOK.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>762, 575</value>
+    <value>762, 484</value>
   </data>
   <data name="&gt;&gt;menuImportRulesFromFile.Type" xml:space="preserve">
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
+  <data name="&gt;&gt;btnBrowse.Name" xml:space="preserve">
+    <value>btnBrowse</value>
+  </data>
+  <data name="&gt;&gt;panel2.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="btnBrowse.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="btnBrowse.TabIndex" type="System.Int32, mscorlib">
+    <value>39</value>
+  </data>
   <data name="&gt;&gt;label1.Type" xml:space="preserve">
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -615,22 +717,25 @@
     <value>202, 22</value>
   </data>
   <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>6</value>
   </data>
   <data name="btnClose.Text" xml:space="preserve">
     <value>&amp;Cancel</value>
   </data>
-  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
   <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
-  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
+  </data>
+  <data name="tabPage2.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
   </data>
   <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>7</value>
+  </data>
+  <data name="&gt;&gt;txtCustomIcon.Parent" xml:space="preserve">
+    <value>panel1</value>
   </data>
   <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
@@ -638,6 +743,9 @@
   <data name="&gt;&gt;tabControl2.Name" xml:space="preserve">
     <value>tabControl2</value>
   </data>
+  <data name="&gt;&gt;label5.Parent" xml:space="preserve">
+    <value>panel1</value>
+  </data>
   <data name="&gt;&gt;tabPage2.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
@@ -653,6 +761,9 @@
   <data name="label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>Custom icon</value>
+  </data>
   <data name="&gt;&gt;lvRoutings.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
@@ -662,13 +773,13 @@
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
-  <metadata name="cmsLv.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-  <metadata name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>zh-Hans</value>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>25</value>
   </metadata>
   <metadata name="menuServer.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>139, 17</value>
   </metadata>
+  <metadata name="cmsLv.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
 </root>

v2rayN/v2rayN/Forms/RoutingRuleSettingForm.zh-Hans.resx

@@ -122,7 +122,7 @@
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 613</value>
+    <value>0, 501</value>
   </data>
   <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
     <value>785, 60</value>
@@ -131,7 +131,22 @@
     <value>确定(&amp;O)</value>
   </data>
   <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>785, 109</value>
+    <value>785, 147</value>
+  </data>
+  <data name="btnBrowse.Location" type="System.Drawing.Point, System.Drawing">
+    <value>670, 104</value>
+  </data>
+  <data name="btnBrowse.Text" xml:space="preserve">
+    <value>浏览(&amp;B)</value>
+  </data>
+  <data name="txtCustomIcon.Location" type="System.Drawing.Point, System.Drawing">
+    <value>101, 105</value>
+  </data>
+  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>自定义图标</value>
   </data>
   <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
     <value>29, 12</value>
@@ -157,29 +172,6 @@
   <data name="label2.Text" xml:space="preserve">
     <value>别名</value>
   </data>
-  <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
-    <value>197, 186</value>
-  </data>
-  <data name="lvRoutings.Items" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
-        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkMAwAAAFFTeXN0
-        ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2Vu
-        PWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACFTeXN0ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0l0ZW0HAAAA
-        BFRleHQKSW1hZ2VJbmRleAlCYWNrQ29sb3IHQ2hlY2tlZARGb250CUZvcmVDb2xvchdVc2VJdGVtU3R5
-        bGVGb3JTdWJJdGVtcwEABAAEBAAIFFN5c3RlbS5EcmF3aW5nLkNvbG9yAwAAAAETU3lzdGVtLkRyYXdp
-        bmcuRm9udAMAAAAUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAAQIAAAAGBAAAAAD/////Bfv///8UU3lz
-        dGVtLkRyYXdpbmcuQ29sb3IEAAAABG5hbWUFdmFsdWUKa25vd25Db2xvcgVzdGF0ZQEAAAAJBwcDAAAA
-        CgAAAAAAAAAAGAABAAAJBgAAAAH5////+////woAAAAAAAAAABoAAQABBQYAAAATU3lzdGVtLkRyYXdp
-        bmcuRm9udAQAAAAETmFtZQRTaXplBVN0eWxlBFVuaXQBAAQECxhTeXN0ZW0uRHJhd2luZy5Gb250U3R5
-        bGUDAAAAG1N5c3RlbS5EcmF3aW5nLkdyYXBoaWNzVW5pdAMAAAADAAAABggAAAAG5a6L5L2TAAAQQQX3
-        ////GFN5c3RlbS5EcmF3aW5nLkZvbnRTdHlsZQEAAAAHdmFsdWVfXwAIAwAAAAAAAAAF9v///xtTeXN0
-        ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw==
-</value>
-  </data>
-  <data name="lvRoutings.Size" type="System.Drawing.Size, System.Drawing">
-    <value>771, 447</value>
-  </data>
   <data name="menuAdd.Size" type="System.Drawing.Size, System.Drawing">
     <value>196, 22</value>
   </data>
@@ -237,26 +229,58 @@
   <data name="MenuItem1.Text" xml:space="preserve">
     <value>规则功能</value>
   </data>
+  <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
+    <value>197, 186</value>
+  </data>
+  <data name="lvRoutings.Items" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkMAwAAAFFTeXN0
+        ZW0uRHJhd2luZywgVmVyc2lvbj00LjAuMC4wLCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2Vu
+        PWIwM2Y1ZjdmMTFkNTBhM2EFAQAAACFTeXN0ZW0uV2luZG93cy5Gb3Jtcy5MaXN0Vmlld0l0ZW0HAAAA
+        BFRleHQKSW1hZ2VJbmRleAlCYWNrQ29sb3IHQ2hlY2tlZARGb250CUZvcmVDb2xvchdVc2VJdGVtU3R5
+        bGVGb3JTdWJJdGVtcwEABAAEBAAIFFN5c3RlbS5EcmF3aW5nLkNvbG9yAwAAAAETU3lzdGVtLkRyYXdp
+        bmcuRm9udAMAAAAUU3lzdGVtLkRyYXdpbmcuQ29sb3IDAAAAAQIAAAAGBAAAAAD/////Bfv///8UU3lz
+        dGVtLkRyYXdpbmcuQ29sb3IEAAAABG5hbWUFdmFsdWUKa25vd25Db2xvcgVzdGF0ZQEAAAAJBwcDAAAA
+        CgAAAAAAAAAAGAABAAAJBgAAAAH5////+////woAAAAAAAAAABoAAQABBQYAAAATU3lzdGVtLkRyYXdp
+        bmcuRm9udAQAAAAETmFtZQRTaXplBVN0eWxlBFVuaXQBAAQECxhTeXN0ZW0uRHJhd2luZy5Gb250U3R5
+        bGUDAAAAG1N5c3RlbS5EcmF3aW5nLkdyYXBoaWNzVW5pdAMAAAADAAAABggAAAAG5a6L5L2TAAAQQQX3
+        ////GFN5c3RlbS5EcmF3aW5nLkZvbnRTdHlsZQEAAAAHdmFsdWVfXwAIAwAAAAAAAAAF9v///xtTeXN0
+        ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw==
+</value>
+  </data>
+  <data name="lvRoutings.Size" type="System.Drawing.Size, System.Drawing">
+    <value>771, 297</value>
+  </data>
   <data name="tabControl2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 134</value>
+    <value>0, 172</value>
   </data>
   <data name="tabControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>785, 479</value>
+    <value>785, 329</value>
   </data>
   <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>777, 453</value>
+    <value>777, 303</value>
   </data>
   <data name="tabPage2.Text" xml:space="preserve">
     <value>规则列表</value>
   </data>
+  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>785, 25</value>
+  </data>
+  <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>68, 21</value>
+  </data>
+  <data name="toolStripMenuItem1.Text" xml:space="preserve">
+    <value>导入规则</value>
+  </data>
   <data name="menuImportRulesFromFile.Size" type="System.Drawing.Size, System.Drawing">
-    <value>184, 22</value>
+    <value>189, 22</value>
   </data>
   <data name="menuImportRulesFromFile.Text" xml:space="preserve">
     <value>从文件中导入规则</value>
   </data>
   <data name="menuImportRulesFromClipboard.Size" type="System.Drawing.Size, System.Drawing">
-    <value>184, 22</value>
+    <value>189, 22</value>
   </data>
   <data name="menuImportRulesFromClipboard.Text" xml:space="preserve">
     <value>从剪贴板中导入规则</value>
@@ -267,17 +291,8 @@
   <data name="menuImportRulesFromUrl.Text" xml:space="preserve">
     <value>从订阅Url中导入规则</value>
   </data>
-  <data name="toolStripMenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>68, 21</value>
-  </data>
-  <data name="toolStripMenuItem1.Text" xml:space="preserve">
-    <value>导入规则</value>
-  </data>
-  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>785, 25</value>
-  </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>785, 673</value>
+    <value>785, 561</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>规则集设置</value>

v2rayN/v2rayN/Forms/RoutingSettingForm.Designer.cs

@@ -32,43 +32,86 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(RoutingSettingForm));
             this.btnClose = new System.Windows.Forms.Button();
             this.panel2 = new System.Windows.Forms.Panel();
+            this.labRoutingTips = new System.Windows.Forms.Label();
             this.btnOK = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.cmbdomainMatcher = new System.Windows.Forms.ComboBox();
+            this.label6 = new System.Windows.Forms.Label();
+            this.chkenableRoutingAdvanced = new System.Windows.Forms.CheckBox();
             this.linkLabelRoutingDoc = new System.Windows.Forms.LinkLabel();
             this.cmbdomainStrategy = new System.Windows.Forms.ComboBox();
-            this.lvRoutings = new v2rayN.Base.ListViewFlickerFree();
             this.cmsLv = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.menuAdd = new System.Windows.Forms.ToolStripMenuItem();
             this.menuRemove = new System.Windows.Forms.ToolStripMenuItem();
             this.menuSelectAll = new System.Windows.Forms.ToolStripMenuItem();
             this.menuSetDefaultRouting = new System.Windows.Forms.ToolStripMenuItem();
-            this.MenuItem1 = new System.Windows.Forms.ToolStripMenuItem();
-            this.tabControl2 = new System.Windows.Forms.TabControl();
-            this.tabPage2 = new System.Windows.Forms.TabPage();
+            this.MenuItemAdvanced = new System.Windows.Forms.ToolStripMenuItem();
             this.menuServer = new System.Windows.Forms.MenuStrip();
+            this.MenuItemBasic = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuImportBasicRules = new System.Windows.Forms.ToolStripMenuItem();
+            this.tabNormal = new System.Windows.Forms.TabControl();
+            this.tabPageProxy = new System.Windows.Forms.TabPage();
+            this.panel5 = new System.Windows.Forms.Panel();
+            this.groupBox5 = new System.Windows.Forms.GroupBox();
+            this.txtProxyIp = new System.Windows.Forms.TextBox();
+            this.groupBox6 = new System.Windows.Forms.GroupBox();
+            this.txtProxyDomain = new System.Windows.Forms.TextBox();
+            this.tabPageDirect = new System.Windows.Forms.TabPage();
+            this.panel4 = new System.Windows.Forms.Panel();
+            this.groupBox3 = new System.Windows.Forms.GroupBox();
+            this.txtDirectIp = new System.Windows.Forms.TextBox();
+            this.groupBox4 = new System.Windows.Forms.GroupBox();
+            this.txtDirectDomain = new System.Windows.Forms.TextBox();
+            this.tabPageBlock = new System.Windows.Forms.TabPage();
+            this.panel3 = new System.Windows.Forms.Panel();
+            this.groupBox2 = new System.Windows.Forms.GroupBox();
+            this.txtBlockIp = new System.Windows.Forms.TextBox();
+            this.groupBox1 = new System.Windows.Forms.GroupBox();
+            this.txtBlockDomain = new System.Windows.Forms.TextBox();
+            this.tabPageRuleList = new System.Windows.Forms.TabPage();
+            this.lvRoutings = new v2rayN.Base.ListViewFlickerFree();
             this.panel2.SuspendLayout();
             this.panel1.SuspendLayout();
             this.cmsLv.SuspendLayout();
-            this.tabControl2.SuspendLayout();
-            this.tabPage2.SuspendLayout();
             this.menuServer.SuspendLayout();
+            this.tabNormal.SuspendLayout();
+            this.tabPageProxy.SuspendLayout();
+            this.panel5.SuspendLayout();
+            this.groupBox5.SuspendLayout();
+            this.groupBox6.SuspendLayout();
+            this.tabPageDirect.SuspendLayout();
+            this.panel4.SuspendLayout();
+            this.groupBox3.SuspendLayout();
+            this.groupBox4.SuspendLayout();
+            this.tabPageBlock.SuspendLayout();
+            this.panel3.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            this.groupBox1.SuspendLayout();
+            this.tabPageRuleList.SuspendLayout();
             this.SuspendLayout();
             // 
             // 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);
             // 
             // panel2
             // 
+            resources.ApplyResources(this.panel2, "panel2");
+            this.panel2.Controls.Add(this.labRoutingTips);
             this.panel2.Controls.Add(this.btnClose);
             this.panel2.Controls.Add(this.btnOK);
-            resources.ApplyResources(this.panel2, "panel2");
             this.panel2.Name = "panel2";
             // 
+            // labRoutingTips
+            // 
+            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
+            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
+            this.labRoutingTips.Name = "labRoutingTips";
+            // 
             // btnOK
             // 
             resources.ApplyResources(this.btnOK, "btnOK");
@@ -78,11 +121,36 @@
             // 
             // panel1
             // 
+            resources.ApplyResources(this.panel1, "panel1");
+            this.panel1.Controls.Add(this.cmbdomainMatcher);
+            this.panel1.Controls.Add(this.label6);
+            this.panel1.Controls.Add(this.chkenableRoutingAdvanced);
             this.panel1.Controls.Add(this.linkLabelRoutingDoc);
             this.panel1.Controls.Add(this.cmbdomainStrategy);
-            resources.ApplyResources(this.panel1, "panel1");
             this.panel1.Name = "panel1";
             // 
+            // cmbdomainMatcher
+            // 
+            resources.ApplyResources(this.cmbdomainMatcher, "cmbdomainMatcher");
+            this.cmbdomainMatcher.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbdomainMatcher.FormattingEnabled = true;
+            this.cmbdomainMatcher.Items.AddRange(new object[] {
+            resources.GetString("cmbdomainMatcher.Items"),
+            resources.GetString("cmbdomainMatcher.Items1")});
+            this.cmbdomainMatcher.Name = "cmbdomainMatcher";
+            // 
+            // label6
+            // 
+            resources.ApplyResources(this.label6, "label6");
+            this.label6.Name = "label6";
+            // 
+            // chkenableRoutingAdvanced
+            // 
+            resources.ApplyResources(this.chkenableRoutingAdvanced, "chkenableRoutingAdvanced");
+            this.chkenableRoutingAdvanced.Name = "chkenableRoutingAdvanced";
+            this.chkenableRoutingAdvanced.UseVisualStyleBackColor = true;
+            this.chkenableRoutingAdvanced.CheckedChanged += new System.EventHandler(this.chkenableRoutingAdvanced_CheckedChanged_1);
+            // 
             // linkLabelRoutingDoc
             // 
             resources.ApplyResources(this.linkLabelRoutingDoc, "linkLabelRoutingDoc");
@@ -92,19 +160,214 @@
             // 
             // 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";
             // 
+            // cmsLv
+            // 
+            resources.ApplyResources(this.cmsLv, "cmsLv");
+            this.cmsLv.ImageScalingSize = new System.Drawing.Size(20, 20);
+            this.cmsLv.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.menuAdd,
+            this.menuRemove,
+            this.menuSelectAll,
+            this.menuSetDefaultRouting});
+            this.cmsLv.Name = "cmsLv";
+            this.cmsLv.OwnerItem = this.MenuItemAdvanced;
+            // 
+            // menuAdd
+            // 
+            resources.ApplyResources(this.menuAdd, "menuAdd");
+            this.menuAdd.Name = "menuAdd";
+            this.menuAdd.Click += new System.EventHandler(this.menuAdd_Click);
+            // 
+            // menuRemove
+            // 
+            resources.ApplyResources(this.menuRemove, "menuRemove");
+            this.menuRemove.Name = "menuRemove";
+            this.menuRemove.Click += new System.EventHandler(this.menuRemove_Click);
+            // 
+            // menuSelectAll
+            // 
+            resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
+            this.menuSelectAll.Name = "menuSelectAll";
+            this.menuSelectAll.Click += new System.EventHandler(this.menuSelectAll_Click);
+            // 
+            // menuSetDefaultRouting
+            // 
+            resources.ApplyResources(this.menuSetDefaultRouting, "menuSetDefaultRouting");
+            this.menuSetDefaultRouting.Name = "menuSetDefaultRouting";
+            this.menuSetDefaultRouting.Click += new System.EventHandler(this.menuSetDefaultRouting_Click);
+            // 
+            // MenuItemAdvanced
+            // 
+            resources.ApplyResources(this.MenuItemAdvanced, "MenuItemAdvanced");
+            this.MenuItemAdvanced.DropDown = this.cmsLv;
+            this.MenuItemAdvanced.Name = "MenuItemAdvanced";
+            // 
+            // menuServer
+            // 
+            resources.ApplyResources(this.menuServer, "menuServer");
+            this.menuServer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.MenuItemBasic,
+            this.MenuItemAdvanced});
+            this.menuServer.Name = "menuServer";
+            // 
+            // MenuItemBasic
+            // 
+            resources.ApplyResources(this.MenuItemBasic, "MenuItemBasic");
+            this.MenuItemBasic.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
+            this.menuImportBasicRules});
+            this.MenuItemBasic.Name = "MenuItemBasic";
+            // 
+            // menuImportBasicRules
+            // 
+            resources.ApplyResources(this.menuImportBasicRules, "menuImportBasicRules");
+            this.menuImportBasicRules.Name = "menuImportBasicRules";
+            this.menuImportBasicRules.Click += new System.EventHandler(this.menuImportBasicRules_Click);
+            // 
+            // tabNormal
+            // 
+            resources.ApplyResources(this.tabNormal, "tabNormal");
+            this.tabNormal.Controls.Add(this.tabPageProxy);
+            this.tabNormal.Controls.Add(this.tabPageDirect);
+            this.tabNormal.Controls.Add(this.tabPageBlock);
+            this.tabNormal.Controls.Add(this.tabPageRuleList);
+            this.tabNormal.Name = "tabNormal";
+            this.tabNormal.SelectedIndex = 0;
+            this.tabNormal.Selecting += new System.Windows.Forms.TabControlCancelEventHandler(this.tabNormal_Selecting);
+            // 
+            // tabPageProxy
+            // 
+            resources.ApplyResources(this.tabPageProxy, "tabPageProxy");
+            this.tabPageProxy.Controls.Add(this.panel5);
+            this.tabPageProxy.Name = "tabPageProxy";
+            this.tabPageProxy.UseVisualStyleBackColor = true;
+            // 
+            // panel5
+            // 
+            resources.ApplyResources(this.panel5, "panel5");
+            this.panel5.Controls.Add(this.groupBox5);
+            this.panel5.Controls.Add(this.groupBox6);
+            this.panel5.Name = "panel5";
+            // 
+            // groupBox5
+            // 
+            resources.ApplyResources(this.groupBox5, "groupBox5");
+            this.groupBox5.Controls.Add(this.txtProxyIp);
+            this.groupBox5.Name = "groupBox5";
+            this.groupBox5.TabStop = false;
+            // 
+            // txtProxyIp
+            // 
+            resources.ApplyResources(this.txtProxyIp, "txtProxyIp");
+            this.txtProxyIp.Name = "txtProxyIp";
+            // 
+            // groupBox6
+            // 
+            resources.ApplyResources(this.groupBox6, "groupBox6");
+            this.groupBox6.Controls.Add(this.txtProxyDomain);
+            this.groupBox6.Name = "groupBox6";
+            this.groupBox6.TabStop = false;
+            // 
+            // txtProxyDomain
+            // 
+            resources.ApplyResources(this.txtProxyDomain, "txtProxyDomain");
+            this.txtProxyDomain.Name = "txtProxyDomain";
+            // 
+            // tabPageDirect
+            // 
+            resources.ApplyResources(this.tabPageDirect, "tabPageDirect");
+            this.tabPageDirect.Controls.Add(this.panel4);
+            this.tabPageDirect.Name = "tabPageDirect";
+            this.tabPageDirect.UseVisualStyleBackColor = true;
+            // 
+            // panel4
+            // 
+            resources.ApplyResources(this.panel4, "panel4");
+            this.panel4.Controls.Add(this.groupBox3);
+            this.panel4.Controls.Add(this.groupBox4);
+            this.panel4.Name = "panel4";
+            // 
+            // groupBox3
+            // 
+            resources.ApplyResources(this.groupBox3, "groupBox3");
+            this.groupBox3.Controls.Add(this.txtDirectIp);
+            this.groupBox3.Name = "groupBox3";
+            this.groupBox3.TabStop = false;
+            // 
+            // txtDirectIp
+            // 
+            resources.ApplyResources(this.txtDirectIp, "txtDirectIp");
+            this.txtDirectIp.Name = "txtDirectIp";
+            // 
+            // groupBox4
+            // 
+            resources.ApplyResources(this.groupBox4, "groupBox4");
+            this.groupBox4.Controls.Add(this.txtDirectDomain);
+            this.groupBox4.Name = "groupBox4";
+            this.groupBox4.TabStop = false;
+            // 
+            // txtDirectDomain
+            // 
+            resources.ApplyResources(this.txtDirectDomain, "txtDirectDomain");
+            this.txtDirectDomain.Name = "txtDirectDomain";
+            // 
+            // tabPageBlock
+            // 
+            resources.ApplyResources(this.tabPageBlock, "tabPageBlock");
+            this.tabPageBlock.Controls.Add(this.panel3);
+            this.tabPageBlock.Name = "tabPageBlock";
+            this.tabPageBlock.UseVisualStyleBackColor = true;
+            // 
+            // panel3
+            // 
+            resources.ApplyResources(this.panel3, "panel3");
+            this.panel3.Controls.Add(this.groupBox2);
+            this.panel3.Controls.Add(this.groupBox1);
+            this.panel3.Name = "panel3";
+            // 
+            // groupBox2
+            // 
+            resources.ApplyResources(this.groupBox2, "groupBox2");
+            this.groupBox2.Controls.Add(this.txtBlockIp);
+            this.groupBox2.Name = "groupBox2";
+            this.groupBox2.TabStop = false;
+            // 
+            // txtBlockIp
+            // 
+            resources.ApplyResources(this.txtBlockIp, "txtBlockIp");
+            this.txtBlockIp.Name = "txtBlockIp";
+            // 
+            // groupBox1
+            // 
+            resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Controls.Add(this.txtBlockDomain);
+            this.groupBox1.Name = "groupBox1";
+            this.groupBox1.TabStop = false;
+            // 
+            // txtBlockDomain
+            // 
+            resources.ApplyResources(this.txtBlockDomain, "txtBlockDomain");
+            this.txtBlockDomain.Name = "txtBlockDomain";
+            // 
+            // tabPageRuleList
+            // 
+            resources.ApplyResources(this.tabPageRuleList, "tabPageRuleList");
+            this.tabPageRuleList.Controls.Add(this.lvRoutings);
+            this.tabPageRuleList.Name = "tabPageRuleList";
+            this.tabPageRuleList.UseVisualStyleBackColor = true;
+            // 
             // lvRoutings
             // 
-            this.lvRoutings.ContextMenuStrip = this.cmsLv;
             resources.ApplyResources(this.lvRoutings, "lvRoutings");
+            this.lvRoutings.ContextMenuStrip = this.cmsLv;
             this.lvRoutings.FullRowSelect = true;
             this.lvRoutings.GridLines = true;
             this.lvRoutings.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
@@ -117,75 +380,12 @@
             this.lvRoutings.View = System.Windows.Forms.View.Details;
             this.lvRoutings.DoubleClick += new System.EventHandler(this.lvRoutings_DoubleClick);
             // 
-            // cmsLv
-            // 
-            this.cmsLv.ImageScalingSize = new System.Drawing.Size(20, 20);
-            this.cmsLv.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.menuAdd,
-            this.menuRemove,
-            this.menuSelectAll,
-            this.menuSetDefaultRouting});
-            this.cmsLv.Name = "cmsLv";
-            this.cmsLv.OwnerItem = this.MenuItem1;
-            resources.ApplyResources(this.cmsLv, "cmsLv");
-            // 
-            // menuAdd
-            // 
-            this.menuAdd.Name = "menuAdd";
-            resources.ApplyResources(this.menuAdd, "menuAdd");
-            this.menuAdd.Click += new System.EventHandler(this.menuAdd_Click);
-            // 
-            // menuRemove
-            // 
-            this.menuRemove.Name = "menuRemove";
-            resources.ApplyResources(this.menuRemove, "menuRemove");
-            this.menuRemove.Click += new System.EventHandler(this.menuRemove_Click);
-            // 
-            // menuSelectAll
-            // 
-            this.menuSelectAll.Name = "menuSelectAll";
-            resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
-            this.menuSelectAll.Click += new System.EventHandler(this.menuSelectAll_Click);
-            // 
-            // menuSetDefaultRouting
-            // 
-            this.menuSetDefaultRouting.Name = "menuSetDefaultRouting";
-            resources.ApplyResources(this.menuSetDefaultRouting, "menuSetDefaultRouting");
-            this.menuSetDefaultRouting.Click += new System.EventHandler(this.menuSetDefaultRouting_Click);
-            // 
-            // MenuItem1
-            // 
-            this.MenuItem1.DropDown = this.cmsLv;
-            this.MenuItem1.Name = "MenuItem1";
-            resources.ApplyResources(this.MenuItem1, "MenuItem1");
-            // 
-            // tabControl2
-            // 
-            this.tabControl2.Controls.Add(this.tabPage2);
-            resources.ApplyResources(this.tabControl2, "tabControl2");
-            this.tabControl2.Name = "tabControl2";
-            this.tabControl2.SelectedIndex = 0;
-            // 
-            // tabPage2
-            // 
-            this.tabPage2.Controls.Add(this.lvRoutings);
-            resources.ApplyResources(this.tabPage2, "tabPage2");
-            this.tabPage2.Name = "tabPage2";
-            this.tabPage2.UseVisualStyleBackColor = true;
-            // 
-            // menuServer
-            // 
-            this.menuServer.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
-            this.MenuItem1});
-            resources.ApplyResources(this.menuServer, "menuServer");
-            this.menuServer.Name = "menuServer";
-            // 
             // RoutingSettingForm
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnClose;
-            this.Controls.Add(this.tabControl2);
+            this.Controls.Add(this.tabNormal);
             this.Controls.Add(this.panel1);
             this.Controls.Add(this.panel2);
             this.Controls.Add(this.menuServer);
@@ -196,10 +396,28 @@
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             this.cmsLv.ResumeLayout(false);
-            this.tabControl2.ResumeLayout(false);
-            this.tabPage2.ResumeLayout(false);
             this.menuServer.ResumeLayout(false);
             this.menuServer.PerformLayout();
+            this.tabNormal.ResumeLayout(false);
+            this.tabPageProxy.ResumeLayout(false);
+            this.panel5.ResumeLayout(false);
+            this.groupBox5.ResumeLayout(false);
+            this.groupBox5.PerformLayout();
+            this.groupBox6.ResumeLayout(false);
+            this.groupBox6.PerformLayout();
+            this.tabPageDirect.ResumeLayout(false);
+            this.panel4.ResumeLayout(false);
+            this.groupBox3.ResumeLayout(false);
+            this.groupBox3.PerformLayout();
+            this.groupBox4.ResumeLayout(false);
+            this.groupBox4.PerformLayout();
+            this.tabPageBlock.ResumeLayout(false);
+            this.panel3.ResumeLayout(false);
+            this.groupBox2.ResumeLayout(false);
+            this.groupBox2.PerformLayout();
+            this.groupBox1.ResumeLayout(false);
+            this.groupBox1.PerformLayout();
+            this.tabPageRuleList.ResumeLayout(false);
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -212,15 +430,39 @@
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.LinkLabel linkLabelRoutingDoc;
         private System.Windows.Forms.ComboBox cmbdomainStrategy;
-        private Base.ListViewFlickerFree lvRoutings;
-        private System.Windows.Forms.TabControl tabControl2;
-        private System.Windows.Forms.TabPage tabPage2;
         private System.Windows.Forms.ContextMenuStrip cmsLv;
         private System.Windows.Forms.ToolStripMenuItem menuRemove;
         private System.Windows.Forms.ToolStripMenuItem menuSelectAll;
         private System.Windows.Forms.ToolStripMenuItem menuAdd;
         private System.Windows.Forms.MenuStrip menuServer;
-        private System.Windows.Forms.ToolStripMenuItem MenuItem1;
+        private System.Windows.Forms.ToolStripMenuItem MenuItemAdvanced;
         private System.Windows.Forms.ToolStripMenuItem menuSetDefaultRouting;
+        private System.Windows.Forms.TabControl tabNormal;
+        private System.Windows.Forms.TabPage tabPageProxy;
+        private System.Windows.Forms.TabPage tabPageDirect;
+        private System.Windows.Forms.TabPage tabPageBlock;
+        private System.Windows.Forms.Panel panel5;
+        private System.Windows.Forms.GroupBox groupBox5;
+        private System.Windows.Forms.TextBox txtProxyIp;
+        private System.Windows.Forms.GroupBox groupBox6;
+        private System.Windows.Forms.TextBox txtProxyDomain;
+        private System.Windows.Forms.Panel panel4;
+        private System.Windows.Forms.GroupBox groupBox3;
+        private System.Windows.Forms.TextBox txtDirectIp;
+        private System.Windows.Forms.GroupBox groupBox4;
+        private System.Windows.Forms.TextBox txtDirectDomain;
+        private System.Windows.Forms.Panel panel3;
+        private System.Windows.Forms.GroupBox groupBox2;
+        private System.Windows.Forms.TextBox txtBlockIp;
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.TextBox txtBlockDomain;
+        private System.Windows.Forms.TabPage tabPageRuleList;
+        private Base.ListViewFlickerFree lvRoutings;
+        private System.Windows.Forms.Label labRoutingTips;
+        private System.Windows.Forms.CheckBox chkenableRoutingAdvanced;
+        private System.Windows.Forms.ToolStripMenuItem MenuItemBasic;
+        private System.Windows.Forms.ToolStripMenuItem menuImportBasicRules;
+        private System.Windows.Forms.ComboBox cmbdomainMatcher;
+        private System.Windows.Forms.Label label6;
     }
 }

v2rayN/v2rayN/Forms/RoutingSettingForm.cs

@@ -10,6 +10,7 @@ namespace v2rayN.Forms
     public partial class RoutingSettingForm : BaseForm
     {
         private List<int> lvSelecteds = new List<int>();
+        private RoutingItem lockedItem;
         public RoutingSettingForm()
         {
             InitializeComponent();
@@ -20,6 +21,8 @@ namespace v2rayN.Forms
             ConfigHandler.InitBuiltinRouting(ref config);
 
             cmbdomainStrategy.Text = config.domainStrategy;
+            chkenableRoutingAdvanced.Checked = config.enableRoutingAdvanced;
+            cmbdomainMatcher.Text = config.domainMatcher;
 
             if (config.routings == null)
             {
@@ -27,55 +30,30 @@ namespace v2rayN.Forms
             }
             InitRoutingsView();
             RefreshRoutingsView();
+
+            BindingLockedData();
+            InitUI();
         }
 
-        private void InitRoutingsView()
+
+        private void tabNormal_Selecting(object sender, TabControlCancelEventArgs e)
         {
-            lvRoutings.BeginUpdate();
-            lvRoutings.Items.Clear();
-
-            lvRoutings.GridLines = true;
-            lvRoutings.FullRowSelect = true;
-            lvRoutings.View = View.Details;
-            lvRoutings.MultiSelect = true;
-            lvRoutings.HeaderStyle = ColumnHeaderStyle.Clickable;
-
-            lvRoutings.Columns.Add("", 30);
-            lvRoutings.Columns.Add(UIRes.I18N("LvAlias"), 200);
-            lvRoutings.Columns.Add(UIRes.I18N("LvUrl"), 240);
-            lvRoutings.Columns.Add(UIRes.I18N("LvCount"), 60);
-
-            lvRoutings.EndUpdate();
+            //if (tabNormal.SelectedTab == tabPageRuleList)
+            //{
+            //    MenuItem1.Enabled = true;
+            //}
+            //else
+            //{
+            //    MenuItem1.Enabled = false;
+            //}
         }
-
-        private void RefreshRoutingsView()
-        {
-            lvRoutings.BeginUpdate();
-            lvRoutings.Items.Clear();
-
-            for (int k = 0; k < config.routings.Count; k++)
-            {
-                string def = string.Empty;
-                if (config.routingIndex.Equals(k))
-                {
-                    def = "√";
-                }
-
-                var item = config.routings[k];
-
-                ListViewItem lvItem = new ListViewItem(def);
-                Utils.AddSubItem(lvItem, "remarks", item.remarks);
-                Utils.AddSubItem(lvItem, "url", item.url);
-                Utils.AddSubItem(lvItem, "count", item.rules.Count.ToString());
-
-                if (lvItem != null) lvRoutings.Items.Add(lvItem);
-            }
-            lvRoutings.EndUpdate();
-        }
-
         private void btnOK_Click(object sender, EventArgs e)
         {
             config.domainStrategy = cmbdomainStrategy.Text;
+            config.enableRoutingAdvanced = chkenableRoutingAdvanced.Checked;
+            config.domainMatcher = cmbdomainMatcher.Text;
+
+            EndBindingLockedData();
 
             if (ConfigHandler.SaveRouting(ref config) == 0)
             {
@@ -91,6 +69,119 @@ namespace v2rayN.Forms
         {
             this.DialogResult = DialogResult.Cancel;
         }
+        private void chkenableRoutingAdvanced_CheckedChanged_1(object sender, EventArgs e)
+        {
+            InitUI();
+        }
+        private void InitUI()
+        {
+            if (chkenableRoutingAdvanced.Checked)
+            {
+                this.tabPageProxy.Parent = null;
+                this.tabPageDirect.Parent = null;
+                this.tabPageBlock.Parent = null;
+                this.tabPageRuleList.Parent = tabNormal;
+                MenuItemBasic.Enabled = false;
+                MenuItemAdvanced.Enabled = true;
+
+            }
+            else
+            {
+                this.tabPageProxy.Parent = tabNormal;
+                this.tabPageDirect.Parent = tabNormal;
+                this.tabPageBlock.Parent = tabNormal;
+                this.tabPageRuleList.Parent = null;
+                MenuItemBasic.Enabled = true;
+                MenuItemAdvanced.Enabled = false;
+            }
+
+        }
+
+
+        #region locked
+        private void BindingLockedData()
+        {
+            lockedItem = ConfigHandler.GetLockedRoutingItem(ref config);
+            if (lockedItem != null)
+            {
+                txtProxyDomain.Text = Utils.List2String(lockedItem.rules[0].domain, true);
+                txtProxyIp.Text = Utils.List2String(lockedItem.rules[0].ip, true);
+
+                txtDirectDomain.Text = Utils.List2String(lockedItem.rules[1].domain, true);
+                txtDirectIp.Text = Utils.List2String(lockedItem.rules[1].ip, true);
+
+                txtBlockDomain.Text = Utils.List2String(lockedItem.rules[2].domain, true);
+                txtBlockIp.Text = Utils.List2String(lockedItem.rules[2].ip, true);
+            }
+        }
+        private void EndBindingLockedData()
+        {
+            if (lockedItem != null)
+            {
+                lockedItem.rules[0].domain = Utils.String2List(txtProxyDomain.Text.TrimEx());
+                lockedItem.rules[0].ip = Utils.String2List(txtProxyIp.Text.TrimEx());
+
+                lockedItem.rules[1].domain = Utils.String2List(txtDirectDomain.Text.TrimEx());
+                lockedItem.rules[1].ip = Utils.String2List(txtDirectIp.Text.TrimEx());
+
+                lockedItem.rules[2].domain = Utils.String2List(txtBlockDomain.Text.TrimEx());
+                lockedItem.rules[2].ip = Utils.String2List(txtBlockIp.Text.TrimEx());
+
+            }
+        }
+        #endregion
+
+        #region ListView
+        private void InitRoutingsView()
+        {
+            lvRoutings.BeginUpdate();
+            lvRoutings.Items.Clear();
+
+            lvRoutings.GridLines = true;
+            lvRoutings.FullRowSelect = true;
+            lvRoutings.View = View.Details;
+            lvRoutings.MultiSelect = true;
+            lvRoutings.HeaderStyle = ColumnHeaderStyle.Clickable;
+
+            lvRoutings.Columns.Add("", 30);
+            lvRoutings.Columns.Add(UIRes.I18N("LvAlias"), 200);
+            lvRoutings.Columns.Add(UIRes.I18N("LvCount"), 60);
+            lvRoutings.Columns.Add(UIRes.I18N("LvUrl"), 240);
+            lvRoutings.Columns.Add(UIRes.I18N("LvCustomIcon"), 240);
+
+            lvRoutings.EndUpdate();
+        }
+
+        private void RefreshRoutingsView()
+        {
+            lvRoutings.BeginUpdate();
+            lvRoutings.Items.Clear();
+
+            for (int k = 0; k < config.routings.Count; k++)
+            {
+                var item = config.routings[k];
+                if (item.locked == true)
+                {
+                    continue;
+                }
+
+                string def = string.Empty;
+                if (config.routingIndex.Equals(k))
+                {
+                    def = "√";
+                }
+
+                ListViewItem lvItem = new ListViewItem(def);
+                Utils.AddSubItem(lvItem, "remarks", item.remarks);
+                Utils.AddSubItem(lvItem, "count", item.rules.Count.ToString());
+                Utils.AddSubItem(lvItem, "url", item.url);
+                Utils.AddSubItem(lvItem, "customIcon", item.customIcon);
+
+                if (lvItem != null) lvRoutings.Items.Add(lvItem);
+            }
+            lvRoutings.EndUpdate();
+        }
+
 
         private void linkLabelRoutingDoc_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
@@ -137,6 +228,9 @@ namespace v2rayN.Forms
             }
         }
 
+        #endregion
+
+
         #region Edit function
 
 
@@ -197,8 +291,20 @@ namespace v2rayN.Forms
             }
             return 0;
         }
-        #endregion
 
+        private void menuImportBasicRules_Click(object sender, EventArgs e)
+        {
+            //Extra to bypass the mainland
+            txtProxyDomain.Text = "geosite:google";
+            txtDirectDomain.Text = "geosite:cn";
+            txtDirectIp.Text = "geoip:private,geoip:cn";
+
+            txtBlockDomain.Text = "geosite:category-ads-all";
+
+            UI.Show(UIRes.I18N("OperationSuccess"));
+        }
+
+        #endregion
 
     }
 }

v2rayN/v2rayN/Forms/RoutingSettingForm.zh-Hans.resx

@@ -117,18 +117,42 @@
   <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="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+    <value>691, 17</value>
+  </data>
   <data name="btnClose.Text" xml:space="preserve">
     <value>取消(&amp;C)</value>
   </data>
+  <data name="labRoutingTips.Size" type="System.Drawing.Size, System.Drawing">
+    <value>518, 16</value>
+  </data>
+  <data name="labRoutingTips.Text" xml:space="preserve">
+    <value>*设置的路由规则,用逗号(,)分隔;正则中的逗号用&lt;COMMA&gt;替代</value>
+  </data>
+  <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
+    <value>598, 17</value>
+  </data>
   <data name="btnOK.Text" xml:space="preserve">
     <value>确定(&amp;O)</value>
   </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 474</value>
+    <value>0, 545</value>
   </data>
   <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>726, 60</value>
+    <value>817, 60</value>
+  </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
+  </data>
+  <data name="label6.Text" xml:space="preserve">
+    <value>域名匹配算法</value>
+  </data>
+  <data name="chkenableRoutingAdvanced.Size" type="System.Drawing.Size, System.Drawing">
+    <value>120, 16</value>
+  </data>
+  <data name="chkenableRoutingAdvanced.Text" xml:space="preserve">
+    <value>启用路由高级功能</value>
   </data>
   <data name="linkLabelRoutingDoc.Size" type="System.Drawing.Size, System.Drawing">
     <value>77, 12</value>
@@ -137,7 +161,7 @@
     <value>域名解析策略</value>
   </data>
   <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>726, 51</value>
+    <value>817, 51</value>
   </data>
   <data name="menuAdd.Size" type="System.Drawing.Size, System.Drawing">
     <value>148, 22</value>
@@ -163,15 +187,93 @@
   <data name="menuSetDefaultRouting.Text" xml:space="preserve">
     <value>设为活动路由</value>
   </data>
-  <data name="MenuItem1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>104, 21</value>
+  <data name="MenuItemAdvanced.Size" type="System.Drawing.Size, System.Drawing">
+    <value>68, 21</value>
   </data>
-  <data name="MenuItem1.Text" xml:space="preserve">
-    <value>路由规则集功能</value>
+  <data name="MenuItemAdvanced.Text" xml:space="preserve">
+    <value>高级功能</value>
   </data>
   <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
     <value>149, 92</value>
   </data>
+  <data name="menuImportBasicRules.Size" type="System.Drawing.Size, System.Drawing">
+    <value>172, 22</value>
+  </data>
+  <data name="menuImportBasicRules.Text" xml:space="preserve">
+    <value>一键导入基础规则</value>
+  </data>
+  <data name="MenuItemBasic.Size" type="System.Drawing.Size, System.Drawing">
+    <value>68, 21</value>
+  </data>
+  <data name="MenuItemBasic.Text" xml:space="preserve">
+    <value>基础功能</value>
+  </data>
+  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>817, 25</value>
+  </data>
+  <data name="txtProxyIp.Size" type="System.Drawing.Size, System.Drawing">
+    <value>405, 417</value>
+  </data>
+  <data name="groupBox5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>411, 437</value>
+  </data>
+  <data name="txtProxyDomain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>386, 417</value>
+  </data>
+  <data name="groupBox6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>392, 437</value>
+  </data>
+  <data name="panel5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>803, 437</value>
+  </data>
+  <data name="tabPageProxy.Size" type="System.Drawing.Size, System.Drawing">
+    <value>809, 443</value>
+  </data>
+  <data name="tabPageProxy.Text" xml:space="preserve">
+    <value>  1.代理的Domain或IP  </value>
+  </data>
+  <data name="txtDirectIp.Size" type="System.Drawing.Size, System.Drawing">
+    <value>405, 417</value>
+  </data>
+  <data name="groupBox3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>411, 437</value>
+  </data>
+  <data name="txtDirectDomain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>386, 417</value>
+  </data>
+  <data name="groupBox4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>392, 437</value>
+  </data>
+  <data name="panel4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>803, 437</value>
+  </data>
+  <data name="tabPageDirect.Size" type="System.Drawing.Size, System.Drawing">
+    <value>809, 443</value>
+  </data>
+  <data name="tabPageDirect.Text" xml:space="preserve">
+    <value>  2.直连的Domain或IP  </value>
+  </data>
+  <data name="txtBlockIp.Size" type="System.Drawing.Size, System.Drawing">
+    <value>405, 417</value>
+  </data>
+  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>411, 437</value>
+  </data>
+  <data name="txtBlockDomain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>386, 417</value>
+  </data>
+  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>392, 437</value>
+  </data>
+  <data name="panel3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>803, 437</value>
+  </data>
+  <data name="tabPageBlock.Size" type="System.Drawing.Size, System.Drawing">
+    <value>809, 443</value>
+  </data>
+  <data name="tabPageBlock.Text" xml:space="preserve">
+    <value>  3.阻止的Domain或IP  </value>
+  </data>
   <data name="lvRoutings.Items" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
@@ -190,22 +292,19 @@
 </value>
   </data>
   <data name="lvRoutings.Size" type="System.Drawing.Size, System.Drawing">
-    <value>712, 366</value>
+    <value>803, 437</value>
   </data>
-  <data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>718, 372</value>
+  <data name="tabPageRuleList.Size" type="System.Drawing.Size, System.Drawing">
+    <value>809, 443</value>
   </data>
-  <data name="tabPage2.Text" xml:space="preserve">
-    <value>路由规则集列表</value>
+  <data name="tabPageRuleList.Text" xml:space="preserve">
+    <value>  预定义规则集列表</value>
   </data>
-  <data name="tabControl2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>726, 398</value>
-  </data>
-  <data name="menuServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>726, 25</value>
+  <data name="tabNormal.Size" type="System.Drawing.Size, System.Drawing">
+    <value>817, 469</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>726, 534</value>
+    <value>817, 605</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>路由设置</value>

v2rayN/v2rayN/Forms/ServerTransportControl.Designer.cs

@@ -0,0 +1,265 @@
+namespace v2rayN.Forms
+{
+    partial class ServerTransportControl
+    {
+        /// <summary> 
+        /// 必需的设计器变量。
+        /// </summary>
+        private System.ComponentModel.IContainer components = null;
+
+        /// <summary> 
+        /// 清理所有正在使用的资源。
+        /// </summary>
+        /// <param name="disposing">如果应释放托管资源，为 true；否则为 false。</param>
+        protected override void Dispose(bool disposing)
+        {
+            if (disposing && (components != null))
+            {
+                components.Dispose();
+            }
+            base.Dispose(disposing);
+        }
+
+        #region 组件设计器生成的代码
+
+        /// <summary> 
+        /// 设计器支持所需的方法 - 不要修改
+        /// 使用代码编辑器修改此方法的内容。
+        /// </summary>
+        private void InitializeComponent()
+        {
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(ServerTransportControl));
+            this.gbTransport = new System.Windows.Forms.GroupBox();
+            this.panTlsMore = new System.Windows.Forms.Panel();
+            this.label1 = new System.Windows.Forms.Label();
+            this.txtSNI = new System.Windows.Forms.TextBox();
+            this.labSNI = new System.Windows.Forms.Label();
+            this.labAllowInsecure = new System.Windows.Forms.Label();
+            this.cmbAllowInsecure = new System.Windows.Forms.ComboBox();
+            this.tipNetwork = new System.Windows.Forms.Label();
+            this.txtPath = new System.Windows.Forms.TextBox();
+            this.cmbNetwork = new System.Windows.Forms.ComboBox();
+            this.labNetwork = new System.Windows.Forms.Label();
+            this.labPath = new System.Windows.Forms.Label();
+            this.tipPath = new System.Windows.Forms.Label();
+            this.tipRequestHost = new System.Windows.Forms.Label();
+            this.labStreamSecurity = new System.Windows.Forms.Label();
+            this.cmbStreamSecurity = new System.Windows.Forms.ComboBox();
+            this.tipHeaderType = new System.Windows.Forms.Label();
+            this.txtRequestHost = new System.Windows.Forms.TextBox();
+            this.labHeaderType = new System.Windows.Forms.Label();
+            this.labRequestHost = new System.Windows.Forms.Label();
+            this.cmbHeaderType = new System.Windows.Forms.ComboBox();
+            this.clbAlpn = new System.Windows.Forms.CheckedListBox();
+            this.gbTransport.SuspendLayout();
+            this.panTlsMore.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // gbTransport
+            // 
+            this.gbTransport.Controls.Add(this.panTlsMore);
+            this.gbTransport.Controls.Add(this.tipNetwork);
+            this.gbTransport.Controls.Add(this.txtPath);
+            this.gbTransport.Controls.Add(this.cmbNetwork);
+            this.gbTransport.Controls.Add(this.labNetwork);
+            this.gbTransport.Controls.Add(this.labPath);
+            this.gbTransport.Controls.Add(this.tipPath);
+            this.gbTransport.Controls.Add(this.tipRequestHost);
+            this.gbTransport.Controls.Add(this.labStreamSecurity);
+            this.gbTransport.Controls.Add(this.cmbStreamSecurity);
+            this.gbTransport.Controls.Add(this.tipHeaderType);
+            this.gbTransport.Controls.Add(this.txtRequestHost);
+            this.gbTransport.Controls.Add(this.labHeaderType);
+            this.gbTransport.Controls.Add(this.labRequestHost);
+            this.gbTransport.Controls.Add(this.cmbHeaderType);
+            resources.ApplyResources(this.gbTransport, "gbTransport");
+            this.gbTransport.Name = "gbTransport";
+            this.gbTransport.TabStop = false;
+            // 
+            // panTlsMore
+            // 
+            this.panTlsMore.Controls.Add(this.clbAlpn);
+            this.panTlsMore.Controls.Add(this.label1);
+            this.panTlsMore.Controls.Add(this.txtSNI);
+            this.panTlsMore.Controls.Add(this.labSNI);
+            this.panTlsMore.Controls.Add(this.labAllowInsecure);
+            this.panTlsMore.Controls.Add(this.cmbAllowInsecure);
+            resources.ApplyResources(this.panTlsMore, "panTlsMore");
+            this.panTlsMore.Name = "panTlsMore";
+            // 
+            // label1
+            // 
+            resources.ApplyResources(this.label1, "label1");
+            this.label1.Name = "label1";
+            // 
+            // txtSNI
+            // 
+            resources.ApplyResources(this.txtSNI, "txtSNI");
+            this.txtSNI.Name = "txtSNI";
+            // 
+            // labSNI
+            // 
+            resources.ApplyResources(this.labSNI, "labSNI");
+            this.labSNI.Name = "labSNI";
+            // 
+            // labAllowInsecure
+            // 
+            resources.ApplyResources(this.labAllowInsecure, "labAllowInsecure");
+            this.labAllowInsecure.Name = "labAllowInsecure";
+            // 
+            // 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";
+            // 
+            // tipNetwork
+            // 
+            resources.ApplyResources(this.tipNetwork, "tipNetwork");
+            this.tipNetwork.Name = "tipNetwork";
+            // 
+            // txtPath
+            // 
+            resources.ApplyResources(this.txtPath, "txtPath");
+            this.txtPath.Name = "txtPath";
+            // 
+            // cmbNetwork
+            // 
+            this.cmbNetwork.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbNetwork.FormattingEnabled = true;
+            this.cmbNetwork.Items.AddRange(new object[] {
+            resources.GetString("cmbNetwork.Items"),
+            resources.GetString("cmbNetwork.Items1"),
+            resources.GetString("cmbNetwork.Items2"),
+            resources.GetString("cmbNetwork.Items3"),
+            resources.GetString("cmbNetwork.Items4"),
+            resources.GetString("cmbNetwork.Items5")});
+            resources.ApplyResources(this.cmbNetwork, "cmbNetwork");
+            this.cmbNetwork.Name = "cmbNetwork";
+            this.cmbNetwork.SelectedIndexChanged += new System.EventHandler(this.cmbNetwork_SelectedIndexChanged);
+            // 
+            // labNetwork
+            // 
+            resources.ApplyResources(this.labNetwork, "labNetwork");
+            this.labNetwork.Name = "labNetwork";
+            // 
+            // labPath
+            // 
+            resources.ApplyResources(this.labPath, "labPath");
+            this.labPath.Name = "labPath";
+            // 
+            // tipPath
+            // 
+            resources.ApplyResources(this.tipPath, "tipPath");
+            this.tipPath.Name = "tipPath";
+            // 
+            // tipRequestHost
+            // 
+            resources.ApplyResources(this.tipRequestHost, "tipRequestHost");
+            this.tipRequestHost.Name = "tipRequestHost";
+            // 
+            // labStreamSecurity
+            // 
+            resources.ApplyResources(this.labStreamSecurity, "labStreamSecurity");
+            this.labStreamSecurity.Name = "labStreamSecurity";
+            // 
+            // cmbStreamSecurity
+            // 
+            this.cmbStreamSecurity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbStreamSecurity.FormattingEnabled = true;
+            resources.ApplyResources(this.cmbStreamSecurity, "cmbStreamSecurity");
+            this.cmbStreamSecurity.Name = "cmbStreamSecurity";
+            this.cmbStreamSecurity.SelectedIndexChanged += new System.EventHandler(this.cmbStreamSecurity_SelectedIndexChanged);
+            // 
+            // tipHeaderType
+            // 
+            resources.ApplyResources(this.tipHeaderType, "tipHeaderType");
+            this.tipHeaderType.Name = "tipHeaderType";
+            // 
+            // txtRequestHost
+            // 
+            resources.ApplyResources(this.txtRequestHost, "txtRequestHost");
+            this.txtRequestHost.Name = "txtRequestHost";
+            // 
+            // labHeaderType
+            // 
+            resources.ApplyResources(this.labHeaderType, "labHeaderType");
+            this.labHeaderType.Name = "labHeaderType";
+            // 
+            // labRequestHost
+            // 
+            resources.ApplyResources(this.labRequestHost, "labRequestHost");
+            this.labRequestHost.Name = "labRequestHost";
+            // 
+            // cmbHeaderType
+            // 
+            this.cmbHeaderType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
+            this.cmbHeaderType.FormattingEnabled = true;
+            this.cmbHeaderType.Items.AddRange(new object[] {
+            resources.GetString("cmbHeaderType.Items"),
+            resources.GetString("cmbHeaderType.Items1"),
+            resources.GetString("cmbHeaderType.Items2"),
+            resources.GetString("cmbHeaderType.Items3"),
+            resources.GetString("cmbHeaderType.Items4"),
+            resources.GetString("cmbHeaderType.Items5"),
+            resources.GetString("cmbHeaderType.Items6")});
+            resources.ApplyResources(this.cmbHeaderType, "cmbHeaderType");
+            this.cmbHeaderType.Name = "cmbHeaderType";
+            // 
+            // clbAlpn
+            // 
+            this.clbAlpn.CheckOnClick = true;
+            resources.ApplyResources(this.clbAlpn, "clbAlpn");
+            this.clbAlpn.FormattingEnabled = true;
+            this.clbAlpn.Items.AddRange(new object[] {
+            resources.GetString("clbAlpn.Items"),
+            resources.GetString("clbAlpn.Items1")});
+            this.clbAlpn.MultiColumn = true;
+            this.clbAlpn.Name = "clbAlpn";
+            // 
+            // ServerTransportControl
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.Controls.Add(this.gbTransport);
+            this.Name = "ServerTransportControl";
+            this.Load += new System.EventHandler(this.ServerTransportControl_Load);
+            this.gbTransport.ResumeLayout(false);
+            this.gbTransport.PerformLayout();
+            this.panTlsMore.ResumeLayout(false);
+            this.panTlsMore.PerformLayout();
+            this.ResumeLayout(false);
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox gbTransport;
+        private System.Windows.Forms.Panel panTlsMore;
+        private System.Windows.Forms.TextBox txtSNI;
+        private System.Windows.Forms.Label labSNI;
+        private System.Windows.Forms.Label labAllowInsecure;
+        private System.Windows.Forms.ComboBox cmbAllowInsecure;
+        private System.Windows.Forms.Label tipNetwork;
+        private System.Windows.Forms.TextBox txtPath;
+        private System.Windows.Forms.ComboBox cmbNetwork;
+        private System.Windows.Forms.Label labNetwork;
+        private System.Windows.Forms.Label labPath;
+        private System.Windows.Forms.Label tipPath;
+        private System.Windows.Forms.Label tipRequestHost;
+        private System.Windows.Forms.Label labStreamSecurity;
+        private System.Windows.Forms.ComboBox cmbStreamSecurity;
+        private System.Windows.Forms.Label tipHeaderType;
+        private System.Windows.Forms.TextBox txtRequestHost;
+        private System.Windows.Forms.Label labHeaderType;
+        private System.Windows.Forms.Label labRequestHost;
+        private System.Windows.Forms.ComboBox cmbHeaderType;
+        private System.Windows.Forms.Label label1;
+        private System.Windows.Forms.CheckedListBox clbAlpn;
+    }
+}

v2rayN/v2rayN/Forms/ServerTransportControl.cs

@@ -0,0 +1,205 @@
+using System;
+using System.Collections.Generic;
+using System.Windows.Forms;
+using v2rayN.Mode;
+
+namespace v2rayN.Forms
+{
+    public partial class ServerTransportControl : UserControl
+    {
+        public bool AllowXtls { get; set; }
+        private VmessItem vmessItem = null;
+
+        public ServerTransportControl()
+        {
+            InitializeComponent();
+        }
+        private void ServerTransportControl_Load(object sender, EventArgs e)
+        {
+        }
+
+        private void Init(VmessItem item)
+        {
+            vmessItem = item;
+
+            cmbStreamSecurity.Items.Clear();
+            cmbStreamSecurity.Items.Add(string.Empty);
+            cmbStreamSecurity.Items.Add(Global.StreamSecurity);
+            if (AllowXtls)
+            {
+                cmbStreamSecurity.Items.Add(Global.StreamSecurityX);
+            }
+        }
+
+        public void BindingServer(VmessItem item)
+        {
+            Init(item);
+
+            cmbNetwork.Text = vmessItem.network;
+            cmbHeaderType.Text = vmessItem.headerType;
+            txtRequestHost.Text = vmessItem.requestHost;
+            txtPath.Text = vmessItem.path;
+            cmbStreamSecurity.Text = vmessItem.streamSecurity;
+            cmbAllowInsecure.Text = vmessItem.allowInsecure;
+            txtSNI.Text = vmessItem.sni;
+
+            if (vmessItem.alpn != null)
+            {
+                for (int i = 0; i < clbAlpn.Items.Count; i++)
+                {
+                    if (vmessItem.alpn.Contains(clbAlpn.Items[i].ToString()))
+                    {
+                        clbAlpn.SetItemChecked(i, true);
+                    }
+                }
+            }
+        }
+
+        public void ClearServer(VmessItem item)
+        {
+            Init(item);
+
+            cmbNetwork.Text = Global.DefaultNetwork;
+            cmbHeaderType.Text = Global.None;
+            txtRequestHost.Text = "";
+            cmbStreamSecurity.Text = "";
+            cmbAllowInsecure.Text = "";
+            txtPath.Text = "";
+            txtSNI.Text = "";
+            for (int i = 0; i < clbAlpn.Items.Count; i++)
+            {
+                clbAlpn.SetItemChecked(i, false);
+            }
+        }
+
+        public void EndBindingServer()
+        {
+            string network = cmbNetwork.Text;
+            string headerType = cmbHeaderType.Text;
+            string requestHost = txtRequestHost.Text;
+            string path = txtPath.Text;
+            string streamSecurity = cmbStreamSecurity.Text;
+            string allowInsecure = cmbAllowInsecure.Text;
+            string sni = txtSNI.Text;
+
+            vmessItem.network = network;
+            vmessItem.headerType = headerType;
+            vmessItem.requestHost = requestHost.Replace(" ", "");
+            vmessItem.path = path.Replace(" ", "");
+            vmessItem.streamSecurity = streamSecurity;
+            vmessItem.allowInsecure = allowInsecure;
+            vmessItem.sni = sni;
+
+            var alpn = new List<string>();
+            for (int i = 0; i < clbAlpn.Items.Count; i++)
+            {
+                if (clbAlpn.GetItemChecked(i))
+                {
+                    alpn.Add(clbAlpn.Items[i].ToString());
+                }
+            }
+            vmessItem.alpn = alpn;
+        }
+
+        private void cmbNetwork_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            SetHeaderType();
+            SetTips();
+        }
+
+        private void SetHeaderType()
+        {
+            cmbHeaderType.Items.Clear();
+
+            string network = cmbNetwork.Text;
+            if (Utils.IsNullOrEmpty(network))
+            {
+                cmbHeaderType.Items.Add(Global.None);
+                return;
+            }
+
+            if (network.Equals(Global.DefaultNetwork))
+            {
+                cmbHeaderType.Items.Add(Global.None);
+                cmbHeaderType.Items.Add(Global.TcpHeaderHttp);
+            }
+            else if (network.Equals("kcp") || network.Equals("quic"))
+            {
+                cmbHeaderType.Items.Add(Global.None);
+                cmbHeaderType.Items.Add("srtp");
+                cmbHeaderType.Items.Add("utp");
+                cmbHeaderType.Items.Add("wechat-video");
+                cmbHeaderType.Items.Add("dtls");
+                cmbHeaderType.Items.Add("wireguard");
+            }
+            else if (network.Equals("grpc"))
+            {
+                cmbHeaderType.Items.Add(Global.GrpcgunMode);
+                cmbHeaderType.Items.Add(Global.GrpcmultiMode);
+            }
+            else
+            {
+                cmbHeaderType.Items.Add(Global.None);
+            }
+            cmbHeaderType.SelectedIndex = 0;
+        }
+
+        private void SetTips()
+        {
+            string network = cmbNetwork.Text;
+            if (Utils.IsNullOrEmpty(network))
+            {
+                network = Global.DefaultNetwork;
+            }
+            labHeaderType.Visible = true;
+            tipRequestHost.Text =
+            tipPath.Text =
+            tipHeaderType.Text = string.Empty;
+
+            if (network.Equals(Global.DefaultNetwork))
+            {
+                tipRequestHost.Text = UIRes.I18N("TransportRequestHostTip1");
+                tipHeaderType.Text = UIRes.I18N("TransportHeaderTypeTip1");
+            }
+            else if (network.Equals("kcp"))
+            {
+                tipHeaderType.Text = UIRes.I18N("TransportHeaderTypeTip2");
+            }
+            else if (network.Equals("ws"))
+            {
+                tipRequestHost.Text = UIRes.I18N("TransportRequestHostTip2");
+                tipPath.Text = UIRes.I18N("TransportPathTip1");
+            }
+            else if (network.Equals("h2"))
+            {
+                tipRequestHost.Text = UIRes.I18N("TransportRequestHostTip3");
+                tipPath.Text = UIRes.I18N("TransportPathTip2");
+            }
+            else if (network.Equals("quic"))
+            {
+                tipRequestHost.Text = UIRes.I18N("TransportRequestHostTip4");
+                tipPath.Text = UIRes.I18N("TransportPathTip3");
+                tipHeaderType.Text = UIRes.I18N("TransportHeaderTypeTip3");
+            }
+            else if (network.Equals("grpc"))
+            {
+                tipPath.Text = UIRes.I18N("TransportPathTip4");
+                tipHeaderType.Text = UIRes.I18N("TransportHeaderTypeTip4");
+                labHeaderType.Visible = false;
+            }
+        }
+
+        private void cmbStreamSecurity_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            string security = cmbStreamSecurity.Text;
+            if (Utils.IsNullOrEmpty(security))
+            {
+                panTlsMore.Hide();
+            }
+            else
+            {
+                panTlsMore.Show();
+            }
+        }
+    }
+}

v2rayN/v2rayN/Forms/ServerTransportControl.resx

@@ -0,0 +1,777 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="clbAlpn.ColumnWidth" type="System.Int32, mscorlib">
+    <value>70</value>
+  </data>
+  <data name="clbAlpn.Items" xml:space="preserve">
+    <value>h2</value>
+  </data>
+  <data name="clbAlpn.Items1" xml:space="preserve">
+    <value>http/1.1</value>
+  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="clbAlpn.Location" type="System.Drawing.Point, System.Drawing">
+    <value>313, 7</value>
+  </data>
+  <data name="clbAlpn.Size" type="System.Drawing.Size, System.Drawing">
+    <value>172, 20</value>
+  </data>
+  <data name="clbAlpn.TabIndex" type="System.Int32, mscorlib">
+    <value>44</value>
+  </data>
+  <data name="&gt;&gt;clbAlpn.Name" xml:space="preserve">
+    <value>clbAlpn</value>
+  </data>
+  <data name="&gt;&gt;clbAlpn.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckedListBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;clbAlpn.Parent" xml:space="preserve">
+    <value>panTlsMore</value>
+  </data>
+  <data name="&gt;&gt;clbAlpn.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>241, 11</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>29, 12</value>
+  </data>
+  <data name="label1.TabIndex" type="System.Int32, mscorlib">
+    <value>43</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>alpn</value>
+  </data>
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">
+    <value>label1</value>
+  </data>
+  <data name="&gt;&gt;label1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
+    <value>panTlsMore</value>
+  </data>
+  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtSNI.Location" type="System.Drawing.Point, System.Drawing">
+    <value>100, 39</value>
+  </data>
+  <data name="txtSNI.Size" type="System.Drawing.Size, System.Drawing">
+    <value>385, 21</value>
+  </data>
+  <data name="txtSNI.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;txtSNI.Name" xml:space="preserve">
+    <value>txtSNI</value>
+  </data>
+  <data name="&gt;&gt;txtSNI.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtSNI.Parent" xml:space="preserve">
+    <value>panTlsMore</value>
+  </data>
+  <data name="&gt;&gt;txtSNI.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="labSNI.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="labSNI.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="labSNI.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 43</value>
+  </data>
+  <data name="labSNI.Size" type="System.Drawing.Size, System.Drawing">
+    <value>23, 12</value>
+  </data>
+  <data name="labSNI.TabIndex" type="System.Int32, mscorlib">
+    <value>32</value>
+  </data>
+  <data name="labSNI.Text" xml:space="preserve">
+    <value>SNI</value>
+  </data>
+  <data name="&gt;&gt;labSNI.Name" xml:space="preserve">
+    <value>labSNI</value>
+  </data>
+  <data name="&gt;&gt;labSNI.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;labSNI.Parent" xml:space="preserve">
+    <value>panTlsMore</value>
+  </data>
+  <data name="&gt;&gt;labSNI.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="labAllowInsecure.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="labAllowInsecure.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="labAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 11</value>
+  </data>
+  <data name="labAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="labAllowInsecure.TabIndex" type="System.Int32, mscorlib">
+    <value>31</value>
+  </data>
+  <data name="labAllowInsecure.Text" xml:space="preserve">
+    <value>allowInsecure</value>
+  </data>
+  <data name="&gt;&gt;labAllowInsecure.Name" xml:space="preserve">
+    <value>labAllowInsecure</value>
+  </data>
+  <data name="&gt;&gt;labAllowInsecure.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;labAllowInsecure.Parent" xml:space="preserve">
+    <value>panTlsMore</value>
+  </data>
+  <data name="&gt;&gt;labAllowInsecure.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="cmbAllowInsecure.Items" xml:space="preserve">
+    <value />
+  </data>
+  <data name="cmbAllowInsecure.Items1" xml:space="preserve">
+    <value>true</value>
+  </data>
+  <data name="cmbAllowInsecure.Items2" xml:space="preserve">
+    <value>false</value>
+  </data>
+  <data name="cmbAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
+    <value>100, 7</value>
+  </data>
+  <data name="cmbAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
+    <value>80, 20</value>
+  </data>
+  <data name="cmbAllowInsecure.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="&gt;&gt;cmbAllowInsecure.Name" xml:space="preserve">
+    <value>cmbAllowInsecure</value>
+  </data>
+  <data name="&gt;&gt;cmbAllowInsecure.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cmbAllowInsecure.Parent" xml:space="preserve">
+    <value>panTlsMore</value>
+  </data>
+  <data name="&gt;&gt;cmbAllowInsecure.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="panTlsMore.Location" type="System.Drawing.Point, System.Drawing">
+    <value>200, 149</value>
+  </data>
+  <data name="panTlsMore.Size" type="System.Drawing.Size, System.Drawing">
+    <value>500, 71</value>
+  </data>
+  <data name="panTlsMore.TabIndex" type="System.Int32, mscorlib">
+    <value>33</value>
+  </data>
+  <data name="&gt;&gt;panTlsMore.Name" xml:space="preserve">
+    <value>panTlsMore</value>
+  </data>
+  <data name="&gt;&gt;panTlsMore.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;panTlsMore.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;panTlsMore.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <data name="tipNetwork.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="tipNetwork.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="tipNetwork.Location" type="System.Drawing.Point, System.Drawing">
+    <value>350, 32</value>
+  </data>
+  <data name="tipNetwork.Size" type="System.Drawing.Size, System.Drawing">
+    <value>113, 12</value>
+  </data>
+  <data name="tipNetwork.TabIndex" type="System.Int32, mscorlib">
+    <value>15</value>
+  </data>
+  <data name="tipNetwork.Text" xml:space="preserve">
+    <value>*Default value tcp</value>
+  </data>
+  <data name="&gt;&gt;tipNetwork.Name" xml:space="preserve">
+    <value>tipNetwork</value>
+  </data>
+  <data name="&gt;&gt;tipNetwork.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tipNetwork.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;tipNetwork.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtPath.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 124</value>
+  </data>
+  <data name="txtPath.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="txtPath.Size" type="System.Drawing.Size, System.Drawing">
+    <value>396, 20</value>
+  </data>
+  <data name="txtPath.TabIndex" type="System.Int32, mscorlib">
+    <value>4</value>
+  </data>
+  <data name="&gt;&gt;txtPath.Name" xml:space="preserve">
+    <value>txtPath</value>
+  </data>
+  <data name="&gt;&gt;txtPath.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtPath.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;txtPath.ZOrder" xml:space="preserve">
+    <value>2</value>
+  </data>
+  <data name="cmbNetwork.Items" xml:space="preserve">
+    <value>tcp</value>
+  </data>
+  <data name="cmbNetwork.Items1" xml:space="preserve">
+    <value>kcp</value>
+  </data>
+  <data name="cmbNetwork.Items2" xml:space="preserve">
+    <value>ws</value>
+  </data>
+  <data name="cmbNetwork.Items3" xml:space="preserve">
+    <value>h2</value>
+  </data>
+  <data name="cmbNetwork.Items4" xml:space="preserve">
+    <value>quic</value>
+  </data>
+  <data name="cmbNetwork.Items5" xml:space="preserve">
+    <value>grpc</value>
+  </data>
+  <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
+    <value>192, 28</value>
+  </data>
+  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
+    <value>143, 20</value>
+  </data>
+  <data name="cmbNetwork.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;cmbNetwork.Name" xml:space="preserve">
+    <value>cmbNetwork</value>
+  </data>
+  <data name="&gt;&gt;cmbNetwork.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cmbNetwork.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;cmbNetwork.ZOrder" xml:space="preserve">
+    <value>3</value>
+  </data>
+  <data name="labNetwork.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="labNetwork.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="labNetwork.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 32</value>
+  </data>
+  <data name="labNetwork.Size" type="System.Drawing.Size, System.Drawing">
+    <value>167, 12</value>
+  </data>
+  <data name="labNetwork.TabIndex" type="System.Int32, mscorlib">
+    <value>13</value>
+  </data>
+  <data name="labNetwork.Text" xml:space="preserve">
+    <value>Transport protocol(network)</value>
+  </data>
+  <data name="&gt;&gt;labNetwork.Name" xml:space="preserve">
+    <value>labNetwork</value>
+  </data>
+  <data name="&gt;&gt;labNetwork.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;labNetwork.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;labNetwork.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="labPath.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="labPath.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="labPath.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 128</value>
+  </data>
+  <data name="labPath.Size" type="System.Drawing.Size, System.Drawing">
+    <value>29, 12</value>
+  </data>
+  <data name="labPath.TabIndex" type="System.Int32, mscorlib">
+    <value>27</value>
+  </data>
+  <data name="labPath.Text" xml:space="preserve">
+    <value>Path</value>
+  </data>
+  <data name="&gt;&gt;labPath.Name" xml:space="preserve">
+    <value>labPath</value>
+  </data>
+  <data name="&gt;&gt;labPath.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;labPath.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;labPath.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="tipPath.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="tipPath.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="tipPath.Location" type="System.Drawing.Point, System.Drawing">
+    <value>529, 128</value>
+  </data>
+  <data name="tipPath.Size" type="System.Drawing.Size, System.Drawing">
+    <value>11, 12</value>
+  </data>
+  <data name="tipPath.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
+  </data>
+  <data name="tipPath.Text" xml:space="preserve">
+    <value>*</value>
+  </data>
+  <data name="&gt;&gt;tipPath.Name" xml:space="preserve">
+    <value>tipPath</value>
+  </data>
+  <data name="&gt;&gt;tipPath.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tipPath.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;tipPath.ZOrder" xml:space="preserve">
+    <value>6</value>
+  </data>
+  <data name="tipRequestHost.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="tipRequestHost.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="tipRequestHost.Location" type="System.Drawing.Point, System.Drawing">
+    <value>464, 96</value>
+  </data>
+  <data name="tipRequestHost.Size" type="System.Drawing.Size, System.Drawing">
+    <value>11, 12</value>
+  </data>
+  <data name="tipRequestHost.TabIndex" type="System.Int32, mscorlib">
+    <value>23</value>
+  </data>
+  <data name="tipRequestHost.Text" xml:space="preserve">
+    <value>*</value>
+  </data>
+  <data name="&gt;&gt;tipRequestHost.Name" xml:space="preserve">
+    <value>tipRequestHost</value>
+  </data>
+  <data name="&gt;&gt;tipRequestHost.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tipRequestHost.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;tipRequestHost.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="labStreamSecurity.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="labStreamSecurity.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="labStreamSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 160</value>
+  </data>
+  <data name="labStreamSecurity.Size" type="System.Drawing.Size, System.Drawing">
+    <value>23, 12</value>
+  </data>
+  <data name="labStreamSecurity.TabIndex" type="System.Int32, mscorlib">
+    <value>22</value>
+  </data>
+  <data name="labStreamSecurity.Text" xml:space="preserve">
+    <value>TLS</value>
+  </data>
+  <data name="&gt;&gt;labStreamSecurity.Name" xml:space="preserve">
+    <value>labStreamSecurity</value>
+  </data>
+  <data name="&gt;&gt;labStreamSecurity.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;labStreamSecurity.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;labStreamSecurity.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="cmbStreamSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 156</value>
+  </data>
+  <data name="cmbStreamSecurity.Size" type="System.Drawing.Size, System.Drawing">
+    <value>60, 20</value>
+  </data>
+  <data name="cmbStreamSecurity.TabIndex" type="System.Int32, mscorlib">
+    <value>5</value>
+  </data>
+  <data name="&gt;&gt;cmbStreamSecurity.Name" xml:space="preserve">
+    <value>cmbStreamSecurity</value>
+  </data>
+  <data name="&gt;&gt;cmbStreamSecurity.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cmbStreamSecurity.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;cmbStreamSecurity.ZOrder" xml:space="preserve">
+    <value>9</value>
+  </data>
+  <data name="tipHeaderType.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="tipHeaderType.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="tipHeaderType.Location" type="System.Drawing.Point, System.Drawing">
+    <value>282, 64</value>
+  </data>
+  <data name="tipHeaderType.Size" type="System.Drawing.Size, System.Drawing">
+    <value>11, 12</value>
+  </data>
+  <data name="tipHeaderType.TabIndex" type="System.Int32, mscorlib">
+    <value>20</value>
+  </data>
+  <data name="tipHeaderType.Text" xml:space="preserve">
+    <value>*</value>
+  </data>
+  <data name="&gt;&gt;tipHeaderType.Name" xml:space="preserve">
+    <value>tipHeaderType</value>
+  </data>
+  <data name="&gt;&gt;tipHeaderType.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tipHeaderType.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;tipHeaderType.ZOrder" xml:space="preserve">
+    <value>10</value>
+  </data>
+  <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
+    <value>158, 92</value>
+  </data>
+  <data name="txtRequestHost.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 20</value>
+  </data>
+  <data name="txtRequestHost.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
+  </data>
+  <data name="&gt;&gt;txtRequestHost.Name" xml:space="preserve">
+    <value>txtRequestHost</value>
+  </data>
+  <data name="&gt;&gt;txtRequestHost.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtRequestHost.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;txtRequestHost.ZOrder" xml:space="preserve">
+    <value>11</value>
+  </data>
+  <data name="labHeaderType.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="labHeaderType.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="labHeaderType.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 64</value>
+  </data>
+  <data name="labHeaderType.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</value>
+  </data>
+  <data name="labHeaderType.TabIndex" type="System.Int32, mscorlib">
+    <value>19</value>
+  </data>
+  <data name="labHeaderType.Text" xml:space="preserve">
+    <value>Camouflage type</value>
+  </data>
+  <data name="&gt;&gt;labHeaderType.Name" xml:space="preserve">
+    <value>labHeaderType</value>
+  </data>
+  <data name="&gt;&gt;labHeaderType.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;labHeaderType.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;labHeaderType.ZOrder" xml:space="preserve">
+    <value>12</value>
+  </data>
+  <data name="labRequestHost.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="labRequestHost.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="labRequestHost.Location" type="System.Drawing.Point, System.Drawing">
+    <value>9, 96</value>
+  </data>
+  <data name="labRequestHost.Size" type="System.Drawing.Size, System.Drawing">
+    <value>143, 12</value>
+  </data>
+  <data name="labRequestHost.TabIndex" type="System.Int32, mscorlib">
+    <value>17</value>
+  </data>
+  <data name="labRequestHost.Text" xml:space="preserve">
+    <value>Camouflage domain(host)</value>
+  </data>
+  <data name="&gt;&gt;labRequestHost.Name" xml:space="preserve">
+    <value>labRequestHost</value>
+  </data>
+  <data name="&gt;&gt;labRequestHost.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;labRequestHost.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;labRequestHost.ZOrder" xml:space="preserve">
+    <value>13</value>
+  </data>
+  <data name="cmbHeaderType.Items" xml:space="preserve">
+    <value>none</value>
+  </data>
+  <data name="cmbHeaderType.Items1" xml:space="preserve">
+    <value>http</value>
+  </data>
+  <data name="cmbHeaderType.Items2" xml:space="preserve">
+    <value>srtp</value>
+  </data>
+  <data name="cmbHeaderType.Items3" xml:space="preserve">
+    <value>utp</value>
+  </data>
+  <data name="cmbHeaderType.Items4" xml:space="preserve">
+    <value>wechat-video</value>
+  </data>
+  <data name="cmbHeaderType.Items5" xml:space="preserve">
+    <value>dtls</value>
+  </data>
+  <data name="cmbHeaderType.Items6" xml:space="preserve">
+    <value>wireguard</value>
+  </data>
+  <data name="cmbHeaderType.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 60</value>
+  </data>
+  <data name="cmbHeaderType.Size" type="System.Drawing.Size, System.Drawing">
+    <value>143, 20</value>
+  </data>
+  <data name="cmbHeaderType.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;cmbHeaderType.Name" xml:space="preserve">
+    <value>cmbHeaderType</value>
+  </data>
+  <data name="&gt;&gt;cmbHeaderType.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;cmbHeaderType.Parent" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;cmbHeaderType.ZOrder" xml:space="preserve">
+    <value>14</value>
+  </data>
+  <data name="gbTransport.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="gbTransport.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="gbTransport.Size" type="System.Drawing.Size, System.Drawing">
+    <value>723, 223</value>
+  </data>
+  <data name="gbTransport.TabIndex" type="System.Int32, mscorlib">
+    <value>22</value>
+  </data>
+  <data name="gbTransport.Text" xml:space="preserve">
+    <value>Transport</value>
+  </data>
+  <data name="&gt;&gt;gbTransport.Name" xml:space="preserve">
+    <value>gbTransport</value>
+  </data>
+  <data name="&gt;&gt;gbTransport.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;gbTransport.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;gbTransport.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
+  </data>
+  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
+    <value>723, 223</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>ServerTransportControl</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+</root>

v2rayN/v2rayN/Forms/ServerTransportControl.zh-Hans.resx

@@ -0,0 +1,193 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <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="tipNetwork.Size" type="System.Drawing.Size, System.Drawing">
+    <value>143, 12</value>
+  </data>
+  <data name="tipNetwork.Text" xml:space="preserve">
+    <value>*默认tcp,选错会无法连接</value>
+  </data>
+  <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 28</value>
+  </data>
+  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
+    <value>208, 20</value>
+  </data>
+  <data name="labNetwork.Size" type="System.Drawing.Size, System.Drawing">
+    <value>107, 12</value>
+  </data>
+  <data name="labNetwork.Text" xml:space="preserve">
+    <value>传输协议(network)</value>
+  </data>
+  <data name="labPath.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="labPath.Text" xml:space="preserve">
+    <value>路径(path)</value>
+  </data>
+  <data name="labStreamSecurity.Size" type="System.Drawing.Size, System.Drawing">
+    <value>107, 12</value>
+  </data>
+  <data name="labStreamSecurity.Text" xml:space="preserve">
+    <value>传输层安全(tls)</value>
+  </data>
+  <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 92</value>
+  </data>
+  <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
+    <value>331, 20</value>
+  </data>
+  <data name="labHeaderType.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
+  </data>
+  <data name="labHeaderType.Text" xml:space="preserve">
+    <value>伪装类型(type)</value>
+  </data>
+  <data name="labRequestHost.Size" type="System.Drawing.Size, System.Drawing">
+    <value>89, 12</value>
+  </data>
+  <data name="labRequestHost.Text" xml:space="preserve">
+    <value>伪装域名(host)</value>
+  </data>
+  <data name="gbTransport.Text" xml:space="preserve">
+    <value>底层传输方式(transport)</value>
+  </data>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>282, 11</value>
+  </data>
+  <data name="clbAlpn.Location" type="System.Drawing.Point, System.Drawing">
+    <value>331, 7</value>
+  </data>
+  <data name="clbAlpn.Size" type="System.Drawing.Size, System.Drawing">
+    <value>160, 20</value>
+  </data>
+  <data name="txtSNI.Size" type="System.Drawing.Size, System.Drawing">
+    <value>391, 21</value>
+  </data>
+  <data name="labAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
+    <value>167, 12</value>
+  </data>
+  <data name="labAllowInsecure.Text" xml:space="preserve">
+    <value>跳过证书验证(allowInsecure)</value>
+  </data>
+  <data name="cmbAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
+    <value>183, 7</value>
+  </data>
+</root>

v2rayN/v2rayN/Forms/SubSettingControl.Designer.cs

@@ -30,6 +30,8 @@
         {
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SubSettingControl));
             this.grbMain = new System.Windows.Forms.GroupBox();
+            this.txtUserAgent = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
             this.btnShare = new System.Windows.Forms.Button();
             this.chkEnabled = new System.Windows.Forms.CheckBox();
             this.btnRemove = new System.Windows.Forms.Button();
@@ -44,7 +46,8 @@
             // 
             // grbMain
             // 
-            resources.ApplyResources(this.grbMain, "grbMain");
+            this.grbMain.Controls.Add(this.txtUserAgent);
+            this.grbMain.Controls.Add(this.label1);
             this.grbMain.Controls.Add(this.btnShare);
             this.grbMain.Controls.Add(this.chkEnabled);
             this.grbMain.Controls.Add(this.btnRemove);
@@ -52,9 +55,21 @@
             this.grbMain.Controls.Add(this.txtRemarks);
             this.grbMain.Controls.Add(this.label2);
             this.grbMain.Controls.Add(this.label3);
+            resources.ApplyResources(this.grbMain, "grbMain");
             this.grbMain.Name = "grbMain";
             this.grbMain.TabStop = false;
             // 
+            // txtUserAgent
+            // 
+            resources.ApplyResources(this.txtUserAgent, "txtUserAgent");
+            this.txtUserAgent.Name = "txtUserAgent";
+            this.txtUserAgent.Leave += new System.EventHandler(this.txtRemarks_Leave);
+            // 
+            // label1
+            // 
+            resources.ApplyResources(this.label1, "label1");
+            this.label1.Name = "label1";
+            // 
             // btnShare
             // 
             resources.ApplyResources(this.btnShare, "btnShare");
@@ -130,5 +145,7 @@
         private System.Windows.Forms.CheckBox chkEnabled;
         private System.Windows.Forms.Button btnShare;
         private System.Windows.Forms.PictureBox picQRCode;
+        private System.Windows.Forms.TextBox txtUserAgent;
+        private System.Windows.Forms.Label label1;
     }
 }

v2rayN/v2rayN/Forms/SubSettingControl.cs

@@ -35,6 +35,7 @@ namespace v2rayN.Forms
                 txtRemarks.Text = subItem.remarks.ToString();
                 txtUrl.Text = subItem.url.ToString();
                 chkEnabled.Checked = subItem.enabled;
+                txtUserAgent.Text = subItem.userAgent;
             }
         }
         private void EndBindingSub()
@@ -44,6 +45,7 @@ namespace v2rayN.Forms
                 subItem.remarks = txtRemarks.Text.TrimEx();
                 subItem.url = txtUrl.Text.TrimEx();
                 subItem.enabled = chkEnabled.Checked;
+                subItem.userAgent = txtUserAgent.Text.TrimEx();
             }
         }
         private void txtRemarks_Leave(object sender, EventArgs e)

v2rayN/v2rayN/Forms/SubSettingControl.resx

@@ -117,137 +117,101 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="&gt;&gt;txtUrl.Parent" xml:space="preserve">
-    <value>grbMain</value>
-  </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="chkEnabled.Size" type="System.Drawing.Size, System.Drawing">
-    <value>60, 16</value>
+  <data name="txtUserAgent.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 111</value>
   </data>
-  <data name="&gt;&gt;txtUrl.Name" xml:space="preserve">
-    <value>txtUrl</value>
-  </data>
-  <data name="&gt;&gt;picQRCode.Name" xml:space="preserve">
-    <value>picQRCode</value>
-  </data>
-  <data name="&gt;&gt;btnShare.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="btnRemove.Text" xml:space="preserve">
-    <value>Remove</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
-    <value>txtRemarks</value>
+  <data name="txtUserAgent.Size" type="System.Drawing.Size, System.Drawing">
+    <value>473, 21</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="btnRemove.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
+  <data name="txtUserAgent.TabIndex" type="System.Int32, mscorlib">
+    <value>3</value>
   </data>
-  <data name="&gt;&gt;grbMain.Name" xml:space="preserve">
-    <value>grbMain</value>
+  <data name="&gt;&gt;txtUserAgent.Name" xml:space="preserve">
+    <value>txtUserAgent</value>
   </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>SubSettingControl</value>
-  </data>
-  <data name="picQRCode.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
-    <value>Zoom</value>
-  </data>
-  <data name="grbMain.Text" xml:space="preserve">
-    <value>Subscription details</value>
-  </data>
-  <data name="btnShare.TabIndex" type="System.Int32, mscorlib">
-    <value>26</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Type" xml:space="preserve">
+  <data name="&gt;&gt;txtUserAgent.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="txtUrl.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
+  <data name="&gt;&gt;txtUserAgent.Parent" xml:space="preserve">
     <value>grbMain</value>
   </data>
-  <data name="btnShare.Location" type="System.Drawing.Point, System.Drawing">
-    <value>434, 21</value>
+  <data name="&gt;&gt;txtUserAgent.ZOrder" xml:space="preserve">
+    <value>0</value>
   </data>
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 12</value>
-  </data>
-  <data name="&gt;&gt;picQRCode.Type" xml:space="preserve">
-    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 21</value>
-  </data>
-  <data name="grbMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Top</value>
-  </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 12</value>
-  </data>
-  <data name="&gt;&gt;label3.Name" xml:space="preserve">
-    <value>label3</value>
-  </data>
-  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 21</value>
-  </data>
-  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
+  <data name="label1.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="btnShare.Text" xml:space="preserve">
-    <value>Share</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="picQRCode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>619, 200</value>
+  <data name="label1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 115</value>
   </data>
-  <data name="&gt;&gt;chkEnabled.ZOrder" xml:space="preserve">
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="label1.TabIndex" type="System.Int32, mscorlib">
+    <value>27</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>User Agent</value>
+  </data>
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">
+    <value>label1</value>
+  </data>
+  <data name="&gt;&gt;label1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
+    <value>grbMain</value>
+  </data>
+  <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
-  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 55</value>
-  </data>
   <data name="btnShare.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
-  <data name="picQRCode.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
+  <data name="btnShare.Location" type="System.Drawing.Point, System.Drawing">
+    <value>434, 21</value>
   </data>
-  <data name="&gt;&gt;grbMain.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="btnShare.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
   </data>
-  <data name="picQRCode.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
+  <data name="btnShare.TabIndex" type="System.Int32, mscorlib">
+    <value>26</value>
   </data>
-  <data name="txtUrl.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 55</value>
+  <data name="btnShare.Text" xml:space="preserve">
+    <value>Share</value>
   </data>
-  <data name="&gt;&gt;label2.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;btnShare.Name" xml:space="preserve">
+    <value>btnShare</value>
   </data>
-  <data name="&gt;&gt;txtUrl.ZOrder" xml:space="preserve">
-    <value>3</value>
+  <data name="&gt;&gt;btnShare.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;chkEnabled.Parent" xml:space="preserve">
+  <data name="&gt;&gt;btnShare.Parent" xml:space="preserve">
     <value>grbMain</value>
   </data>
-  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>5</value>
+  <data name="&gt;&gt;btnShare.ZOrder" xml:space="preserve">
+    <value>2</value>
   </data>
-  <data name="&gt;&gt;grbMain.Type" xml:space="preserve">
-    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="chkEnabled.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
   </data>
-  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>47, 12</value>
+  <data name="chkEnabled.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
   </data>
-  <data name="&gt;&gt;btnRemove.Name" xml:space="preserve">
-    <value>btnRemove</value>
+  <data name="chkEnabled.Location" type="System.Drawing.Point, System.Drawing">
+    <value>368, 23</value>
   </data>
-  <data name="&gt;&gt;txtUrl.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="chkEnabled.Size" type="System.Drawing.Size, System.Drawing">
+    <value>60, 16</value>
+  </data>
+  <data name="chkEnabled.TabIndex" type="System.Int32, mscorlib">
+    <value>25</value>
   </data>
   <data name="chkEnabled.Text" xml:space="preserve">
     <value>Enable</value>
@@ -255,130 +219,220 @@
   <data name="&gt;&gt;chkEnabled.Name" xml:space="preserve">
     <value>chkEnabled</value>
   </data>
-  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
-    <value>4</value>
+  <data name="&gt;&gt;chkEnabled.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;chkEnabled.Parent" xml:space="preserve">
+    <value>grbMain</value>
+  </data>
+  <data name="&gt;&gt;chkEnabled.ZOrder" xml:space="preserve">
+    <value>3</value>
   </data>
   <data name="btnRemove.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
     <value>NoControl</value>
   </data>
-  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
-    <value>619, 310</value>
+  <data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
+    <value>525, 21</value>
   </data>
-  <data name="btnShare.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
   </data>
-  <data name="&gt;&gt;btnRemove.ZOrder" xml:space="preserve">
-    <value>2</value>
+  <data name="btnRemove.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
   </data>
-  <data name="&gt;&gt;btnShare.Parent" xml:space="preserve">
-    <value>grbMain</value>
+  <data name="btnRemove.Text" xml:space="preserve">
+    <value>Remove</value>
   </data>
-  <data name="chkEnabled.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
+  <data name="&gt;&gt;btnRemove.Name" xml:space="preserve">
+    <value>btnRemove</value>
   </data>
-  <data name="txtUrl.TabIndex" type="System.Int32, mscorlib">
-    <value>23</value>
-  </data>
-  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
-    <value>grbMain</value>
+  <data name="&gt;&gt;btnRemove.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;btnRemove.Parent" xml:space="preserve">
     <value>grbMain</value>
   </data>
-  <data name="chkEnabled.Location" type="System.Drawing.Point, System.Drawing">
-    <value>368, 23</value>
+  <data name="&gt;&gt;btnRemove.ZOrder" xml:space="preserve">
+    <value>4</value>
+  </data>
+  <data name="txtUrl.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 53</value>
+  </data>
+  <data name="txtUrl.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="txtUrl.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
+    <value>Vertical</value>
+  </data>
+  <data name="txtUrl.Size" type="System.Drawing.Size, System.Drawing">
+    <value>473, 46</value>
+  </data>
+  <data name="txtUrl.TabIndex" type="System.Int32, mscorlib">
+    <value>2</value>
+  </data>
+  <data name="&gt;&gt;txtUrl.Name" xml:space="preserve">
+    <value>txtUrl</value>
+  </data>
+  <data name="&gt;&gt;txtUrl.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtUrl.Parent" xml:space="preserve">
+    <value>grbMain</value>
+  </data>
+  <data name="&gt;&gt;txtUrl.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 21</value>
+  </data>
+  <data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
+    <value>232, 21</value>
+  </data>
+  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.Name" xml:space="preserve">
+    <value>txtRemarks</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.Parent" xml:space="preserve">
+    <value>grbMain</value>
+  </data>
+  <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
+    <value>6</value>
   </data>
   <data name="label2.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
-  <data name="chkEnabled.AutoSize" type="System.Boolean, mscorlib">
+  <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 25</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>47, 12</value>
+  </data>
+  <data name="label2.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>Remarks</value>
+  </data>
+  <data name="&gt;&gt;label2.Name" xml:space="preserve">
+    <value>label2</value>
+  </data>
+  <data name="&gt;&gt;label2.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label2.Parent" xml:space="preserve">
+    <value>grbMain</value>
+  </data>
+  <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
+    <value>7</value>
+  </data>
+  <data name="label3.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="label3.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 53</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="label3.TabIndex" type="System.Int32, mscorlib">
+    <value>0</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>Address (url)</value>
+  </data>
+  <data name="&gt;&gt;label3.Name" xml:space="preserve">
+    <value>label3</value>
+  </data>
+  <data name="&gt;&gt;label3.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
+    <value>grbMain</value>
+  </data>
+  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
+    <value>8</value>
+  </data>
+  <data name="grbMain.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Top</value>
+  </data>
   <data name="grbMain.Location" type="System.Drawing.Point, System.Drawing">
     <value>0, 0</value>
   </data>
+  <data name="grbMain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>619, 148</value>
+  </data>
+  <data name="grbMain.TabIndex" type="System.Int32, mscorlib">
+    <value>10</value>
+  </data>
+  <data name="grbMain.Text" xml:space="preserve">
+    <value>Subscription details</value>
+  </data>
+  <data name="&gt;&gt;grbMain.Name" xml:space="preserve">
+    <value>grbMain</value>
+  </data>
+  <data name="&gt;&gt;grbMain.Type" xml:space="preserve">
+    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;grbMain.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;grbMain.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="picQRCode.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
+    <value>Fill</value>
+  </data>
+  <data name="picQRCode.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <data name="picQRCode.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 148</value>
+  </data>
+  <data name="picQRCode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>619, 162</value>
+  </data>
+  <data name="picQRCode.SizeMode" type="System.Windows.Forms.PictureBoxSizeMode, System.Windows.Forms">
+    <value>Zoom</value>
+  </data>
+  <data name="picQRCode.TabIndex" type="System.Int32, mscorlib">
+    <value>25</value>
+  </data>
+  <data name="&gt;&gt;picQRCode.Name" xml:space="preserve">
+    <value>picQRCode</value>
+  </data>
+  <data name="&gt;&gt;picQRCode.Type" xml:space="preserve">
+    <value>System.Windows.Forms.PictureBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="&gt;&gt;picQRCode.Parent" xml:space="preserve">
     <value>$this</value>
   </data>
   <data name="&gt;&gt;picQRCode.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
+  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
   </data>
-  <data name="&gt;&gt;label2.Name" xml:space="preserve">
-    <value>label2</value>
+  <data name="$this.Size" type="System.Drawing.Size, System.Drawing">
+    <value>619, 310</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>SubSettingControl</value>
   </data>
   <data name="&gt;&gt;$this.Type" xml:space="preserve">
     <value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="grbMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>619, 110</value>
-  </data>
-  <data name="&gt;&gt;btnShare.Name" xml:space="preserve">
-    <value>btnShare</value>
-  </data>
-  <data name="&gt;&gt;btnShare.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="chkEnabled.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="picQRCode.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 110</value>
-  </data>
-  <data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
-  </data>
-  <data name="label2.Text" xml:space="preserve">
-    <value>Remarks</value>
-  </data>
-  <data name="label3.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="picQRCode.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
-  <data name="txtUrl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>473, 46</value>
-  </data>
-  <data name="label2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 25</value>
-  </data>
-  <data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="&gt;&gt;grbMain.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="label3.Text" xml:space="preserve">
-    <value>Address (url)</value>
-  </data>
-  <data name="&gt;&gt;btnRemove.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="grbMain.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
-    <value>grbMain</value>
-  </data>
-  <data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
-    <value>525, 21</value>
-  </data>
-  <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>6</value>
-  </data>
-  <data name="&gt;&gt;chkEnabled.Type" xml:space="preserve">
-    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;label3.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="label2.TabIndex" type="System.Int32, mscorlib">
-    <value>10</value>
-  </data>
-  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </metadata>
 </root>

v2rayN/v2rayN/Forms/SubSettingForm.resx

@@ -157,7 +157,7 @@
     <value>0, 0</value>
   </data>
   <data name="panCon.Size" type="System.Drawing.Size, System.Drawing">
-    <value>614, 569</value>
+    <value>614, 351</value>
   </data>
   <data name="panCon.TabIndex" type="System.Int32, mscorlib">
     <value>10</value>
@@ -232,7 +232,7 @@
     <value>Bottom</value>
   </data>
   <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 569</value>
+    <value>0, 351</value>
   </data>
   <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
     <value>614, 60</value>
@@ -259,7 +259,7 @@
     <value>6, 12</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>614, 629</value>
+    <value>614, 411</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Subscription settings</value>

v2rayN/v2rayN/Global.cs

@@ -1,11 +1,13 @@
 
+using System.Collections.Generic;
+
 namespace v2rayN
 {
     class Global
     {
         #region 常量
 
-
+        //public const string DownloadFileName = "v2ray-windows.zip";
         public const string v2rayWebsiteUrl = @"https://www.v2fly.org/";
         public const string AboutUrl = @"https://github.com/2dust/v2rayN";
         public const string UpdateUrl = AboutUrl + @"/releases";
@@ -19,7 +21,6 @@ namespace v2rayN
         /// </summary>
         public const string SpeedTestUrl = @"http://cachefly.cachefly.net/10mb.test";
         public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";
-        public const string AvailabilityTestUrl = @"https://www.google.com/generate_204";
 
         /// <summary>
         /// CustomRoutingListUrl
@@ -175,6 +176,10 @@ namespace v2rayN
         /// </summary>
         public const string MyRegKeyLanguage = "CurrentLanguage";
         /// <summary>
+        /// 
+        /// </summary>
+        public const string MyRegKeySecurityProtocolTls13 = "SecurityProtocolTls13";
+        /// <summary>
         /// Icon
         /// </summary>
         public const string CustomIconName = "v2rayN.ico";
@@ -190,6 +195,12 @@ namespace v2rayN
         public const string IEProxyExceptions = "localhost;127.*;10.*;172.16.*;172.17.*;172.18.*;172.19.*;172.20.*;172.21.*;172.22.*;172.23.*;172.24.*;172.25.*;172.26.*;172.27.*;172.28.*;172.29.*;172.30.*;172.31.*;192.168.*";
 
         public const string RoutingRuleComma = "<COMMA>";
+
+        public static readonly IEnumerable<string> ssSecuritys = new HashSet<string> { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
+
+        public const string GrpcgunMode = "gun";
+        public const string GrpcmultiMode = "multi";
+        
         #endregion
 
         #region 全局变量

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -32,6 +32,15 @@ namespace v2rayN.Handler
                 //转成Json
                 config = Utils.FromJson<Config>(result);
             }
+            else
+            {            
+                if (File.Exists(Utils.GetPath(configRes)))
+                {
+                    Utils.SaveLog("LoadConfig Exception");
+                    return -1;
+                }
+            }
+
             if (config == null)
             {
                 config = new Config
@@ -51,7 +60,9 @@ namespace v2rayN.Handler
                     enableStatistics = false,
 
                     // 默认中等刷新率
-                    statisticsFreshRate = (int)Global.StatisticsFreshRate.medium
+                    statisticsFreshRate = (int)Global.StatisticsFreshRate.medium,
+
+                    enableRoutingAdvanced = true
                 };
             }
 
@@ -89,6 +100,10 @@ namespace v2rayN.Handler
             {
                 config.domainStrategy = "IPIfNonMatch";
             }
+            if (Utils.IsNullOrEmpty(config.domainMatcher))
+            {
+                config.domainMatcher = "linear";
+            }
 
             //kcp
             if (config.kcpItem == null)
@@ -113,18 +128,22 @@ namespace v2rayN.Handler
                 config.uiItem.mainLvColWidth = new Dictionary<string, int>();
             }
 
-            //// 如果是用户升级，首次会有端口号为0的情况，不可用，这里处理
-            //if (config.pacPort == 0)
-            //{
-            //    config.pacPort = 8888;
-            //}
-            if (Utils.IsNullOrEmpty(config.speedTestUrl))
+
+            if (config.constItem == null)
             {
-                config.speedTestUrl = Global.SpeedTestUrl;
+                config.constItem = new ConstItem();
             }
-            if (Utils.IsNullOrEmpty(config.speedPingTestUrl))
+            if (Utils.IsNullOrEmpty(config.constItem.speedTestUrl))
             {
-                config.speedPingTestUrl = Global.SpeedPingTestUrl;
+                config.constItem.speedTestUrl = Global.SpeedTestUrl;
+            }
+            if (Utils.IsNullOrEmpty(config.constItem.speedPingTestUrl))
+            {
+                config.constItem.speedPingTestUrl = Global.SpeedPingTestUrl;
+            }
+            if (Utils.IsNullOrEmpty(config.constItem.defIEProxyExceptions))
+            {
+                config.constItem.defIEProxyExceptions = Global.IEProxyExceptions;
             }
             //if (Utils.IsNullOrEmpty(config.remoteDNS))
             //{
@@ -170,7 +189,7 @@ namespace v2rayN.Handler
         /// <param name="vmessItem"></param>
         /// <param name="index"></param>
         /// <returns></returns>
-        public static int AddServer(ref Config config, VmessItem vmessItem, int index)
+        public static int AddServer(ref Config config, VmessItem vmessItem, int index, bool toFile = true)
         {
             vmessItem.configVersion = 2;
             vmessItem.configType = (int)EConfigType.Vmess;
@@ -208,8 +227,10 @@ namespace v2rayN.Handler
                 }
             }
 
-            ToJsonFile(config);
-
+            if (toFile)
+            {
+                ToJsonFile(config);
+            }
             return 0;
         }
 
@@ -219,19 +240,27 @@ namespace v2rayN.Handler
         /// <param name="config"></param>
         /// <param name="index"></param>
         /// <returns></returns>
-        public static int RemoveServer(ref Config config, int index)
+        public static int RemoveServer(ref Config config, List<int> indexs)
         {
-            if (index < 0 || index > config.vmess.Count - 1)
+            var itemId = config.getItemId();
+
+            for (int k = indexs.Count - 1; k >= 0; k--)
             {
-                return -1;
+                var index = indexs[k];
+                if (index < 0 || index > config.vmess.Count - 1)
+                {
+                    continue;
+                }
+
+                config.vmess.RemoveAt(index);
             }
 
-            //删除
-            config.vmess.RemoveAt(index);
-
-
-            //移除的是活动的
-            if (config.index.Equals(index))
+            var index_ = config.vmess.FindIndex(it => it.getItemId() == itemId);
+            if (index_ >= 0)
+            {
+                config.index = index_;
+            }
+            else
             {
                 if (config.vmess.Count > 0)
                 {
@@ -241,13 +270,8 @@ namespace v2rayN.Handler
                 {
                     config.index = -1;
                 }
-                Global.reloadV2ray = true;
-            }
-            else if (index < config.index)//移除活动之前的
-            {
-                config.index--;
-                Global.reloadV2ray = true;
             }
+            Global.reloadV2ray = true;
 
             ToJsonFile(config);
 
@@ -283,7 +307,8 @@ namespace v2rayN.Handler
                 streamSecurity = config.vmess[index].streamSecurity,
                 allowInsecure = config.vmess[index].allowInsecure,
                 configType = config.vmess[index].configType,
-                flow = config.vmess[index].flow
+                flow = config.vmess[index].flow,
+                sni = config.vmess[index].sni
             };
 
             config.vmess.Insert(index + 1, vmessItem); // 插入到下一项
@@ -519,7 +544,7 @@ namespace v2rayN.Handler
         /// <param name="vmessItem"></param>
         /// <param name="index"></param>
         /// <returns></returns>
-        public static int AddShadowsocksServer(ref Config config, VmessItem vmessItem, int index)
+        public static int AddShadowsocksServer(ref Config config, VmessItem vmessItem, int index, bool toFile = true)
         {
             vmessItem.configVersion = 2;
             vmessItem.configType = (int)EConfigType.Shadowsocks;
@@ -528,8 +553,7 @@ namespace v2rayN.Handler
             vmessItem.id = vmessItem.id.TrimEx();
             vmessItem.security = vmessItem.security.TrimEx();
 
-            var securitys = new HashSet<string>() { "aes-256-gcm", "aes-128-gcm", "chacha20-poly1305", "chacha20-ietf-poly1305", "none", "plain" };
-            if (!securitys.Contains(vmessItem.security))
+            if (!Global.ssSecuritys.Contains(vmessItem.security))
             {
                 return -1;
             }
@@ -554,7 +578,10 @@ namespace v2rayN.Handler
                 }
             }
 
-            ToJsonFile(config);
+            if (toFile)
+            {
+                ToJsonFile(config);
+            }
 
             return 0;
         }
@@ -566,7 +593,7 @@ namespace v2rayN.Handler
         /// <param name="vmessItem"></param>
         /// <param name="index"></param>
         /// <returns></returns>
-        public static int AddSocksServer(ref Config config, VmessItem vmessItem, int index)
+        public static int AddSocksServer(ref Config config, VmessItem vmessItem, int index, bool toFile = true)
         {
             vmessItem.configVersion = 2;
             vmessItem.configType = (int)EConfigType.Socks;
@@ -593,7 +620,10 @@ namespace v2rayN.Handler
                 }
             }
 
-            ToJsonFile(config);
+            if (toFile)
+            {
+                ToJsonFile(config);
+            }
 
             return 0;
         }
@@ -606,16 +636,21 @@ namespace v2rayN.Handler
         /// <param name="vmessItem"></param>
         /// <param name="index"></param>
         /// <returns></returns>
-        public static int AddTrojanServer(ref Config config, VmessItem vmessItem, int index)
+        public static int AddTrojanServer(ref Config config, VmessItem vmessItem, int index, bool toFile = true)
         {
             vmessItem.configVersion = 2;
             vmessItem.configType = (int)EConfigType.Trojan;
 
             vmessItem.address = vmessItem.address.TrimEx();
             vmessItem.id = vmessItem.id.TrimEx();
-
-            vmessItem.streamSecurity = Global.StreamSecurity;
-            vmessItem.allowInsecure = "false";
+            if (Utils.IsNullOrEmpty(vmessItem.streamSecurity))
+            {
+                vmessItem.streamSecurity = Global.StreamSecurity;
+            }
+            if (Utils.IsNullOrEmpty(vmessItem.allowInsecure))
+            {
+                vmessItem.allowInsecure = config.defAllowInsecure.ToString();
+            }
 
             if (index >= 0)
             {
@@ -637,7 +672,10 @@ namespace v2rayN.Handler
                 }
             }
 
-            ToJsonFile(config);
+            if (toFile)
+            {
+                ToJsonFile(config);
+            }
 
             return 0;
         }
@@ -747,40 +785,41 @@ namespace v2rayN.Handler
                 vmessItem.subid = subid;
                 if (vmessItem.configType == (int)EConfigType.Vmess)
                 {
-                    if (AddServer(ref config, vmessItem, -1) == 0)
+                    if (AddServer(ref config, vmessItem, -1, false) == 0)
                     {
                         countServers++;
                     }
                 }
                 else if (vmessItem.configType == (int)EConfigType.Shadowsocks)
                 {
-                    if (AddShadowsocksServer(ref config, vmessItem, -1) == 0)
+                    if (AddShadowsocksServer(ref config, vmessItem, -1, false) == 0)
                     {
                         countServers++;
                     }
                 }
                 else if (vmessItem.configType == (int)EConfigType.Socks)
                 {
-                    if (AddSocksServer(ref config, vmessItem, -1) == 0)
+                    if (AddSocksServer(ref config, vmessItem, -1, false) == 0)
                     {
                         countServers++;
                     }
                 }
                 else if (vmessItem.configType == (int)EConfigType.Trojan)
                 {
-                    if (AddTrojanServer(ref config, vmessItem, -1) == 0)
+                    if (AddTrojanServer(ref config, vmessItem, -1, false) == 0)
                     {
                         countServers++;
                     }
                 }
                 else if (vmessItem.configType == (int)EConfigType.VLESS)
                 {
-                    if (AddVlessServer(ref config, vmessItem, -1) == 0)
+                    if (AddVlessServer(ref config, vmessItem, -1, false) == 0)
                     {
                         countServers++;
                     }
                 }
             }
+            ToJsonFile(config);
             return countServers;
         }
 
@@ -866,6 +905,7 @@ namespace v2rayN.Handler
             {
                 return -1;
             }
+            var propertyName = string.Empty;
             switch (name)
             {
                 case EServerColName.configType:
@@ -874,7 +914,12 @@ namespace v2rayN.Handler
                 case EServerColName.port:
                 case EServerColName.security:
                 case EServerColName.network:
+                case EServerColName.streamSecurity:
                 case EServerColName.testResult:
+                    propertyName = name.ToString();
+                    break;
+                case EServerColName.subRemarks:
+                    propertyName = "subid";
                     break;
                 default:
                     return -1;
@@ -884,11 +929,11 @@ namespace v2rayN.Handler
 
             if (asc)
             {
-                config.vmess = items.OrderBy(name.ToString()).ToList();
+                config.vmess = items.OrderBy(propertyName).ToList();
             }
             else
             {
-                config.vmess = items.OrderByDescending(name.ToString()).ToList();
+                config.vmess = items.OrderByDescending(propertyName).ToList();
             }
 
             var index_ = config.vmess.FindIndex(it => it.getItemId() == itemId);
@@ -908,7 +953,7 @@ namespace v2rayN.Handler
         /// <param name="vmessItem"></param>
         /// <param name="index"></param>
         /// <returns></returns>
-        public static int AddVlessServer(ref Config config, VmessItem vmessItem, int index)
+        public static int AddVlessServer(ref Config config, VmessItem vmessItem, int index, bool toFile = true)
         {
             vmessItem.configVersion = 2;
             vmessItem.configType = (int)EConfigType.VLESS;
@@ -946,7 +991,67 @@ namespace v2rayN.Handler
                 }
             }
 
-            ToJsonFile(config);
+            if (toFile)
+            {
+                ToJsonFile(config);
+            }
+
+            return 0;
+        }
+
+        public static int DedupServerList(ref Config config)
+        {
+            var itemId = config.getItemId();
+            
+            List<Mode.VmessItem> source = config.vmess;
+            bool keepOlder = config.keepOlderDedupl;
+
+            List<Mode.VmessItem> list = new List<Mode.VmessItem>();
+            if (!keepOlder) source.Reverse(); // Remove the early items first
+
+            bool _isAdded(Mode.VmessItem o, Mode.VmessItem n)
+            {
+                return o.configVersion == n.configVersion &&
+                    o.configType == n.configType &&
+                    o.address == n.address &&
+                    o.port == n.port &&
+                    o.id == n.id &&
+                    o.alterId == n.alterId &&
+                    o.security == n.security &&
+                    o.network == n.network &&
+                    o.headerType == n.headerType &&
+                    o.requestHost == n.requestHost &&
+                    o.path == n.path &&
+                    o.streamSecurity == n.streamSecurity;
+                // skip (will remove) different remarks
+            }
+            foreach (Mode.VmessItem item in source)
+            {
+                if (!list.Exists(i => _isAdded(i, item)))
+                {
+                    list.Add(item);
+                }
+            }
+            if (!keepOlder) list.Reverse();
+            config.vmess = list;
+
+            var index_ = config.vmess.FindIndex(it => it.getItemId() == itemId);
+            if (index_ >= 0)
+            {
+                config.index = index_;
+            }
+            else
+            {
+                if (config.vmess.Count > 0)
+                {
+                    config.index = 0;
+                }
+                else
+                {
+                    config.index = -1;
+                }
+            }
+            Global.reloadV2ray = true;
 
             return 0;
         }
@@ -1001,6 +1106,14 @@ namespace v2rayN.Handler
             foreach (var item in config.routings)
             {
 
+            }
+            //move locked item
+            int index = config.routings.FindIndex(it => it.locked == true);
+            if (index != -1)
+            {
+                var item = Utils.DeepCopy(config.routings[index]);
+                config.routings.RemoveAt(index);
+                config.routings.Add(item);
             }
             if (config.routingIndex >= config.routings.Count)
             {
@@ -1034,7 +1147,7 @@ namespace v2rayN.Handler
         /// <param name="config"></param>
         /// <param name="clipboardData"></param>
         /// <returns></returns>
-        public static int AddBatchRoutingRules(ref RoutingItem routingItem, string clipboardData)
+        public static int AddBatchRoutingRules(ref RoutingItem routingItem, string clipboardData, bool blReplace = true)
         {
             if (Utils.IsNullOrEmpty(clipboardData))
             {
@@ -1046,8 +1159,14 @@ namespace v2rayN.Handler
             {
                 return -1;
             }
-
-            routingItem.rules.Clear();
+            if (routingItem.rules == null)
+            {
+                routingItem.rules = new List<RulesItem>();
+            }
+            if (blReplace)
+            {
+                routingItem.rules.Clear();
+            }
             foreach (var item in lstRules)
             {
                 routingItem.rules.Add(item);
@@ -1151,33 +1270,63 @@ namespace v2rayN.Handler
             {
                 config.routings = new List<RoutingItem>();
             }
-            if (config.routings.Count > 0)
+
+            if (config.routings.Count(it => it.locked != true) <= 0)
             {
-                return 0;
+                //Bypass the mainland
+                var item2 = new RoutingItem()
+                {
+                    remarks = "绕过大陆(Whitelist)",
+                    url = string.Empty,
+                };
+                AddBatchRoutingRules(ref item2, Utils.GetEmbedText(Global.CustomRoutingFileName + "white"));
+                config.routings.Add(item2);
+
+                //Blacklist
+                var item3 = new RoutingItem()
+                {
+                    remarks = "黑名单(Blacklist)",
+                    url = string.Empty,
+                };
+                AddBatchRoutingRules(ref item3, Utils.GetEmbedText(Global.CustomRoutingFileName + "black"));
+                config.routings.Add(item3);
+
+                //Global
+                var item1 = new RoutingItem()
+                {
+                    remarks = "全局(Global)",
+                    url = string.Empty,
+                };
+                AddBatchRoutingRules(ref item1, Utils.GetEmbedText(Global.CustomRoutingFileName + "global"));
+                config.routings.Add(item1);
+
+                config.routingIndex = 0;
             }
-            config.routingIndex = 0;
 
-            //Global
-            var item1 = new RoutingItem();
-            item1.remarks = "全局(Global)";
-            item1.url = string.Empty;
-            item1.rules = new List<RulesItem>();
-            string result = Utils.GetEmbedText(Global.CustomRoutingFileName + "global");
-            AddBatchRoutingRules(ref item1, result);
-            config.routings.Add(item1);
+            if (GetLockedRoutingItem(ref config) == null)
+            {
+                var item1 = new RoutingItem()
+                {
+                    remarks = "locked",
+                    url = string.Empty,
+                    locked = true,
+                };
+                AddBatchRoutingRules(ref item1, Utils.GetEmbedText(Global.CustomRoutingFileName + "locked"));
+                config.routings.Add(item1);
+            }
 
-            //Bypass the mainland
-            var item2 = new RoutingItem();
-            item2.remarks = "绕过大陆(Whitelist)";
-            item2.url = string.Empty;
-            item2.rules = new List<RulesItem>();
-            string result2 = Utils.GetEmbedText(Global.CustomRoutingFileName + "white");
-            AddBatchRoutingRules(ref item2, result2);
-            config.routings.Add(item2);
-
-            ToJsonFile(config);
+            SaveRouting(ref config);
             return 0;
         }
+
+        public static RoutingItem GetLockedRoutingItem(ref Config config)
+        {
+            if (config.routings == null)
+            {
+                return null;
+            }
+            return config.routings.Find(it => it.locked == true);
+        }
         #endregion
     }
 }

v2rayN/v2rayN/Handler/DownloadHandle.cs

@@ -1,16 +1,7 @@
-using Newtonsoft.Json;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
+using System;
 using System.IO;
 using System.Net;
-using System.Net.Http;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 using v2rayN.Base;
-using v2rayN.Mode;
-using v2rayN.Properties;
 
 namespace v2rayN.Handler
 {
@@ -19,19 +10,10 @@ namespace v2rayN.Handler
     /// </summary>
     class DownloadHandle
     {
-        public event EventHandler<ResultEventArgs> AbsoluteCompleted;
-
         public event EventHandler<ResultEventArgs> UpdateCompleted;
 
         public event ErrorEventHandler Error;
 
-        public string DownloadFileName
-        {
-            get
-            {
-                return "v2ray-windows.zip";
-            }
-        }
 
         public class ResultEventArgs : EventArgs
         {
@@ -50,154 +32,6 @@ namespace v2rayN.Handler
         private DateTime totalDatetime = new DateTime();
         private int DownloadTimeout = -1;
 
-        #region Check for updates
-
-        private readonly string nLatestUrl = Global.NUrl + "/latest";
-        private const string nUrl = Global.NUrl + "/download/{0}/v2rayN.zip";
-        private readonly string v2flyCoreLatestUrl = Global.v2flyCoreUrl + "/latest";
-        private const string v2flyCoreUrl = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip";
-        private readonly string xrayCoreLatestUrl = Global.xrayCoreUrl + "/latest";
-        private const string xrayCoreUrl = Global.xrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip";
-
-        public async void CheckUpdateAsync(string type)
-        {
-            Utils.SetSecurityProtocol();
-            WebRequestHandler webRequestHandler = new WebRequestHandler
-            {
-                AllowAutoRedirect = false
-            };
-            HttpClient httpClient = new HttpClient(webRequestHandler);
-
-            string url;
-            if (type == "v2fly")
-            {
-                url = v2flyCoreLatestUrl;
-            }
-            else if (type == "xray")
-            {
-                url = xrayCoreLatestUrl;
-            }
-            else if (type == "v2rayN")
-            {
-                url = nLatestUrl;
-            }
-            else
-            {
-                throw new ArgumentException("Type");
-            }
-            HttpResponseMessage response = await httpClient.GetAsync(url);
-            if (response.StatusCode.ToString() == "Redirect")
-            {
-                responseHandler(type, response.Headers.Location.ToString());
-            }
-            else
-            {
-                Utils.SaveLog("StatusCode error: " + url);
-                return;
-            }
-        }
-
-        /// <summary>
-        /// 获取V2RayCore版本
-        /// </summary>
-        public string getCoreVersion(string type)
-        {
-            try
-            {
-                var core = string.Empty;
-                var match = string.Empty;
-                if (type == "v2fly")
-                {
-                    core = "v2ray.exe";
-                    match = "V2Ray";
-                }
-                else if (type == "xray")
-                {
-                    core = "xray.exe";
-                    match = "Xray";
-                }
-                string filePath = Utils.GetPath(core);
-                if (!File.Exists(filePath))
-                {
-                    string msg = string.Format(UIRes.I18N("NotFoundCore"), @"");
-                    //ShowMsg(true, msg);
-                    return "";
-                }
-
-                Process p = new Process();
-                p.StartInfo.FileName = filePath;
-                p.StartInfo.Arguments = "-version";
-                p.StartInfo.WorkingDirectory = Utils.StartupPath();
-                p.StartInfo.UseShellExecute = false;
-                p.StartInfo.RedirectStandardOutput = true;
-                p.StartInfo.CreateNoWindow = true;
-                p.StartInfo.StandardOutputEncoding = Encoding.UTF8;
-                p.Start();
-                p.WaitForExit(5000);
-                string echo = p.StandardOutput.ReadToEnd();
-                string version = Regex.Match(echo, $"{match} ([0-9.]+) \\(").Groups[1].Value;
-                return version;
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-                return "";
-            }
-        }
-        private void responseHandler(string type, string redirectUrl)
-        {
-            try
-            {
-                string version = redirectUrl.Substring(redirectUrl.LastIndexOf("/", StringComparison.Ordinal) + 1);
-
-                string curVersion;
-                string message;
-                string url;
-                if (type == "v2fly")
-                {
-                    curVersion = "v" + getCoreVersion(type);
-                    message = string.Format(UIRes.I18N("IsLatestCore"), curVersion);
-                    string osBit = Environment.Is64BitProcess ? "64" : "32";
-                    url = string.Format(v2flyCoreUrl, version, osBit);
-                }
-                else if (type == "xray")
-                {
-                    curVersion = "v" + getCoreVersion(type);
-                    message = string.Format(UIRes.I18N("IsLatestCore"), curVersion);
-                    string osBit = Environment.Is64BitProcess ? "64" : "32";
-                    url = string.Format(xrayCoreUrl, version, osBit);
-                }
-                else if (type == "v2rayN")
-                {
-                    curVersion = FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString();
-                    message = string.Format(UIRes.I18N("IsLatestN"), curVersion);
-                    url = string.Format(nUrl, version);
-                }
-                else
-                {
-                    throw new ArgumentException("Type");
-                }
-
-                if (curVersion == version)
-                {
-                    AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));
-                    return;
-                }
-
-                AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, url));
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-
-                Error?.Invoke(this, new ErrorEventArgs(ex));
-            }
-        }
-
-        #endregion
-
-        #region Download 
-
         public WebClientEx DownloadFileAsync(string url, WebProxy webProxy, int downloadTimeout)
         {
             WebClientEx ws = new WebClientEx();
@@ -218,7 +52,7 @@ namespace v2rayN.Handler
 
                 ws.DownloadFileCompleted += ws_DownloadFileCompleted;
                 ws.DownloadProgressChanged += ws_DownloadProgressChanged;
-                ws.DownloadFileAsync(new Uri(url), Utils.GetPath(DownloadFileName));
+                ws.DownloadFileAsync(new Uri(url), Utils.GetPath(Utils.GetDownloadFileName(url)));
             }
             catch (Exception ex)
             {
@@ -274,7 +108,7 @@ namespace v2rayN.Handler
                     if (e.Error == null
                         || Utils.IsNullOrEmpty(e.Error.ToString()))
                     {
-
+                        ((WebClientEx)sender).Dispose();
                         TimeSpan ts = (DateTime.Now - totalDatetime);
                         string speed = string.Format("{0} M/s", (totalBytesToReceive / ts.TotalMilliseconds / 1000).ToString("#0.0"));
                         UpdateCompleted(this, new ResultEventArgs(true, speed.PadLeft(8, ' ')));
@@ -297,7 +131,7 @@ namespace v2rayN.Handler
         /// DownloadString
         /// </summary> 
         /// <param name="url"></param>
-        public void WebDownloadString(string url)
+        public void WebDownloadString(string url, string userAgent)
         {
             string source = string.Empty;
             try
@@ -305,6 +139,11 @@ namespace v2rayN.Handler
                 Utils.SetSecurityProtocol();
 
                 WebClientEx ws = new WebClientEx();
+                if (!Utils.IsNullOrEmpty(userAgent))
+                {
+                    ws.Headers.Add("user-agent", userAgent);
+                }
+
                 ws.DownloadStringCompleted += Ws_DownloadStringCompleted;
                 ws.DownloadStringAsync(new Uri(url));
             }
@@ -354,7 +193,35 @@ namespace v2rayN.Handler
                 return string.Empty;
             }
         }
-        #endregion
 
+        public WebClientEx DownloadDataAsync(string url, WebProxy webProxy, int downloadTimeout)
+        {
+            WebClientEx ws = new WebClientEx();
+            try
+            {
+                Utils.SetSecurityProtocol();
+                UpdateCompleted?.Invoke(this, new ResultEventArgs(false, UIRes.I18N("Downloading")));
+
+                progressPercentage = -1;
+                totalBytesToReceive = 0;
+
+                DownloadTimeout = downloadTimeout;
+                if (webProxy != null)
+                {
+                    ws.Proxy = webProxy;
+                }
+
+                ws.DownloadProgressChanged += ws_DownloadProgressChanged;
+                ws.DownloadDataCompleted += ws_DownloadFileCompleted;
+                ws.DownloadDataAsync(new Uri(url));
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+
+                Error?.Invoke(this, new ErrorEventArgs(ex));
+            }
+            return ws;
+        }
     }
 }

v2rayN/v2rayN/Handler/MainFormHandler.cs

@@ -1,5 +1,8 @@
 using System;
 using System.Drawing;
+using System.IO;
+using System.Threading;
+using System.Threading.Tasks;
 using System.Windows.Forms;
 using v2rayN.Base;
 using v2rayN.Mode;
@@ -9,6 +12,7 @@ namespace v2rayN.Handler
     class MainFormHandler
     {
         private static MainFormHandler instance;
+        Action<bool, string> _updateUI;
 
         //private DownloadHandle downloadHandle2;
         //private Config _config;
@@ -47,9 +51,23 @@ namespace v2rayN.Handler
                 Graphics graphics = Graphics.FromImage(bitmap);
                 SolidBrush drawBrush = new SolidBrush(color);
 
-                graphics.FillEllipse(drawBrush, new Rectangle(0, 0, width, height));
-                int zoom = 16;
-                graphics.DrawImage(new Bitmap(Properties.Resources.notify, width - zoom, width - zoom), zoom / 2, zoom / 2);
+                var customIcon = false;
+                if (config.enableRoutingAdvanced)
+                {
+                    var item = config.routings[config.routingIndex];
+                    if (!Utils.IsNullOrEmpty(item.customIcon) && File.Exists(item.customIcon))
+                    {
+                        graphics.FillRectangle(drawBrush, new Rectangle(0, 0, width, height));
+                        graphics.DrawImage(new Bitmap(item.customIcon), 0, 0);
+                        customIcon = true;
+                    }
+                }
+                if (!customIcon)
+                {
+                    graphics.FillEllipse(drawBrush, new Rectangle(0, 0, width, height));
+                    int zoom = 16;
+                    graphics.DrawImage(new Bitmap(Properties.Resources.notify, width - zoom, width - zoom), zoom / 2, zoom / 2);
+                }
 
                 Icon createdIcon = Icon.FromHandle(bitmap.GetHicon());
 
@@ -164,6 +182,83 @@ namespace v2rayN.Handler
 
             return counter;
         }
-        
+
+        public void BackupGuiNConfig(Config config, bool auto = false)
+        {
+            string fileName = string.Empty;
+            if (auto)
+            {
+                fileName = Utils.GetTempPath($"guiNConfig{DateTime.Now.ToString("yyyyMMddHHmmssfff")}.json");
+            }
+            else
+            {
+                SaveFileDialog fileDialog = new SaveFileDialog
+                {
+                    Filter = "guiNConfig|*.json",
+                    FilterIndex = 2,
+                    RestoreDirectory = true
+                };
+                if (fileDialog.ShowDialog() != DialogResult.OK)
+                {
+                    return;
+                }
+                fileName = fileDialog.FileName;
+            }
+            if (Utils.IsNullOrEmpty(fileName))
+            {
+                return;
+            }
+            var ret = Utils.ToJsonFile(config, fileName);
+            if (!auto)
+            {
+                if (ret == 0)
+                {
+
+                    UI.Show(UIRes.I18N("OperationSuccess"));
+                }
+                else
+                {
+                    UI.ShowWarning(UIRes.I18N("OperationFailed"));
+                }
+            }
+        }
+
+        public void UpdateTask(Config config, Action<bool, string> update)
+        {
+            _updateUI = update;
+            Task.Run(() => UpdateTaskRun(config));
+        }
+
+        private void UpdateTaskRun(Config config)
+        {
+            var updateHandle = new UpdateHandle();
+            while (true)
+            {
+                Utils.SaveLog("UpdateTaskRun");
+                Thread.Sleep(60000);
+                if (config.autoUpdateInterval <= 0)
+                {
+                    continue;
+                }
+
+                updateHandle.UpdateGeoFile("geosite", config, (bool success, string msg) =>
+                {
+                    _updateUI(false, msg);
+                    if (success)
+                        Utils.SaveLog("geosite" + msg);
+                });
+
+                Thread.Sleep(60000);
+
+                updateHandle.UpdateGeoFile("geoip", config, (bool success, string msg) =>
+                {
+                    _updateUI(false, msg);
+                    if (success)
+                        Utils.SaveLog("geoip" + msg);
+                });
+
+                Thread.Sleep(1000 * 3600 * config.autoUpdateInterval);
+            }
+        }
     }
-}
+}

v2rayN/v2rayN/Handler/ShareHandler.cs

@@ -30,191 +30,25 @@ namespace v2rayN.Handler
                 string url = string.Empty;
 
                 VmessItem item = config.vmess[index];
-                if (item.configType == (int)EConfigType.Vmess)
-                {
-                    VmessQRCode vmessQRCode = new VmessQRCode
-                    {
-                        v = item.configVersion.ToString(),
-                        ps = item.remarks.TrimEx(), //备注也许很长 ;
-                        add = item.address,
-                        port = item.port.ToString(),
-                        id = item.id,
-                        aid = item.alterId.ToString(),
-                        net = item.network,
-                        type = item.headerType,
-                        host = item.requestHost,
-                        path = item.path,
-                        tls = item.streamSecurity
-                    };
-
-                    url = Utils.ToJson(vmessQRCode);
-                    url = Utils.Base64Encode(url);
-                    url = string.Format("{0}{1}", Global.vmessProtocol, url);
-
-                }
-                else if (item.configType == (int)EConfigType.Shadowsocks)
-                {
-                    string remark = string.Empty;
-                    if (!Utils.IsNullOrEmpty(item.remarks))
-                    {
-                        remark = "#" + Utils.UrlEncode(item.remarks);
-                    }
-                    url = string.Format("{0}:{1}@{2}:{3}",
-                        item.security,
-                        item.id,
-                        item.address,
-                        item.port);
-                    url = Utils.Base64Encode(url);
-                    url = string.Format("{0}{1}{2}", Global.ssProtocol, url, remark);
-                }
-                else if (item.configType == (int)EConfigType.Socks)
-                {
-                    string remark = string.Empty;
-                    if (!Utils.IsNullOrEmpty(item.remarks))
-                    {
-                        remark = "#" + Utils.UrlEncode(item.remarks);
-                    }
-                    url = string.Format("{0}:{1}@{2}:{3}",
-                        item.security,
-                        item.id,
-                        item.address,
-                        item.port);
-                    url = Utils.Base64Encode(url);
-                    url = string.Format("{0}{1}{2}", Global.socksProtocol, url, remark);
-                }
-                else if (item.configType == (int)EConfigType.Trojan)
-                {
-                    string remark = string.Empty;
-                    if (!Utils.IsNullOrEmpty(item.remarks))
-                    {
-                        remark = "#" + Utils.UrlEncode(item.remarks);
-                    }
-                    string query = string.Empty;
-                    if (!Utils.IsNullOrEmpty(item.requestHost))
-                    {
-                        query = string.Format("?sni={0}", Utils.UrlEncode(item.requestHost));
-                    }
-                    url = string.Format("{0}@{1}:{2}",
-                        item.id,
-                        item.address,
-                        item.port);
-                    url = string.Format("{0}{1}{2}{3}", Global.trojanProtocol, url, query, remark);
-                }
-                else if (item.configType == (int)EConfigType.VLESS)
-                {
-                    string remark = string.Empty;
-                    if (!Utils.IsNullOrEmpty(item.remarks))
-                    {
-                        remark = "#" + Utils.UrlEncode(item.remarks);
-                    }
-                    var dicQuery = new Dictionary<string, string>();
-                    if (!Utils.IsNullOrEmpty(item.flow))
-                    {
-                        dicQuery.Add("flow", item.flow);
-                    }
-                    if (!Utils.IsNullOrEmpty(item.security))
-                    {
-                        dicQuery.Add("encryption", item.security);
-                    }
-                    else
-                    {
-                        dicQuery.Add("encryption", "none");
-                    }
-                    if (!Utils.IsNullOrEmpty(item.streamSecurity))
-                    {
-                        dicQuery.Add("security", item.streamSecurity);
-                    }
-                    else
-                    {
-                        dicQuery.Add("security", "none");
-                    }
-                    if (!Utils.IsNullOrEmpty(item.network))
-                    {
-                        dicQuery.Add("type", item.network);
-                    }
-                    else
-                    {
-                        dicQuery.Add("type", "tcp");
-                    }
-
-                    switch (item.network)
-                    {
-                        case "tcp":
-                            if (!Utils.IsNullOrEmpty(item.headerType))
-                            {
-                                dicQuery.Add("headerType", item.headerType);
-                            }
-                            else
-                            {
-                                dicQuery.Add("headerType", "none");
-                            }
-                            if (!Utils.IsNullOrEmpty(item.requestHost))
-                            {
-                                dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
-                            }
-                            break;
-                        case "kcp":
-                            if (!Utils.IsNullOrEmpty(item.headerType))
-                            {
-                                dicQuery.Add("headerType", item.headerType);
-                            }
-                            else
-                            {
-                                dicQuery.Add("headerType", "none");
-                            }
-                            if (!Utils.IsNullOrEmpty(item.path))
-                            {
-                                dicQuery.Add("seed", Utils.UrlEncode(item.path));
-                            }
-                            break;
-
-                        case "ws":
-                            if (!Utils.IsNullOrEmpty(item.requestHost))
-                            {
-                                dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
-                            }
-                            if (!Utils.IsNullOrEmpty(item.path))
-                            {
-                                dicQuery.Add("path", Utils.UrlEncode(item.path));
-                            }
-                            break;
-
-                        case "http":
-                        case "h2":
-                            dicQuery["type"] = "http";
-                            if (!Utils.IsNullOrEmpty(item.requestHost))
-                            {
-                                dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
-                            }
-                            if (!Utils.IsNullOrEmpty(item.path))
-                            {
-                                dicQuery.Add("path", Utils.UrlEncode(item.path));
-                            }
-                            break;
-
-                        case "quic":
-                            if (!Utils.IsNullOrEmpty(item.headerType))
-                            {
-                                dicQuery.Add("headerType", item.headerType);
-                            }
-                            else
-                            {
-                                dicQuery.Add("headerType", "none");
-                            }
-                            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());
-
-                    url = string.Format("{0}@{1}:{2}",
-                    item.id,
-                    item.address,
-                    item.port);
-                    url = string.Format("{0}{1}{2}{3}", Global.vlessProtocol, url, query, remark);
-                }
-                else
+                switch (item.configType)
                 {
+                    case (int)EConfigType.Vmess:
+                        url = ShareVmess(item);
+                        break;
+                    case (int)EConfigType.Shadowsocks:
+                        url = ShareShadowsocks(item);
+                        break;
+                    case (int)EConfigType.Socks:
+                        url = ShareSocks(item);
+                        break;
+                    case (int)EConfigType.Trojan:
+                        url = ShareTrojan(item);
+                        break;
+                    case (int)EConfigType.VLESS:
+                        url = ShareVLESS(item);
+                        break;
+                    default:
+                        break;
                 }
                 return url;
             }
@@ -224,6 +58,233 @@ namespace v2rayN.Handler
             }
         }
 
+        private static string ShareVmess(VmessItem item)
+        {
+            string url = string.Empty;
+
+            VmessQRCode vmessQRCode = new VmessQRCode
+            {
+                v = item.configVersion.ToString(),
+                ps = item.remarks.TrimEx(), //备注也许很长 ;
+                add = item.address,
+                port = item.port.ToString(),
+                id = item.id,
+                aid = item.alterId.ToString(),
+                scy = item.security,
+                net = item.network,
+                type = item.headerType,
+                host = item.requestHost,
+                path = item.path,
+                tls = item.streamSecurity,
+                sni = item.sni,
+                alpn = Utils.List2String(item.alpn)
+            };
+
+            url = Utils.ToJson(vmessQRCode);
+            url = Utils.Base64Encode(url);
+            url = string.Format("{0}{1}", Global.vmessProtocol, url);
+
+            return url;
+        }
+
+        private static string ShareShadowsocks(VmessItem item)
+        {
+            string url = string.Empty;
+
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            url = string.Format("{0}:{1}@{2}:{3}",
+                item.security,
+                item.id,
+                item.address,
+                item.port);
+            url = Utils.Base64Encode(url);
+            //new
+            //var pw = Utils.Base64Encode($"{item.security}:{item.id}");
+            //url = $"{pw}@{item.address}:{ item.port}";
+            url = string.Format("{0}{1}{2}", Global.ssProtocol, url, remark);
+            return url;
+        }
+
+        private static string ShareSocks(VmessItem item)
+        {
+            string url = string.Empty;
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            url = string.Format("{0}:{1}@{2}:{3}",
+                item.security,
+                item.id,
+                item.address,
+                item.port);
+            url = Utils.Base64Encode(url);
+            url = string.Format("{0}{1}{2}", Global.socksProtocol, url, remark);
+            return url;
+        }
+
+        private static string ShareTrojan(VmessItem item)
+        {
+            string url = string.Empty;
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            string query = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.sni))
+            {
+                query = string.Format("?sni={0}", Utils.UrlEncode(item.sni));
+            }
+            url = string.Format("{0}@{1}:{2}",
+                item.id,
+                GetIpv6(item.address),
+                item.port);
+            url = string.Format("{0}{1}{2}{3}", Global.trojanProtocol, url, query, remark);
+            return url;
+        }
+
+        private static string ShareVLESS(VmessItem item)
+        {
+            string url = string.Empty;
+            string remark = string.Empty;
+            if (!Utils.IsNullOrEmpty(item.remarks))
+            {
+                remark = "#" + Utils.UrlEncode(item.remarks);
+            }
+            var dicQuery = new Dictionary<string, string>();
+            if (!Utils.IsNullOrEmpty(item.flow))
+            {
+                dicQuery.Add("flow", item.flow);
+            }
+            if (!Utils.IsNullOrEmpty(item.security))
+            {
+                dicQuery.Add("encryption", item.security);
+            }
+            else
+            {
+                dicQuery.Add("encryption", "none");
+            }
+            if (!Utils.IsNullOrEmpty(item.streamSecurity))
+            {
+                dicQuery.Add("security", item.streamSecurity);
+            }
+            else
+            {
+                dicQuery.Add("security", "none");
+            }
+            if (!Utils.IsNullOrEmpty(item.sni))
+            {
+                dicQuery.Add("sni", item.sni);
+            }
+            if (item.alpn != null && item.alpn.Count > 0)
+            {
+                dicQuery.Add("alpn", Utils.UrlEncode(Utils.List2String(item.alpn)));
+            }
+            if (!Utils.IsNullOrEmpty(item.network))
+            {
+                dicQuery.Add("type", item.network);
+            }
+            else
+            {
+                dicQuery.Add("type", "tcp");
+            }
+
+            switch (item.network)
+            {
+                case "tcp":
+                    if (!Utils.IsNullOrEmpty(item.headerType))
+                    {
+                        dicQuery.Add("headerType", item.headerType);
+                    }
+                    else
+                    {
+                        dicQuery.Add("headerType", "none");
+                    }
+                    if (!Utils.IsNullOrEmpty(item.requestHost))
+                    {
+                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+                    }
+                    break;
+                case "kcp":
+                    if (!Utils.IsNullOrEmpty(item.headerType))
+                    {
+                        dicQuery.Add("headerType", item.headerType);
+                    }
+                    else
+                    {
+                        dicQuery.Add("headerType", "none");
+                    }
+                    if (!Utils.IsNullOrEmpty(item.path))
+                    {
+                        dicQuery.Add("seed", Utils.UrlEncode(item.path));
+                    }
+                    break;
+
+                case "ws":
+                    if (!Utils.IsNullOrEmpty(item.requestHost))
+                    {
+                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+                    }
+                    if (!Utils.IsNullOrEmpty(item.path))
+                    {
+                        dicQuery.Add("path", Utils.UrlEncode(item.path));
+                    }
+                    break;
+
+                case "http":
+                case "h2":
+                    dicQuery["type"] = "http";
+                    if (!Utils.IsNullOrEmpty(item.requestHost))
+                    {
+                        dicQuery.Add("host", Utils.UrlEncode(item.requestHost));
+                    }
+                    if (!Utils.IsNullOrEmpty(item.path))
+                    {
+                        dicQuery.Add("path", Utils.UrlEncode(item.path));
+                    }
+                    break;
+
+                case "quic":
+                    if (!Utils.IsNullOrEmpty(item.headerType))
+                    {
+                        dicQuery.Add("headerType", item.headerType);
+                    }
+                    else
+                    {
+                        dicQuery.Add("headerType", "none");
+                    }
+                    dicQuery.Add("quicSecurity", Utils.UrlEncode(item.requestHost));
+                    dicQuery.Add("key", Utils.UrlEncode(item.path));
+                    break;
+                case "grpc":
+                    if (!Utils.IsNullOrEmpty(item.path))
+                    {
+                        dicQuery.Add("serviceName", Utils.UrlEncode(item.path));
+                        if (item.headerType == Global.GrpcgunMode || item.headerType == Global.GrpcmultiMode)
+                        {
+                            dicQuery.Add("mode", Utils.UrlEncode(item.headerType));
+                        }
+                    }
+                    break;
+            }
+            string query = "?" + string.Join("&", dicQuery.Select(x => x.Key + "=" + x.Value).ToArray());
+
+            url = string.Format("{0}@{1}:{2}",
+            item.id,
+            GetIpv6(item.address),
+            item.port);
+            url = string.Format("{0}{1}{2}{3}", Global.vlessProtocol, url, query, remark);
+            return url;
+        }
+        private static string GetIpv6(string address)
+        {
+            return Utils.IsIpv6(address) ? $"[{address}]" : address;
+        }
         #endregion
 
         #region  ImportShareUrl 
@@ -259,41 +320,7 @@ namespace v2rayN.Handler
                     }
                     else
                     {
-                        vmessItem.configType = (int)EConfigType.Vmess;
-                        result = result.Substring(Global.vmessProtocol.Length);
-                        result = Utils.Base64Decode(result);
-
-                        //转成Json
-                        VmessQRCode vmessQRCode = Utils.FromJson<VmessQRCode>(result);
-                        if (vmessQRCode == null)
-                        {
-                            msg = UIRes.I18N("FailedConversionConfiguration");
-                            return null;
-                        }
-                        vmessItem.security = Global.DefaultSecurity;
-                        vmessItem.network = Global.DefaultNetwork;
-                        vmessItem.headerType = Global.None;
-
-
-                        vmessItem.configVersion = Utils.ToInt(vmessQRCode.v);
-                        vmessItem.remarks = Utils.ToString(vmessQRCode.ps);
-                        vmessItem.address = Utils.ToString(vmessQRCode.add);
-                        vmessItem.port = Utils.ToInt(vmessQRCode.port);
-                        vmessItem.id = Utils.ToString(vmessQRCode.id);
-                        vmessItem.alterId = Utils.ToInt(vmessQRCode.aid);
-
-                        if (!Utils.IsNullOrEmpty(vmessQRCode.net))
-                        {
-                            vmessItem.network = vmessQRCode.net;
-                        }
-                        if (!Utils.IsNullOrEmpty(vmessQRCode.type))
-                        {
-                            vmessItem.headerType = vmessQRCode.type;
-                        }
-
-                        vmessItem.requestHost = Utils.ToString(vmessQRCode.host);
-                        vmessItem.path = Utils.ToString(vmessQRCode.path);
-                        vmessItem.streamSecurity = Utils.ToString(vmessQRCode.tls);
+                        vmessItem = ResolveVmess(result, out msg);
                     }
 
                     ConfigHandler.UpgradeServerVersion(ref vmessItem);
@@ -322,69 +349,13 @@ namespace v2rayN.Handler
                 {
                     msg = UIRes.I18N("ConfigurationFormatIncorrect");
 
-                    vmessItem.configType = (int)EConfigType.Socks;
-                    result = result.Substring(Global.socksProtocol.Length);
-                    //remark
-                    int indexRemark = result.IndexOf("#");
-                    if (indexRemark > 0)
-                    {
-                        try
-                        {
-                            vmessItem.remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
-                        }
-                        catch { }
-                        result = result.Substring(0, indexRemark);
-                    }
-                    //part decode
-                    int indexS = result.IndexOf("@");
-                    if (indexS > 0)
-                    {
-                    }
-                    else
-                    {
-                        result = Utils.Base64Decode(result);
-                    }
-
-                    string[] arr1 = result.Split('@');
-                    if (arr1.Length != 2)
-                    {
-                        return null;
-                    }
-                    string[] arr21 = arr1[0].Split(':');
-                    //string[] arr22 = arr1[1].Split(':');
-                    int indexPort = arr1[1].LastIndexOf(":");
-                    if (arr21.Length != 2 || indexPort < 0)
-                    {
-                        return null;
-                    }
-                    vmessItem.address = arr1[1].Substring(0, indexPort);
-                    vmessItem.port = Utils.ToInt(arr1[1].Substring(indexPort + 1, arr1[1].Length - (indexPort + 1)));
-                    vmessItem.security = arr21[0];
-                    vmessItem.id = arr21[1];
+                    vmessItem = ResolveSocks(result);
                 }
                 else if (result.StartsWith(Global.trojanProtocol))
                 {
                     msg = UIRes.I18N("ConfigurationFormatIncorrect");
 
-                    vmessItem.configType = (int)EConfigType.Trojan;
-
-                    Uri uri = new Uri(result);
-                    vmessItem.address = uri.IdnHost;
-                    vmessItem.port = uri.Port;
-                    vmessItem.id = uri.UserInfo;
-
-                    var qurery = HttpUtility.ParseQueryString(uri.Query);
-                    vmessItem.requestHost = qurery["sni"] ?? "";
-
-                    var remarks = uri.Fragment.Replace("#", "");
-                    if (Utils.IsNullOrEmpty(remarks))
-                    {
-                        vmessItem.remarks = "NONE";
-                    }
-                    else
-                    {
-                        vmessItem.remarks = Utils.UrlDecode(remarks);
-                    }
+                    vmessItem = ResolveTrojan(result);
                 }
                 else if (result.StartsWith(Global.vlessProtocol))
                 {
@@ -407,6 +378,59 @@ namespace v2rayN.Handler
             return vmessItem;
         }
 
+        private static VmessItem ResolveVmess(string result, out string msg)
+        {
+            msg = string.Empty;
+            VmessItem vmessItem = new VmessItem();
+
+            vmessItem.configType = (int)EConfigType.Vmess;
+            result = result.Substring(Global.vmessProtocol.Length);
+            result = Utils.Base64Decode(result);
+
+            //转成Json
+            VmessQRCode vmessQRCode = Utils.FromJson<VmessQRCode>(result);
+            if (vmessQRCode == null)
+            {
+                msg = UIRes.I18N("FailedConversionConfiguration");
+                return null;
+            }
+
+            vmessItem.network = Global.DefaultNetwork;
+            vmessItem.headerType = Global.None;
+
+            vmessItem.configVersion = Utils.ToInt(vmessQRCode.v);
+            vmessItem.remarks = Utils.ToString(vmessQRCode.ps);
+            vmessItem.address = Utils.ToString(vmessQRCode.add);
+            vmessItem.port = Utils.ToInt(vmessQRCode.port);
+            vmessItem.id = Utils.ToString(vmessQRCode.id);
+            vmessItem.alterId = Utils.ToInt(vmessQRCode.aid);
+            vmessItem.security = Utils.ToString(vmessQRCode.scy);
+
+            if (!Utils.IsNullOrEmpty(vmessQRCode.scy))
+            {
+                vmessItem.security = vmessQRCode.scy;
+            }
+            else
+            {
+                vmessItem.security = Global.DefaultSecurity;
+            }
+            if (!Utils.IsNullOrEmpty(vmessQRCode.net))
+            {
+                vmessItem.network = vmessQRCode.net;
+            }
+            if (!Utils.IsNullOrEmpty(vmessQRCode.type))
+            {
+                vmessItem.headerType = vmessQRCode.type;
+            }
+
+            vmessItem.requestHost = Utils.ToString(vmessQRCode.host);
+            vmessItem.path = Utils.ToString(vmessQRCode.path);
+            vmessItem.streamSecurity = Utils.ToString(vmessQRCode.tls);
+            vmessItem.sni = Utils.ToString(vmessQRCode.sni);
+            vmessItem.alpn = Utils.String2List(vmessQRCode.alpn);
+
+             return vmessItem;
+        }
 
         private static VmessItem ResolveVmess4Kitsunebi(string result)
         {
@@ -447,93 +471,6 @@ namespace v2rayN.Handler
             return vmessItem;
         }
 
-        private static VmessItem ResolveSip002(string result)
-        {
-            Uri parsedUrl;
-            try
-            {
-                parsedUrl = new Uri(result);
-            }
-            catch (UriFormatException)
-            {
-                return null;
-            }
-            VmessItem server = new VmessItem
-            {
-                remarks = parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped),
-                address = parsedUrl.IdnHost,
-                port = parsedUrl.Port,
-            };
-
-            // parse base64 UserInfo
-            string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.Unescaped);
-            string base64 = rawUserInfo.Replace('-', '+').Replace('_', '/');    // Web-safe base64 to normal base64
-            string userInfo;
-            try
-            {
-                userInfo = Encoding.UTF8.GetString(Convert.FromBase64String(
-                base64.PadRight(base64.Length + (4 - base64.Length % 4) % 4, '=')));
-            }
-            catch (FormatException)
-            {
-                return null;
-            }
-            string[] userInfoParts = userInfo.Split(new char[] { ':' }, 2);
-            if (userInfoParts.Length != 2)
-            {
-                return null;
-            }
-            server.security = userInfoParts[0];
-            server.id = userInfoParts[1];
-
-            NameValueCollection queryParameters = HttpUtility.ParseQueryString(parsedUrl.Query);
-            if (queryParameters["plugin"] != null)
-            {
-                return null;
-            }
-
-            return server;
-        }
-
-        private static readonly Regex UrlFinder = new Regex(@"ss://(?<base64>[A-Za-z0-9+-/=_]+)(?:#(?<tag>\S+))?", RegexOptions.IgnoreCase);
-        private static readonly Regex DetailsParser = new Regex(@"^((?<method>.+?):(?<password>.*)@(?<hostname>.+?):(?<port>\d+?))$", RegexOptions.IgnoreCase);
-
-        private static VmessItem ResolveSSLegacy(string result)
-        {
-            var match = UrlFinder.Match(result);
-            if (!match.Success)
-                return null;
-
-            VmessItem server = new VmessItem();
-            var base64 = match.Groups["base64"].Value.TrimEnd('/');
-            var tag = match.Groups["tag"].Value;
-            if (!Utils.IsNullOrEmpty(tag))
-            {
-                server.remarks = Utils.UrlDecode(tag);
-            }
-            Match details;
-            try
-            {
-                details = DetailsParser.Match(Encoding.UTF8.GetString(Convert.FromBase64String(
-                    base64.PadRight(base64.Length + (4 - base64.Length % 4) % 4, '='))));
-            }
-            catch (FormatException)
-            {
-                return null;
-            }
-            if (!details.Success)
-                return null;
-            server.security = details.Groups["method"].Value;
-            server.id = details.Groups["password"].Value;
-            server.address = details.Groups["hostname"].Value;
-            server.port = int.Parse(details.Groups["port"].Value);
-            return server;
-        }
-
-
-        private static readonly Regex StdVmessUserInfo = new Regex(
-            @"^(?<network>[a-z]+)(\+(?<streamSecurity>[a-z]+))?:(?<id>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})-(?<alterId>[0-9]+)$");
-
         private static VmessItem ResolveStdVmess(string result)
         {
             VmessItem i = new VmessItem
@@ -546,7 +483,7 @@ namespace v2rayN.Handler
 
             i.address = u.IdnHost;
             i.port = u.Port;
-            i.remarks = u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            i.remarks = Utils.UrlDecode(u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped));
             var q = HttpUtility.ParseQueryString(u.Query);
 
             var m = StdVmessUserInfo.Match(u.UserInfo);
@@ -620,6 +557,164 @@ namespace v2rayN.Handler
             return i;
         }
 
+        private static VmessItem ResolveSip002(string result)
+        {
+            Uri parsedUrl;
+            try
+            {
+                parsedUrl = new Uri(result);
+            }
+            catch (UriFormatException)
+            {
+                return null;
+            }
+            VmessItem server = new VmessItem
+            {
+                remarks = Utils.UrlDecode(parsedUrl.GetComponents(UriComponents.Fragment, UriFormat.Unescaped)),
+                address = parsedUrl.IdnHost,
+                port = parsedUrl.Port,
+            };
+
+            // parse base64 UserInfo
+            string rawUserInfo = parsedUrl.GetComponents(UriComponents.UserInfo, UriFormat.Unescaped);
+            string base64 = rawUserInfo.Replace('-', '+').Replace('_', '/');    // Web-safe base64 to normal base64
+            string userInfo;
+            try
+            {
+                userInfo = Encoding.UTF8.GetString(Convert.FromBase64String(
+                base64.PadRight(base64.Length + (4 - base64.Length % 4) % 4, '=')));
+            }
+            catch (FormatException)
+            {
+                return null;
+            }
+            string[] userInfoParts = userInfo.Split(new char[] { ':' }, 2);
+            if (userInfoParts.Length != 2)
+            {
+                return null;
+            }
+            server.security = userInfoParts[0];
+            server.id = userInfoParts[1];
+
+            NameValueCollection queryParameters = HttpUtility.ParseQueryString(parsedUrl.Query);
+            if (queryParameters["plugin"] != null)
+            {
+                return null;
+            }
+
+            return server;
+        }
+
+        private static readonly Regex UrlFinder = new Regex(@"ss://(?<base64>[A-Za-z0-9+-/=_]+)(?:#(?<tag>\S+))?", RegexOptions.IgnoreCase);
+        private static readonly Regex DetailsParser = new Regex(@"^((?<method>.+?):(?<password>.*)@(?<hostname>.+?):(?<port>\d+?))$", RegexOptions.IgnoreCase);
+
+        private static VmessItem ResolveSSLegacy(string result)
+        {
+            var match = UrlFinder.Match(result);
+            if (!match.Success)
+                return null;
+
+            VmessItem server = new VmessItem();
+            var base64 = match.Groups["base64"].Value.TrimEnd('/');
+            var tag = match.Groups["tag"].Value;
+            if (!Utils.IsNullOrEmpty(tag))
+            {
+                server.remarks = Utils.UrlDecode(tag);
+            }
+            Match details;
+            try
+            {
+                details = DetailsParser.Match(Encoding.UTF8.GetString(Convert.FromBase64String(
+                    base64.PadRight(base64.Length + (4 - base64.Length % 4) % 4, '='))));
+            }
+            catch (FormatException)
+            {
+                return null;
+            }
+            if (!details.Success)
+                return null;
+            server.security = details.Groups["method"].Value;
+            server.id = details.Groups["password"].Value;
+            server.address = details.Groups["hostname"].Value;
+            server.port = int.Parse(details.Groups["port"].Value);
+            return server;
+        }
+
+
+        private static readonly Regex StdVmessUserInfo = new Regex(
+            @"^(?<network>[a-z]+)(\+(?<streamSecurity>[a-z]+))?:(?<id>[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12})-(?<alterId>[0-9]+)$");
+
+        private static VmessItem ResolveSocks(string result)
+        {
+            VmessItem vmessItem = new VmessItem();
+            vmessItem.configType = (int)EConfigType.Socks;
+            result = result.Substring(Global.socksProtocol.Length);
+            //remark
+            int indexRemark = result.IndexOf("#");
+            if (indexRemark > 0)
+            {
+                try
+                {
+                    vmessItem.remarks = Utils.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
+                }
+                catch { }
+                result = result.Substring(0, indexRemark);
+            }
+            //part decode
+            int indexS = result.IndexOf("@");
+            if (indexS > 0)
+            {
+            }
+            else
+            {
+                result = Utils.Base64Decode(result);
+            }
+
+            string[] arr1 = result.Split('@');
+            if (arr1.Length != 2)
+            {
+                return null;
+            }
+            string[] arr21 = arr1[0].Split(':');
+            //string[] arr22 = arr1[1].Split(':');
+            int indexPort = arr1[1].LastIndexOf(":");
+            if (arr21.Length != 2 || indexPort < 0)
+            {
+                return null;
+            }
+            vmessItem.address = arr1[1].Substring(0, indexPort);
+            vmessItem.port = Utils.ToInt(arr1[1].Substring(indexPort + 1, arr1[1].Length - (indexPort + 1)));
+            vmessItem.security = arr21[0];
+            vmessItem.id = arr21[1];
+
+            return vmessItem;
+        }
+
+        private static VmessItem ResolveTrojan(string result)
+        {
+            VmessItem vmessItem = new VmessItem();
+
+            vmessItem.configType = (int)EConfigType.Trojan;
+
+            Uri uri = new Uri(result);
+            vmessItem.address = uri.IdnHost;
+            vmessItem.port = uri.Port;
+            vmessItem.id = uri.UserInfo;
+
+            var qurery = HttpUtility.ParseQueryString(uri.Query);
+            vmessItem.sni = qurery["sni"] ?? "";
+
+            var remarks = uri.Fragment.Replace("#", "");
+            if (Utils.IsNullOrEmpty(remarks))
+            {
+                vmessItem.remarks = "NONE";
+            }
+            else
+            {
+                vmessItem.remarks = Utils.UrlDecode(remarks);
+            }
+            return vmessItem;
+        }
         private static VmessItem ResolveStdVLESS(string result)
         {
             VmessItem item = new VmessItem
@@ -632,7 +727,7 @@ namespace v2rayN.Handler
 
             item.address = url.IdnHost;
             item.port = url.Port;
-            item.remarks = url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            item.remarks = Utils.UrlDecode(url.GetComponents(UriComponents.Fragment, UriFormat.Unescaped));
             item.id = url.UserInfo;
 
             var query = HttpUtility.ParseQueryString(url.Query);
@@ -640,6 +735,8 @@ namespace v2rayN.Handler
             item.flow = query["flow"] ?? "";
             item.security = query["encryption"] ?? "none";
             item.streamSecurity = query["security"] ?? "";
+            item.sni = query["sni"] ?? "";
+            item.alpn = Utils.String2List(Utils.UrlDecode(query["alpn"] ?? ""));
             item.network = query["type"] ?? "tcp";
             switch (item.network)
             {
@@ -670,7 +767,10 @@ namespace v2rayN.Handler
                     item.requestHost = query["quicSecurity"] ?? "none";
                     item.path = Utils.UrlDecode(query["key"] ?? "");
                     break;
-
+                case "grpc":
+                    item.path = Utils.UrlDecode(query["serviceName"] ?? "");
+                    item.headerType = Utils.UrlDecode(query["mode"] ?? Global.GrpcgunMode);
+                    break;
                 default:
                     return null;
             }

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -16,6 +16,10 @@ namespace v2rayN.Handler
         private List<int> _selecteds;
         Action<int, string> _updateFunc;
 
+        public SpeedtestHandler(ref Config config)
+        {
+            _config = config;
+        }
 
         public SpeedtestHandler(ref Config config, ref V2rayHandler v2rayHandler, List<int> selecteds, string actionType, Action<int, string> update)
         {
@@ -97,6 +101,11 @@ namespace v2rayN.Handler
                 string msg = string.Empty;
 
                 pid = _v2rayHandler.LoadV2rayConfigString(_config, _selecteds);
+                if (pid < 0)
+                {
+                    _updateFunc(_selecteds[0], UIRes.I18N("OperationFailed"));
+                    return;
+                }
 
                 //Thread.Sleep(5000);
                 int httpPort = _config.GetLocalPort("speedtest");
@@ -113,7 +122,7 @@ namespace v2rayN.Handler
                         {
                             WebProxy webProxy = new WebProxy(Global.Loopback, httpPort + itemIndex);
                             int responseTime = -1;
-                            string status = GetRealPingTime(_config.speedPingTestUrl, webProxy, out responseTime);
+                            string status = GetRealPingTime(_config.constItem.speedPingTestUrl, webProxy, out responseTime);
                             string output = Utils.IsNullOrEmpty(status) ? FormatOut(responseTime, "ms") : FormatOut(status, "");
                             _updateFunc(itemIndex, output);
                         }
@@ -148,7 +157,7 @@ namespace v2rayN.Handler
                     {
                         WebProxy webProxy = new WebProxy(Global.Loopback, httpPort);
                         int responseTime = -1;
-                        string status = GetRealPingTime(Global.AvailabilityTestUrl, webProxy, out responseTime);
+                        string status = GetRealPingTime(Global.SpeedPingTestUrl, webProxy, out responseTime);
                         bool noError = Utils.IsNullOrEmpty(status);
                         return noError ? responseTime : -1;
                     }
@@ -178,8 +187,13 @@ namespace v2rayN.Handler
             }
 
             pid = _v2rayHandler.LoadV2rayConfigString(_config, _selecteds);
+            if (pid < 0)
+            {
+                _updateFunc(_selecteds[0], UIRes.I18N("OperationFailed"));
+                return;
+            }
 
-            string url = _config.speedTestUrl;
+            string url = _config.constItem.speedTestUrl;
             DownloadHandle downloadHandle2 = new DownloadHandle();
             downloadHandle2.UpdateCompleted += (sender2, args) =>
             {
@@ -206,11 +220,12 @@ namespace v2rayN.Handler
                 int httpPort = _config.GetLocalPort("speedtest");
 
                 WebProxy webProxy = new WebProxy(Global.Loopback, httpPort + itemIndex);
-                var ws = downloadHandle2.DownloadFileAsync(url, webProxy, timeout - 2);
+                var ws = downloadHandle2.DownloadDataAsync(url, webProxy, timeout - 2);
 
                 Thread.Sleep(1000 * timeout);
 
                 ws.CancelAsync();
+                ws.Dispose();
 
                 Thread.Sleep(1000 * 2);
             }

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -111,7 +111,7 @@ namespace v2rayN.Handler
                         }
                         catch (Exception ex)
                         {
-                            Utils.SaveLog(ex.Message, ex);
+                            //Utils.SaveLog(ex.Message, ex);
                         }
 
                         if (res != null)
@@ -138,7 +138,7 @@ namespace v2rayN.Handler
                 }
                 catch (Exception ex)
                 {
-                    Utils.SaveLog(ex.Message, ex);
+                    //Utils.SaveLog(ex.Message, ex);
                 }
             }
         }
@@ -271,7 +271,7 @@ namespace v2rayN.Handler
             }
             catch (Exception ex)
             {
-                Utils.SaveLog(ex.Message, ex);
+                //Utils.SaveLog(ex.Message, ex);
             }
         }
 

v2rayN/v2rayN/Handler/UpdateHandle.cs

@@ -0,0 +1,475 @@
+using System;
+using System.Diagnostics;
+using System.IO;
+using System.Net;
+using System.Net.Http;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Windows.Forms;
+using v2rayN.Mode;
+
+namespace v2rayN.Handler
+{
+    class UpdateHandle
+    {
+        Action<bool, string> _updateFunc;
+        private Config _config;
+
+        public event EventHandler<ResultEventArgs> AbsoluteCompleted;
+
+        public class ResultEventArgs : EventArgs
+        {
+            public bool Success;
+            public string Msg;
+
+            public ResultEventArgs(bool success, string msg)
+            {
+                this.Success = success;
+                this.Msg = msg;
+            }
+        }
+
+        private readonly string nLatestUrl = Global.NUrl + "/latest";
+        private const string nUrl = Global.NUrl + "/download/{0}/v2rayN.zip";
+        private readonly string v2flyCoreLatestUrl = Global.v2flyCoreUrl + "/latest";
+        private const string v2flyCoreUrl = Global.v2flyCoreUrl + "/download/{0}/v2ray-windows-{1}.zip";
+        private readonly string xrayCoreLatestUrl = Global.xrayCoreUrl + "/latest";
+        private const string xrayCoreUrl = Global.xrayCoreUrl + "/download/{0}/Xray-windows-{1}.zip";
+        private const string geoUrl = "https://github.com/Loyalsoldier/v2ray-rules-dat/releases/latest/download/{0}.dat";
+
+        public void CheckUpdateGuiN(Config config, Action<bool, string> update)
+        {
+            _config = config;
+            _updateFunc = update;
+            var url = string.Empty;
+
+              DownloadHandle downloadHandle = null;
+            if (downloadHandle == null)
+            {
+                downloadHandle = new DownloadHandle();
+
+                downloadHandle.UpdateCompleted += (sender2, args) =>
+                {
+                    if (args.Success)
+                    {
+                        _updateFunc(false, UIRes.I18N("MsgDownloadV2rayCoreSuccessfully"));
+
+                        try
+                        {
+                            string fileName = Utils.GetPath(Utils.GetDownloadFileName(url));
+                            fileName = Utils.UrlEncode(fileName);
+                            Process process = new Process
+                            {
+                                StartInfo = new ProcessStartInfo
+                                {
+                                    FileName = "v2rayUpgrade.exe",
+                                    Arguments = "\"" + fileName + "\"",
+                                    WorkingDirectory = Utils.StartupPath()
+                                }
+                            };
+                            process.Start();
+                            if (process.Id > 0)
+                            {
+                                _updateFunc(true, "");
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            _updateFunc(false, ex.Message);
+                        }
+                    }
+                    else
+                    {
+                        _updateFunc(false, args.Msg);
+                    }
+                };
+                downloadHandle.Error += (sender2, args) =>
+                {
+                    _updateFunc(false, args.GetException().Message);
+                };
+            }
+            AbsoluteCompleted += (sender2, args) =>
+            {
+                if (args.Success)
+                {
+                    _updateFunc(false, string.Format(UIRes.I18N("MsgParsingSuccessfully"), "v2rayN"));
+
+                    url = args.Msg;
+                    askToDownload(downloadHandle, url, true);
+                }
+                else
+                {
+                    _updateFunc(false, args.Msg);
+                }
+            };
+            _updateFunc(false, string.Format(UIRes.I18N("MsgStartUpdating"), "v2rayN"));
+            CheckUpdateAsync("v2rayN");
+        }
+
+
+        public void CheckUpdateCore(string type, Config config, Action<bool, string> update)
+        {
+            _config = config;
+            _updateFunc = update;
+            var url = string.Empty;
+
+            DownloadHandle downloadHandle = null;
+            if (downloadHandle == null)
+            {
+                downloadHandle = new DownloadHandle();
+                downloadHandle.UpdateCompleted += (sender2, args) =>
+                {
+                    if (args.Success)
+                    {
+                        _updateFunc(false, UIRes.I18N("MsgDownloadV2rayCoreSuccessfully"));
+                        _updateFunc(false, UIRes.I18N("MsgUnpacking"));
+
+                        try
+                        {
+                            _updateFunc(true, url);
+                        }
+                        catch (Exception ex)
+                        {
+                            _updateFunc(false, ex.Message);
+                        }
+                    }
+                    else
+                    {
+                        _updateFunc(false, args.Msg);
+                    }
+                };
+                downloadHandle.Error += (sender2, args) =>
+                {
+                    _updateFunc(true, args.GetException().Message);
+                };
+            }
+
+            AbsoluteCompleted += (sender2, args) =>
+            {
+                if (args.Success)
+                {
+                    _updateFunc(false, string.Format(UIRes.I18N("MsgParsingSuccessfully"), "Core"));
+                    url = args.Msg;
+                    askToDownload(downloadHandle, url, true);
+                }
+                else
+                {
+                    _updateFunc(false, args.Msg);
+                }
+            };
+            _updateFunc(false, string.Format(UIRes.I18N("MsgStartUpdating"), "Core"));
+            CheckUpdateAsync(type);
+        }
+
+
+        public void UpdateSubscriptionProcess(Config config, Action<bool, string> update)
+        {
+            _config = config;
+            _updateFunc = update;
+
+            _updateFunc(false, UIRes.I18N("MsgUpdateSubscriptionStart"));
+
+            if (config.subItem == null || config.subItem.Count <= 0)
+            {
+                _updateFunc(false, UIRes.I18N("MsgNoValidSubscription"));
+                return;
+            }
+
+            for (int k = 1; k <= config.subItem.Count; k++)
+            {
+                string id = config.subItem[k - 1].id.Trim();
+                string url = config.subItem[k - 1].url.Trim();
+                string userAgent = config.subItem[k - 1].userAgent.Trim();
+                string hashCode = $"{k}->";
+                if (config.subItem[k - 1].enabled == false)
+                {
+                    continue;
+                }
+                if (Utils.IsNullOrEmpty(id) || Utils.IsNullOrEmpty(url))
+                {
+                    _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgNoValidSubscription")}");
+                    continue;
+                }
+
+                DownloadHandle downloadHandle3 = new DownloadHandle();
+                downloadHandle3.UpdateCompleted += (sender2, args) =>
+                {
+                    if (args.Success)
+                    {
+                        _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgGetSubscriptionSuccessfully")}");
+                        string result = Utils.Base64Decode(args.Msg);
+                        if (Utils.IsNullOrEmpty(result))
+                        {
+                            _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgSubscriptionDecodingFailed")}");
+                            return;
+                        }
+
+                        ConfigHandler.RemoveServerViaSubid(ref config, id);
+                        _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgClearSubscription")}");
+                        //  RefreshServers();
+                        int ret = MainFormHandler.Instance.AddBatchServers(config, result, id);
+                        if (ret > 0)
+                        {
+                            // RefreshServers();
+                        }
+                        else
+                        {
+                            _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgFailedImportSubscription")}");
+                        }
+                        _updateFunc(true, $"{hashCode}{UIRes.I18N("MsgUpdateSubscriptionEnd")}");
+                    }
+                    else
+                    {
+                        _updateFunc(false, args.Msg);
+                    }
+                };
+                downloadHandle3.Error += (sender2, args) =>
+                {
+                    _updateFunc(false, args.GetException().Message);
+                };
+
+                downloadHandle3.WebDownloadString(url, userAgent);
+                _updateFunc(false, $"{hashCode}{UIRes.I18N("MsgStartGettingSubscriptions")}");
+            }
+
+        }
+
+
+        public void UpdateGeoFile(string geoName, Config config, Action<bool, string> update)
+        {
+            _config = config;
+            _updateFunc = update;
+            var url = string.Format(geoUrl, geoName);
+
+            DownloadHandle downloadHandle = null;
+            if (downloadHandle == null)
+            {
+                downloadHandle = new DownloadHandle();
+
+                downloadHandle.UpdateCompleted += (sender2, args) =>
+                {
+                    if (args.Success)
+                    {
+                        _updateFunc(false, string.Format(UIRes.I18N("MsgDownloadGeoFileSuccessfully"), geoName));
+
+                        try
+                        {
+                            string fileName = Utils.GetPath(Utils.GetDownloadFileName(url));
+                            if (File.Exists(fileName))
+                            {
+                                string targetPath = Utils.GetPath($"{geoName}.dat");
+                                if (File.Exists(targetPath))
+                                {
+                                    File.Delete(targetPath);
+                                }
+                                File.Move(fileName, targetPath);
+                                _updateFunc(true, "");
+                            }
+                        }
+                        catch (Exception ex)
+                        {
+                            _updateFunc(false, ex.Message);
+                        }
+                    }
+                    else
+                    {
+                        _updateFunc(false, args.Msg);
+                    }
+                };
+                downloadHandle.Error += (sender2, args) =>
+                {
+                    _updateFunc(false, args.GetException().Message);
+                };
+            }
+
+            askToDownload(downloadHandle, url, false);
+        }
+
+        #region private
+
+        private async void CheckUpdateAsync(string type)
+        {
+            try
+            {
+                Utils.SetSecurityProtocol();
+                WebRequestHandler webRequestHandler = new WebRequestHandler
+                {
+                    AllowAutoRedirect = false
+                };
+                if (httpProxyTest() > 0)
+                {
+                    int httpPort = _config.GetLocalPort(Global.InboundHttp);
+                    WebProxy webProxy = new WebProxy(Global.Loopback, httpPort);
+                    webRequestHandler.Proxy = webProxy;
+                }
+                HttpClient httpClient = new HttpClient(webRequestHandler);
+
+                string url;
+                if (type == "v2fly")
+                {
+                    url = v2flyCoreLatestUrl;
+                }
+                else if (type == "xray")
+                {
+                    url = xrayCoreLatestUrl;
+                }
+                else if (type == "v2rayN")
+                {
+                    url = nLatestUrl;
+                }
+                else
+                {
+                    throw new ArgumentException("Type");
+                }
+                HttpResponseMessage response = await httpClient.GetAsync(url);
+                if (response.StatusCode.ToString() == "Redirect")
+                {
+                    responseHandler(type, response.Headers.Location.ToString());
+                }
+                else
+                {
+                    Utils.SaveLog("StatusCode error: " + url);
+                    return;
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                _updateFunc(false, ex.Message);
+            }
+        }
+
+        /// <summary>
+        /// 获取V2RayCore版本
+        /// </summary>
+        private string getCoreVersion(string type)
+        {
+            try
+            {
+                var core = string.Empty;
+                var match = string.Empty;
+                if (type == "v2fly")
+                {
+                    core = "v2ray.exe";
+                    match = "V2Ray";
+                }
+                else if (type == "xray")
+                {
+                    core = "xray.exe";
+                    match = "Xray";
+                }
+                string filePath = Utils.GetPath(core);
+                if (!File.Exists(filePath))
+                {
+                    string msg = string.Format(UIRes.I18N("NotFoundCore"), @"");
+                    //ShowMsg(true, msg);
+                    return "";
+                }
+
+                Process p = new Process();
+                p.StartInfo.FileName = filePath;
+                p.StartInfo.Arguments = "-version";
+                p.StartInfo.WorkingDirectory = Utils.StartupPath();
+                p.StartInfo.UseShellExecute = false;
+                p.StartInfo.RedirectStandardOutput = true;
+                p.StartInfo.CreateNoWindow = true;
+                p.StartInfo.StandardOutputEncoding = Encoding.UTF8;
+                p.Start();
+                p.WaitForExit(5000);
+                string echo = p.StandardOutput.ReadToEnd();
+                string version = Regex.Match(echo, $"{match} ([0-9.]+) \\(").Groups[1].Value;
+                return version;
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                _updateFunc(false, ex.Message);
+                return "";
+            }
+        }
+        private void responseHandler(string type, string redirectUrl)
+        {
+            try
+            {
+                string version = redirectUrl.Substring(redirectUrl.LastIndexOf("/", StringComparison.Ordinal) + 1);
+
+                string curVersion;
+                string message;
+                string url;
+                if (type == "v2fly")
+                {
+                    curVersion = "v" + getCoreVersion(type);
+                    message = string.Format(UIRes.I18N("IsLatestCore"), curVersion);
+                    string osBit = Environment.Is64BitProcess ? "64" : "32";
+                    url = string.Format(v2flyCoreUrl, version, osBit);
+                }
+                else if (type == "xray")
+                {
+                    curVersion = "v" + getCoreVersion(type);
+                    message = string.Format(UIRes.I18N("IsLatestCore"), curVersion);
+                    string osBit = Environment.Is64BitProcess ? "64" : "32";
+                    url = string.Format(xrayCoreUrl, version, osBit);
+                }
+                else if (type == "v2rayN")
+                {
+                    curVersion = FileVersionInfo.GetVersionInfo(Utils.GetExePath()).FileVersion.ToString();
+                    message = string.Format(UIRes.I18N("IsLatestN"), curVersion);
+                    url = string.Format(nUrl, version);
+                }
+                else
+                {
+                    throw new ArgumentException("Type");
+                }
+
+                if (curVersion == version)
+                {
+                    AbsoluteCompleted?.Invoke(this, new ResultEventArgs(false, message));
+                    return;
+                }
+
+                AbsoluteCompleted?.Invoke(this, new ResultEventArgs(true, url));
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                _updateFunc(false, ex.Message);
+            }
+        }
+
+        private void askToDownload(DownloadHandle downloadHandle, string url, bool blAsk)
+        {
+            bool blDownload = false;
+            if (blAsk)
+            {
+                if (UI.ShowYesNo(string.Format(UIRes.I18N("DownloadYesNo"), url)) == DialogResult.Yes)
+                {
+                    blDownload = true;
+                }
+            }
+            else
+            {
+                blDownload = true;
+            }
+            if (blDownload)
+            {
+                if (httpProxyTest() > 0)
+                {
+                    int httpPort = _config.GetLocalPort(Global.InboundHttp);
+                    WebProxy webProxy = new WebProxy(Global.Loopback, httpPort);
+                    downloadHandle.DownloadFileAsync(url, webProxy, 600);
+                }
+                else
+                {
+                    downloadHandle.DownloadFileAsync(url, null, 600);
+                }
+            }
+        }
+
+        private int httpProxyTest()
+        {
+            SpeedtestHandler statistics = new SpeedtestHandler(ref _config);
+            return statistics.RunAvailabilityCheck();
+        }
+        #endregion
+    }
+}

v2rayN/v2rayN/Handler/V2rayConfigHandler.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net;
+using System.Net.NetworkInformation;
 using v2rayN.Mode;
 
 namespace v2rayN.Handler
@@ -189,12 +191,30 @@ namespace v2rayN.Handler
                   && v2rayConfig.routing.rules != null)
                 {
                     v2rayConfig.routing.domainStrategy = config.domainStrategy;
+                    v2rayConfig.routing.domainMatcher = config.domainMatcher;
 
-                    if (config.routings != null && config.routingIndex < config.routings.Count)
+                    if (config.enableRoutingAdvanced)
                     {
-                        foreach (var item in config.routings[config.routingIndex].rules)
+                        if (config.routings != null && config.routingIndex < config.routings.Count)
                         {
-                            routingUserRule(item, ref v2rayConfig);
+                            foreach (var item in config.routings[config.routingIndex].rules)
+                            {
+                                if (item.enabled)
+                                {
+                                    routingUserRule(item, ref v2rayConfig);
+                                }
+                            }
+                        }
+                    }
+                    else
+                    {
+                        var lockedItem = ConfigHandler.GetLockedRoutingItem(ref config);
+                        if (lockedItem != null)
+                        {
+                            foreach (var item in lockedItem.rules)
+                            {
+                                routingUserRule(item, ref v2rayConfig);
+                            }
                         }
                     }
                 }
@@ -235,8 +255,12 @@ namespace v2rayN.Handler
                     var it = Utils.DeepCopy(rules);
                     it.ip = null;
                     it.type = "field";
-                    for (int k = 0; k < it.domain.Count; k++)
+                    for (int k = it.domain.Count - 1; k >= 0; k--)
                     {
+                        if (it.domain[k].StartsWith("#"))
+                        {
+                            it.domain.RemoveAt(k);
+                        }
                         it.domain[k] = it.domain[k].Replace(Global.RoutingRuleComma, ",");
                     }
                     //if (Utils.IsNullOrEmpty(it.port))
@@ -370,7 +394,15 @@ namespace v2rayN.Handler
                     serversItem.address = config.address();
                     serversItem.port = config.port();
                     serversItem.password = config.id();
-                    serversItem.method = config.security();
+                    if (Global.ssSecuritys.Contains(config.security()))
+                    {
+                        serversItem.method = config.security();
+                    }
+                    else
+                    {
+                        serversItem.method = "none";
+                    }
+
 
                     serversItem.ota = false;
                     serversItem.level = 1;
@@ -495,10 +527,27 @@ namespace v2rayN.Handler
                     serversItem.address = config.address();
                     serversItem.port = config.port();
                     serversItem.password = config.id();
+                    serversItem.flow = string.Empty;
 
                     serversItem.ota = false;
                     serversItem.level = 1;
 
+                    //if xtls
+                    if (config.streamSecurity() == Global.StreamSecurityX)
+                    {
+                        if (Utils.IsNullOrEmpty(config.flow()))
+                        {
+                            serversItem.flow = "xtls-rprx-origin";
+                        }
+                        else
+                        {
+                            serversItem.flow = config.flow().Replace("splice", "direct");
+                        }
+
+                        outbound.mux.enabled = false;
+                        outbound.mux.concurrency = -1;
+                    }
+
                     outbound.mux.enabled = false;
                     outbound.mux.concurrency = -1;
 
@@ -531,6 +580,8 @@ namespace v2rayN.Handler
                 //远程服务器底层传输配置
                 streamSettings.network = config.network();
                 string host = config.requestHost();
+                string sni = config.sni();
+
                 //if tls
                 if (config.streamSecurity() == Global.StreamSecurity)
                 {
@@ -538,9 +589,14 @@ namespace v2rayN.Handler
 
                     TlsSettings tlsSettings = new TlsSettings
                     {
-                        allowInsecure = config.allowInsecure()
+                        allowInsecure = config.allowInsecure(),
+                        alpn = config.alpn()
                     };
-                    if (!string.IsNullOrWhiteSpace(host))
+                    if (!string.IsNullOrWhiteSpace(sni))
+                    {
+                        tlsSettings.serverName = sni;
+                    }
+                    else if (!string.IsNullOrWhiteSpace(host))
                     {
                         tlsSettings.serverName = Utils.String2List(host)[0];
                     }
@@ -554,9 +610,14 @@ namespace v2rayN.Handler
 
                     TlsSettings xtlsSettings = new TlsSettings
                     {
-                        allowInsecure = config.allowInsecure()
+                        allowInsecure = config.allowInsecure(),
+                        alpn = config.alpn()
                     };
-                    if (!string.IsNullOrWhiteSpace(host))
+                    if (!string.IsNullOrWhiteSpace(sni))
+                    {
+                        xtlsSettings.serverName = sni;
+                    }
+                    else if (!string.IsNullOrWhiteSpace(host))
                     {
                         xtlsSettings.serverName = Utils.String2List(host)[0];
                     }
@@ -660,9 +721,23 @@ namespace v2rayN.Handler
                         streamSettings.quicSettings = quicsettings;
                         if (config.streamSecurity() == Global.StreamSecurity)
                         {
-                            streamSettings.tlsSettings.serverName = config.address();
+                            if (!string.IsNullOrWhiteSpace(sni))
+                            {
+                                streamSettings.tlsSettings.serverName = sni;
+                            }
+                            else
+                            {
+                                streamSettings.tlsSettings.serverName = config.address();
+                            }
                         }
                         break;
+                    case "grpc":
+                        var grpcSettings = new GrpcSettings();
+
+                        grpcSettings.serviceName = config.path();
+                        grpcSettings.multiMode = (config.headerType() == Global.GrpcmultiMode ? true : false);
+                        streamSettings.grpcSettings = grpcSettings;
+                        break;
                     default:
                         //tcp带http伪装
                         if (config.headerType().Equals(Global.TcpHeaderHttp))
@@ -1345,6 +1420,12 @@ namespace v2rayN.Handler
                     msg = UIRes.I18N("FailedGenDefaultConfiguration");
                     return "";
                 }
+                List<IPEndPoint> lstIpEndPoints = null;
+                try
+                {
+                    lstIpEndPoints = new List<IPEndPoint>(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
+                }
+                catch { }
 
                 log(configCopy, ref v2rayConfig, false);
                 //routing(config, ref v2rayConfig);
@@ -1353,6 +1434,7 @@ namespace v2rayN.Handler
                 v2rayConfig.inbounds.Clear(); // Remove "proxy" service for speedtest, avoiding port conflicts.
 
                 int httpPort = configCopy.GetLocalPort("speedtest");
+
                 foreach (int index in selecteds)
                 {
                     if (configCopy.vmess[index].configType == (int)EConfigType.Custom)
@@ -1361,11 +1443,18 @@ namespace v2rayN.Handler
                     }
 
                     configCopy.index = index;
+                    var port = httpPort + index;
+
+                    //Port In Used
+                    if (lstIpEndPoints != null && lstIpEndPoints.FindIndex(_it => _it.Port == port) >= 0)
+                    {
+                        continue;
+                    }
 
                     Inbounds inbound = new Inbounds
                     {
                         listen = Global.Loopback,
-                        port = httpPort + index,
+                        port = port,
                         protocol = Global.InboundHttp
                     };
                     inbound.tag = Global.InboundHttp + inbound.port.ToString();

v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs

@@ -151,7 +151,7 @@ namespace v2rayN.HttpProxyHandler
         {
             var type = config.sysProxyType;
 
-            if (forceDisable)
+            if (forceDisable && type == ESysProxyType.ForcedChange)
             {
                 type = ESysProxyType.ForcedClear;
             }
@@ -166,7 +166,8 @@ namespace v2rayN.HttpProxyHandler
                 }
                 if (type == ESysProxyType.ForcedChange)
                 {
-                    SysProxyHandle.SetIEProxy(true, true, $"{Global.Loopback}:{port}");
+                    var strExceptions = $"{config.constItem.defIEProxyExceptions};{config.systemProxyExceptions}";
+                    SysProxyHandle.SetIEProxy(true, $"{Global.Loopback}:{port}", strExceptions);
                 }
                 else if (type == ESysProxyType.ForcedClear)
                 {
@@ -182,5 +183,17 @@ namespace v2rayN.HttpProxyHandler
             }
             return true;
         }
+
+        public static void ResetIEProxy4WindowsShutDown()
+        {
+            try
+            {
+                //TODO To be verified
+                Utils.RegWriteValue(@"Software\Microsoft\Windows\CurrentVersion\Internet Settings", "ProxyEnable", 0);
+            }
+            catch
+            {
+            }
+        }
     }
 }

v2rayN/v2rayN/HttpProxyHandler/SysProxyHandle.cs

@@ -82,6 +82,16 @@ namespace v2rayN.HttpProxyHandler
             ExecSysproxy(arguments);
         }
 
+
+        public static void SetIEProxy(bool global, string strProxy, string strExceptions)
+        {
+            string arguments = global
+                ? $"global {strProxy} {strExceptions}"
+                : $"pac {strProxy}";
+
+            ExecSysproxy(arguments);
+        }
+
         // set system proxy to 1 (null) (null) (null)
         public static bool ResetIEProxy()
         {

v2rayN/v2rayN/Mode/Config.cs

@@ -76,21 +76,6 @@ namespace v2rayN.Mode
             get; set;
         }
 
-        /// <summary>
-        /// 自定义服务器下载测速url
-        /// </summary>
-        public string speedTestUrl
-        {
-            get; set;
-        }
-        /// <summary>
-        /// 自定义“服务器真连接延迟”测试url
-        /// </summary>
-        public string speedPingTestUrl
-        {
-            get; set;
-        }
-
         /// <summary>
         /// 允许来自局域网的连接
         /// </summary>
@@ -161,6 +146,10 @@ namespace v2rayN.Mode
         {
             get; set;
         }
+        public string domainMatcher
+        {
+            get; set;
+        }
         public int routingIndex
         {
             get; set;
@@ -169,7 +158,11 @@ namespace v2rayN.Mode
         {
             get; set;
         }
-      
+        public bool enableRoutingAdvanced
+        {
+            get; set;
+        }
+
         public ECoreType coreType
         {
             get; set;
@@ -179,6 +172,23 @@ namespace v2rayN.Mode
             get; set;
         }
 
+        /// <summary>
+        /// systemProxyExceptions
+        /// </summary>
+        public string systemProxyExceptions
+        {
+            get; set;
+        }
+
+        public int autoUpdateInterval
+        {
+            get; set;
+        } = 0;
+
+        public ConstItem constItem
+        {
+            get; set;
+        }
         #region 函数
 
         public string address()
@@ -342,6 +352,29 @@ namespace v2rayN.Mode
             }
             return vmess[index].flow.TrimEx();
         }
+        public string sni()
+        {
+            if (index < 0)
+            {
+                return string.Empty;
+            }
+            return vmess[index].sni.TrimEx();
+        }
+        public List<string> alpn()
+        {
+            if (index < 0)
+            {
+                return null;
+            }
+            if (vmess[index].alpn != null && vmess[index].alpn.Count > 0)
+            {
+                return vmess[index].alpn;
+            }
+            else
+            {
+                return null;
+            }
+        }
         #endregion
 
     }
@@ -521,7 +554,7 @@ namespace v2rayN.Mode
         }
 
         /// <summary>
-        /// 底层传输安全
+        /// 传输层安全
         /// </summary>
         public string streamSecurity
         {
@@ -568,6 +601,20 @@ namespace v2rayN.Mode
         {
             get; set;
         }
+        /// <summary>
+        /// tls sni
+        /// </summary>
+        public string sni
+        {
+            get; set;
+        }
+        /// <summary>
+        /// tls alpn
+        /// </summary>
+        public List<string> alpn
+        {
+            get; set;
+        }
     }
 
     [Serializable]
@@ -689,6 +736,14 @@ namespace v2rayN.Mode
         /// enable
         /// </summary>
         public bool enabled { get; set; } = true;
+
+        /// <summary>
+        /// 
+        /// </summary>
+        public string userAgent
+        {
+            get; set;
+        } = string.Empty;
     }
 
     [Serializable]
@@ -706,4 +761,27 @@ namespace v2rayN.Mode
             get; set;
         }
     }
+
+    [Serializable]
+    public class ConstItem
+    {
+        /// <summary>
+        /// 自定义服务器下载测速url
+        /// </summary>
+        public string speedTestUrl
+        {
+            get; set;
+        }
+        /// <summary>
+        /// 自定义“服务器真连接延迟”测试url
+        /// </summary>
+        public string speedPingTestUrl
+        {
+            get; set;
+        }
+        public string defIEProxyExceptions
+        {
+            get; set;
+        }
+    }
 }

v2rayN/v2rayN/Mode/EServerColName.cs

@@ -10,6 +10,7 @@ namespace v2rayN.Mode
         port,
         security,
         network,
+        streamSecurity,
         subRemarks,
         testResult,
 

v2rayN/v2rayN/Mode/RoutingItem.cs

@@ -6,6 +6,7 @@ using System.Threading.Tasks;
 
 namespace v2rayN.Mode
 {
+    [Serializable]
     public class RoutingItem
     {
         public string remarks
@@ -22,5 +23,13 @@ namespace v2rayN.Mode
         }
         public bool enabled { get; set; } = true;
 
+        public bool locked
+        {
+            get; set;
+        }
+        public string customIcon
+        {
+            get; set;
+        }
     }
 }

v2rayN/v2rayN/Mode/RulesItem.cs

@@ -19,7 +19,9 @@ namespace v2rayN.Mode
         public List<string> domain { get; set; }
         
         public List<string> protocol { get; set; }
-        
+
+        public bool enabled { get; set; } = true;
+
     }
 
 }

v2rayN/v2rayN/Mode/V2rayConfig.cs

@@ -25,7 +25,7 @@ namespace v2rayN.Mode
         /// 统计需要， 空对象
         /// </summary>
         public Stats stats { get; set; }
-       
+
         /// </summary>
         public API api { get; set; }
 
@@ -133,14 +133,14 @@ namespace v2rayN.Mode
         /// </summary>
         public List<UsersItem> clients { get; set; }
 
-        
+
         /// <summary>
         /// VLESS
         /// </summary>
         public string decryption { get; set; }
 
         public bool allowTransparent { get; set; }
-      
+
     }
 
     public class UsersItem
@@ -170,7 +170,7 @@ namespace v2rayN.Mode
         /// <summary>
         /// VLESS
         /// </summary>
-        public string flow { get; set; }         
+        public string flow { get; set; }
     }
     public class Sniffing
     {
@@ -271,6 +271,11 @@ namespace v2rayN.Mode
         /// </summary>
         public int level { get; set; }
 
+        /// <summary>
+        /// trojan
+        /// </summary>
+        public string flow { get; set; }
+
         /// <summary>
         /// 
         /// </summary>
@@ -332,6 +337,10 @@ namespace v2rayN.Mode
         /// <summary>
         /// 
         /// </summary>
+        public string domainMatcher { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
         public List<RulesItem> rules { get; set; }
     }
 
@@ -377,6 +386,10 @@ namespace v2rayN.Mode
         /// VLESS xtls
         /// </summary>
         public TlsSettings xtlsSettings { get; set; }
+        /// <summary>
+        /// grpc
+        /// </summary>
+        public GrpcSettings grpcSettings { get; set; }
 
     }
 
@@ -391,10 +404,17 @@ namespace v2rayN.Mode
         /// 
         /// </summary>
         public string serverName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public List<string> alpn
+        {
+            get; set;
+        }
     }
 
     public class TcpSettings
-    {         
+    {
         /// <summary>
         /// 数据包头部伪装设置
         /// </summary>
@@ -458,7 +478,7 @@ namespace v2rayN.Mode
     }
 
     public class WsSettings
-    {      
+    {
         /// <summary>
         /// 
         /// </summary>
@@ -508,4 +528,16 @@ namespace v2rayN.Mode
         public Header header { get; set; }
     }
 
+    public class GrpcSettings
+    {
+        /// <summary>
+        /// 
+        /// </summary>
+        public string serviceName { get; set; }
+        /// <summary>
+        /// 
+        /// </summary>
+        public bool multiMode { get; set; }
+    }
+
 }

v2rayN/v2rayN/Mode/VmessQRCode.cs

@@ -2,52 +2,68 @@
 
 namespace v2rayN.Mode
 {
+    /// <summary>
+    /// https://github.com/2dust/v2rayN/wiki/
+    /// </summary>
     [Serializable]
     class VmessQRCode
     {
         /// <summary>
-        /// 版本
+        /// 
         /// </summary>
         public string v { get; set; } = string.Empty;
         /// <summary>
-        /// 备注
+        /// 
         /// </summary>
         public string ps { get; set; } = string.Empty;
         /// <summary>
-        /// 远程服务器地址
+        /// 
         /// </summary>
         public string add { get; set; } = string.Empty;
         /// <summary>
-        /// 远程服务器端口
+        /// 
         /// </summary>
         public string port { get; set; } = string.Empty;
         /// <summary>
-        /// 远程服务器ID
+        /// 
         /// </summary>
         public string id { get; set; } = string.Empty;
         /// <summary>
-        /// 远程服务器额外ID
+        /// 
         /// </summary>
         public string aid { get; set; } = string.Empty;
         /// <summary>
-        /// 传输协议tcp,kcp,ws
+        /// 
+        /// </summary>
+        public string scy { get; set; } = string.Empty;
+
+        /// <summary>
+        /// 
         /// </summary>
         public string net { get; set; } = string.Empty;
         /// <summary>
-        /// 伪装类型
+        /// 
         /// </summary>
         public string type { get; set; } = string.Empty;
         /// <summary>
-        /// 伪装的域名
+        /// 
         /// </summary>
         public string host { get; set; } = string.Empty;
         /// <summary>
-        /// path
+        /// 
         /// </summary>
         public string path { get; set; } = string.Empty;
         /// <summary>
-        /// 底层传输安全
+        /// TLS
         /// </summary>
         public string tls { get; set; } = string.Empty;
-    }    
+        /// <summary>
+        /// TLS SNI
+        /// </summary>
+        public string sni { get; set; } = string.Empty;
+        /// <summary>
+        /// TLS alpn
+        /// </summary>
+        public string alpn { get; set; } = string.Empty;
+    }
 }

v2rayN/v2rayN/Program.cs

@@ -33,8 +33,8 @@ namespace v2rayN
 
             if (!IsDuplicateInstance())
             {
-
-                Utils.SaveLog("v2rayN start up " + Utils.GetVersion());
+                Logging.Setup();
+                Utils.SaveLog($"v2rayN start up | {Utils.GetVersion()} | {Utils.GetExePath()}");
 
                 //设置语言环境
                 string lang = Utils.RegReadValue(Global.MyRegPath, Global.MyRegKeyLanguage, "zh-Hans");
@@ -81,7 +81,7 @@ namespace v2rayN
 
             string name = Utils.GetExePath(); // Allow different locations to run
             name = name.Replace("\\", "/"); // https://stackoverflow.com/questions/20714120/could-not-find-a-part-of-the-path-error-while-creating-mutex
-            
+
             Global.mutexObj = new Mutex(false, name, out bool bCreatedNew);
             return !bCreatedNew;
         }

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.7")]
+[assembly: AssemblyFileVersion("4.29")]

v2rayN/v2rayN/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace v2rayN.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "14.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

v2rayN/v2rayN/Resx/ResUI.Designer.cs

@@ -19,7 +19,7 @@ namespace v2rayN.Resx {
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class ResUI {
@@ -47,8 +47,8 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   重写当前线程的 CurrentUICulture 属性
-        ///   重写当前线程的 CurrentUICulture 属性。
+        ///   重写当前线程的 CurrentUICulture 属性，对
+        ///   使用此强类型资源类的所有资源查找执行重写。
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
         internal static global::System.Globalization.CultureInfo Culture {
@@ -60,6 +60,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Do you want to append rules? Choose yes to append, choose otherwise to replace 的本地化字符串。
+        /// </summary>
+        internal static string AddBatchRoutingRulesYesNo {
+            get {
+                return ResourceManager.GetString("AddBatchRoutingRulesYesNo", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Batch export subscription to clipboard successfully 的本地化字符串。
         /// </summary>
@@ -186,6 +195,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Please fill in the correct custom DNS 的本地化字符串。
+        /// </summary>
+        internal static string FillCorrectDNSText {
+            get {
+                return ResourceManager.GetString("FillCorrectDNSText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Please fill in the correct format server port 的本地化字符串。
         /// </summary>
@@ -321,6 +339,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Custom Icon 的本地化字符串。
+        /// </summary>
+        internal static string LvCustomIcon {
+            get {
+                return ResourceManager.GetString("LvCustomIcon", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Security 的本地化字符串。
         /// </summary>
@@ -375,6 +402,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 TLS 的本地化字符串。
+        /// </summary>
+        internal static string LvTLS {
+            get {
+                return ResourceManager.GetString("LvTLS", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Today download traffic 的本地化字符串。
         /// </summary>
@@ -448,7 +484,16 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Download V2ray successfully 的本地化字符串。
+        ///   查找类似 Download GeoFile: {0} successfully 的本地化字符串。
+        /// </summary>
+        internal static string MsgDownloadGeoFileSuccessfully {
+            get {
+                return ResourceManager.GetString("MsgDownloadGeoFileSuccessfully", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Download Core successfully 的本地化字符串。
         /// </summary>
         internal static string MsgDownloadV2rayCoreSuccessfully {
             get {
@@ -474,6 +519,15 @@ namespace v2rayN.Resx {
             }
         }
         
+        /// <summary>
+        ///   查找类似 Informations (Filter : {0}) 的本地化字符串。
+        /// </summary>
+        internal static string MsgInformationTitle {
+            get {
+                return ResourceManager.GetString("MsgInformationTitle", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   查找类似 Please fill in the address (Url) 的本地化字符串。
         /// </summary>
@@ -592,7 +646,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Update V2rayCore successfully 的本地化字符串。
+        ///   查找类似 Update Core successfully 的本地化字符串。
         /// </summary>
         internal static string MsgUpdateV2rayCoreSuccessfully {
             get {
@@ -601,7 +655,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 Update V2rayCore successfully! Restarting service... 的本地化字符串。
+        ///   查找类似 Update Core successfully! Restarting service... 的本地化字符串。
         /// </summary>
         internal static string MsgUpdateV2rayCoreSuccessfullyMore {
             get {
@@ -637,7 +691,7 @@ namespace v2rayN.Resx {
         }
         
         /// <summary>
-        ///   查找类似 V2ray-core not found, please download: {0} 的本地化字符串。
+        ///   查找类似 Core not found, please download: {0} 的本地化字符串。
         /// </summary>
         internal static string NotFoundCore {
             get {
@@ -861,5 +915,113 @@ namespace v2rayN.Resx {
                 return ResourceManager.GetString("TestMeOutput", resourceCulture);
             }
         }
+        
+        /// <summary>
+        ///   查找类似 *tcp camouflage type 的本地化字符串。
+        /// </summary>
+        internal static string TransportHeaderTypeTip1 {
+            get {
+                return ResourceManager.GetString("TransportHeaderTypeTip1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 *kcp camouflage type 的本地化字符串。
+        /// </summary>
+        internal static string TransportHeaderTypeTip2 {
+            get {
+                return ResourceManager.GetString("TransportHeaderTypeTip2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 *QUIC camouflage type 的本地化字符串。
+        /// </summary>
+        internal static string TransportHeaderTypeTip3 {
+            get {
+                return ResourceManager.GetString("TransportHeaderTypeTip3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 *grpc mode 的本地化字符串。
+        /// </summary>
+        internal static string TransportHeaderTypeTip4 {
+            get {
+                return ResourceManager.GetString("TransportHeaderTypeTip4", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 *ws path 的本地化字符串。
+        /// </summary>
+        internal static string TransportPathTip1 {
+            get {
+                return ResourceManager.GetString("TransportPathTip1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 *h2 path 的本地化字符串。
+        /// </summary>
+        internal static string TransportPathTip2 {
+            get {
+                return ResourceManager.GetString("TransportPathTip2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 *QUIC key/Kcp seed 的本地化字符串。
+        /// </summary>
+        internal static string TransportPathTip3 {
+            get {
+                return ResourceManager.GetString("TransportPathTip3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 *grpc serviceName 的本地化字符串。
+        /// </summary>
+        internal static string TransportPathTip4 {
+            get {
+                return ResourceManager.GetString("TransportPathTip4", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 *http host Separated by commas (,) 的本地化字符串。
+        /// </summary>
+        internal static string TransportRequestHostTip1 {
+            get {
+                return ResourceManager.GetString("TransportRequestHostTip1", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 *ws host 的本地化字符串。
+        /// </summary>
+        internal static string TransportRequestHostTip2 {
+            get {
+                return ResourceManager.GetString("TransportRequestHostTip2", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 *h2 host Separated by commas (,) 的本地化字符串。
+        /// </summary>
+        internal static string TransportRequestHostTip3 {
+            get {
+                return ResourceManager.GetString("TransportRequestHostTip3", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 *QUIC securty 的本地化字符串。
+        /// </summary>
+        internal static string TransportRequestHostTip4 {
+            get {
+                return ResourceManager.GetString("TransportRequestHostTip4", resourceCulture);
+            }
+        }
     }
 }

v2rayN/v2rayN/Resx/ResUI.resx

@@ -238,7 +238,7 @@
     <value>Clear original subscription content</value>
   </data>
   <data name="MsgDownloadV2rayCoreSuccessfully" xml:space="preserve">
-    <value>Download V2ray successfully</value>
+    <value>Download Core successfully</value>
   </data>
   <data name="MsgFailedImportSubscription" xml:space="preserve">
     <value>Failed to import subscription content</value>
@@ -283,10 +283,10 @@
     <value>Update subscription starts</value>
   </data>
   <data name="MsgUpdateV2rayCoreSuccessfully" xml:space="preserve">
-    <value>Update V2rayCore successfully</value>
+    <value>Update Core successfully</value>
   </data>
   <data name="MsgUpdateV2rayCoreSuccessfullyMore" xml:space="preserve">
-    <value>Update V2rayCore successfully! Restarting service...</value>
+    <value>Update Core successfully! Restarting service...</value>
   </data>
   <data name="NeedHttpGlobalProxy" xml:space="preserve">
     <value> This feature relies on the Http global proxy, please set it correctly first.</value>
@@ -298,7 +298,7 @@
     <value> non-Vmess service, this feature is invalid</value>
   </data>
   <data name="NotFoundCore" xml:space="preserve">
-    <value>V2ray-core not found, please download: {0}</value>
+    <value>Core not found, please download: {0}</value>
   </data>
   <data name="NoValidQRcodeFound" xml:space="preserve">
     <value>Scan completed, no valid QR code found</value>
@@ -385,4 +385,58 @@
   <data name="MsgNeedUrl" xml:space="preserve">
     <value>Please fill in the address (Url)</value>
   </data>
+  <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
+    <value>Do you want to append rules? Choose yes to append, choose otherwise to replace</value>
+  </data>
+  <data name="MsgDownloadGeoFileSuccessfully" xml:space="preserve">
+    <value>Download GeoFile: {0} successfully</value>
+  </data>
+  <data name="MsgInformationTitle" xml:space="preserve">
+    <value>Informations (Filter : {0})</value>
+  </data>
+  <data name="LvCustomIcon" xml:space="preserve">
+    <value>Custom Icon</value>
+  </data>
+  <data name="FillCorrectDNSText" xml:space="preserve">
+    <value>Please fill in the correct custom DNS</value>
+  </data>
+  <data name="TransportPathTip1" xml:space="preserve">
+    <value>*ws path</value>
+  </data>
+  <data name="TransportPathTip2" xml:space="preserve">
+    <value>*h2 path</value>
+  </data>
+  <data name="TransportPathTip3" xml:space="preserve">
+    <value>*QUIC key/Kcp seed</value>
+  </data>
+  <data name="TransportPathTip4" xml:space="preserve">
+    <value>*grpc serviceName</value>
+  </data>
+  <data name="TransportRequestHostTip1" xml:space="preserve">
+    <value>*http host Separated by commas (,)</value>
+  </data>
+  <data name="TransportRequestHostTip2" xml:space="preserve">
+    <value>*ws host</value>
+  </data>
+  <data name="TransportRequestHostTip3" xml:space="preserve">
+    <value>*h2 host Separated by commas (,)</value>
+  </data>
+  <data name="TransportRequestHostTip4" xml:space="preserve">
+    <value>*QUIC securty</value>
+  </data>
+  <data name="TransportHeaderTypeTip1" xml:space="preserve">
+    <value>*tcp camouflage type</value>
+  </data>
+  <data name="TransportHeaderTypeTip2" xml:space="preserve">
+    <value>*kcp camouflage type</value>
+  </data>
+  <data name="TransportHeaderTypeTip3" xml:space="preserve">
+    <value>*QUIC camouflage type</value>
+  </data>
+  <data name="TransportHeaderTypeTip4" xml:space="preserve">
+    <value>*grpc mode</value>
+  </data>
+  <data name="LvTLS" xml:space="preserve">
+    <value>TLS</value>
+  </data>
 </root>

v2rayN/v2rayN/Resx/ResUI.zh-Hans.resx

@@ -238,7 +238,7 @@
     <value>清除原订阅内容</value>
   </data>
   <data name="MsgDownloadV2rayCoreSuccessfully" xml:space="preserve">
-    <value>下载V2ray成功</value>
+    <value>下载Core成功</value>
   </data>
   <data name="MsgFailedImportSubscription" xml:space="preserve">
     <value>导入订阅内容失败</value>
@@ -283,10 +283,10 @@
     <value>更新订阅开始</value>
   </data>
   <data name="MsgUpdateV2rayCoreSuccessfully" xml:space="preserve">
-    <value>更新V2rayCore成功</value>
+    <value>更新Core成功</value>
   </data>
   <data name="MsgUpdateV2rayCoreSuccessfullyMore" xml:space="preserve">
-    <value>更新V2rayCore成功！正在重启服务...</value>
+    <value>更新Core成功！正在重启服务...</value>
   </data>
   <data name="NeedHttpGlobalProxy" xml:space="preserve">
     <value>此功能依赖Http全局代理,请先设置正确。</value>
@@ -298,7 +298,7 @@
     <value>非Vmess服务，此功能无效</value>
   </data>
   <data name="NotFoundCore" xml:space="preserve">
-    <value>找不到 v2ray-core，下载地址: {0}</value>
+    <value>找不到Core，下载地址: {0}</value>
   </data>
   <data name="NoValidQRcodeFound" xml:space="preserve">
     <value>扫描完成,未发现有效二维码</value>
@@ -385,4 +385,58 @@
   <data name="MsgNeedUrl" xml:space="preserve">
     <value>请填写地址(Url)</value>
   </data>
+  <data name="AddBatchRoutingRulesYesNo" xml:space="preserve">
+    <value>是否追加规则?选择是则追加,选择否则替换</value>
+  </data>
+  <data name="MsgDownloadGeoFileSuccessfully" xml:space="preserve">
+    <value>下载 GeoFile: {0} 成功</value>
+  </data>
+  <data name="MsgInformationTitle" xml:space="preserve">
+    <value>信息 (过滤器 : {0})</value>
+  </data>
+  <data name="LvCustomIcon" xml:space="preserve">
+    <value>自定义图标</value>
+  </data>
+  <data name="FillCorrectDNSText" xml:space="preserve">
+    <value>请填写正确的自定义DNS</value>
+  </data>
+  <data name="TransportPathTip1" xml:space="preserve">
+    <value>*ws path</value>
+  </data>
+  <data name="TransportPathTip2" xml:space="preserve">
+    <value>*h2 path</value>
+  </data>
+  <data name="TransportPathTip3" xml:space="preserve">
+    <value>*QUIC 加密密钥/Kcp seed</value>
+  </data>
+  <data name="TransportPathTip4" xml:space="preserve">
+    <value>*grpc serviceName</value>
+  </data>
+  <data name="TransportRequestHostTip1" xml:space="preserve">
+    <value>*http host中间逗号(,)隔开</value>
+  </data>
+  <data name="TransportRequestHostTip2" xml:space="preserve">
+    <value>*ws host</value>
+  </data>
+  <data name="TransportRequestHostTip3" xml:space="preserve">
+    <value>*h2 host中间逗号(,)隔开</value>
+  </data>
+  <data name="TransportRequestHostTip4" xml:space="preserve">
+    <value>*QUIC 加密方式</value>
+  </data>
+  <data name="TransportHeaderTypeTip1" xml:space="preserve">
+    <value>*tcp伪装类型</value>
+  </data>
+  <data name="TransportHeaderTypeTip2" xml:space="preserve">
+    <value>*kcp伪装类型</value>
+  </data>
+  <data name="TransportHeaderTypeTip3" xml:space="preserve">
+    <value>*QUIC伪装类型</value>
+  </data>
+  <data name="TransportHeaderTypeTip4" xml:space="preserve">
+    <value>*grpc 模式</value>
+  </data>
+  <data name="LvTLS" xml:space="preserve">
+    <value>传输层安全</value>
+  </data>
 </root>

v2rayN/v2rayN/Sample/custom_routing_black

@@ -0,0 +1,29 @@
+[
+  {
+    "outboundTag": "direct",
+    "protocol": [
+      "bittorrent"
+    ]
+  },
+  {
+    "outboundTag": "block",
+    "domain": [
+      "geosite:category-ads-all"
+    ]
+  },
+  {
+    "outboundTag": "proxy",
+    "ip": [
+      "geoip:telegram"
+    ],
+    "domain": [
+      "geosite:gfw",
+      "geosite:greatfire",
+      "geosite:tld-!cn"
+    ]
+  },
+  {
+    "port": "0-65535",
+    "outboundTag": "direct"
+  }
+]

v2rayN/v2rayN/Sample/custom_routing_locked

@@ -0,0 +1,21 @@
+[
+  {
+    "domain": [
+      "geosite:google"
+    ],
+    "outboundTag": "proxy"
+  },
+  {
+    "outboundTag": "direct",
+    "domain": [
+      "domain:example-example.com",
+      "domain:example-example2.com"
+    ]
+  },
+  {
+    "outboundTag": "block",
+    "domain": [
+      "geosite:category-ads-all"
+    ]
+  }
+]

v2rayN/v2rayN/Sample/custom_routing_white

@@ -1,15 +1,23 @@
-[{
-		"outboundTag": "block",
-		"domain": [
-			"geosite:category-ads-all"
-		]
-	},
-	{
-		"outboundTag": "direct",
-		"domain": [
-			"geosite:cn"
-		]
-	},
+[
+  {
+    "outboundTag": "direct",
+    "domain": [
+      "domain:example-example.com",
+      "domain:example-example2.com"
+    ]
+  },
+  {
+    "outboundTag": "block",
+    "domain": [
+      "geosite:category-ads-all"
+    ]
+  },
+  {
+    "outboundTag": "direct",
+    "domain": [
+      "geosite:cn"
+    ]
+  },
   {
     "outboundTag": "direct",
     "ip": [
@@ -17,8 +25,8 @@
       "geoip:cn"
     ]
   },
-	{
-		"port": "0-65535",
-		"outboundTag": "proxy"
-	}
+  {
+    "port": "0-65535",
+    "outboundTag": "proxy"
+  }
 ]

v2rayN/v2rayN/Tool/Logging.cs

@@ -0,0 +1,37 @@
+using log4net;
+using log4net.Appender;
+using log4net.Core;
+using log4net.Layout;
+using log4net.Repository.Hierarchy;
+
+namespace v2rayN.Tool
+{
+    public class Logging
+    {
+        public static void Setup()
+        {
+            Hierarchy hierarchy = (Hierarchy)LogManager.GetRepository();
+
+            PatternLayout patternLayout = new PatternLayout();
+            patternLayout.ConversionPattern = "%date [%thread] %-5level %logger - %message%newline";
+            patternLayout.ActivateOptions();
+          
+            RollingFileAppender roller = new RollingFileAppender();
+            roller.AppendToFile = true;
+            roller.RollingStyle = RollingFileAppender.RollingMode.Date;
+            roller.DatePattern = "yyyy-MM-dd'.txt'";
+            roller.File = Utils.GetPath(@"guiLogs\");
+            roller.Layout = patternLayout;
+            roller.StaticLogFileName = false;
+            roller.ActivateOptions();
+            hierarchy.Root.AddAppender(roller);
+
+            MemoryAppender memory = new MemoryAppender();
+            memory.ActivateOptions();
+            hierarchy.Root.AddAppender(memory);
+
+            hierarchy.Root.Level = Level.Info;
+            hierarchy.Configured = true;
+        }
+    }
+}

v2rayN/v2rayN/Tool/Utils.cs

@@ -21,6 +21,7 @@ using System.Security.Principal;
 using v2rayN.Base;
 using Newtonsoft.Json.Linq;
 using System.Web;
+using log4net;
 
 namespace v2rayN
 {
@@ -47,8 +48,9 @@ namespace v2rayN
                     result = reader.ReadToEnd();
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             return result;
         }
@@ -69,8 +71,9 @@ namespace v2rayN
                     result = reader.ReadToEnd();
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             return result;
         }
@@ -108,8 +111,9 @@ namespace v2rayN
                                            Formatting.Indented,
                                            new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore });
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             return result;
         }
@@ -141,8 +145,9 @@ namespace v2rayN
                 }
                 result = 0;
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 result = -1;
             }
             return result;
@@ -155,8 +160,10 @@ namespace v2rayN
                 JObject obj = JObject.Parse(strJson);
                 return obj;
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
+
                 return null;
             }
         }
@@ -173,6 +180,10 @@ namespace v2rayN
         {
             try
             {
+                if (lst == null)
+                {
+                    return string.Empty;
+                }
                 if (wrap)
                 {
                     return string.Join("," + Environment.NewLine, lst.ToArray());
@@ -182,8 +193,9 @@ namespace v2rayN
                     return string.Join(",", lst.ToArray());
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return string.Empty;
             }
         }
@@ -199,8 +211,9 @@ namespace v2rayN
                 str = str.Replace(Environment.NewLine, "");
                 return new List<string>(str.Split(new string[] { "," }, StringSplitOptions.RemoveEmptyEntries));
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return new List<string>();
             }
         }
@@ -265,8 +278,9 @@ namespace v2rayN
             {
                 return Convert.ToInt32(obj);
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return 0;
             }
         }
@@ -277,8 +291,9 @@ namespace v2rayN
             {
                 return (obj == null ? string.Empty : obj.ToString());
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return string.Empty;
             }
         }
@@ -338,37 +353,7 @@ namespace v2rayN
             return $"{string.Format("{0:f1}", result)} {unit}";
         }
 
-        public static void DedupServerList(List<Mode.VmessItem> source, out List<Mode.VmessItem> result, bool keepOlder)
-        {
-            List<Mode.VmessItem> list = new List<Mode.VmessItem>();
-            if (!keepOlder) source.Reverse(); // Remove the early items first
 
-            bool _isAdded(Mode.VmessItem o, Mode.VmessItem n)
-            {
-                return o.configVersion == n.configVersion &&
-                    o.configType == n.configType &&
-                    o.address == n.address &&
-                    o.port == n.port &&
-                    o.id == n.id &&
-                    o.alterId == n.alterId &&
-                    o.security == n.security &&
-                    o.network == n.network &&
-                    o.headerType == n.headerType &&
-                    o.requestHost == n.requestHost &&
-                    o.path == n.path &&
-                    o.streamSecurity == n.streamSecurity;
-                // skip (will remove) different remarks
-            }
-            foreach (Mode.VmessItem item in source)
-            {
-                if (!list.Exists(i => _isAdded(i, item)))
-                {
-                    list.Add(item);
-                }
-            }
-            if (!keepOlder) list.Reverse();
-            result = list;
-        }
 
         public static string UrlEncode(string url)
         {
@@ -395,8 +380,9 @@ namespace v2rayN
                 int var1 = ToInt(oText);
                 return true;
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return false;
             }
         }
@@ -487,6 +473,24 @@ namespace v2rayN
             return Regex.IsMatch(input, pattern, RegexOptions.IgnoreCase);
         }
 
+        public static bool IsIpv6(string ip)
+        {
+            IPAddress address;
+            if (IPAddress.TryParse(ip, out address))
+            {
+                switch (address.AddressFamily)
+                {
+                    case AddressFamily.InterNetwork:
+                        return false;
+                    case AddressFamily.InterNetworkV6:
+                        return true;
+                    default:
+                        return false;
+                }
+            }
+            return false;
+        }
+
         #endregion
 
         #region 开机自动启动
@@ -518,10 +522,11 @@ namespace v2rayN
             try
             {
                 string exePath = GetExePath();
-                RegWriteValue(autoRunRegPath, autoRunName, run ? exePath : "");
+                RegWriteValue(autoRunRegPath, autoRunName, run ? $"\"{exePath}\"" : "");
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
         }
 
@@ -535,13 +540,14 @@ namespace v2rayN
             {
                 string value = RegReadValue(autoRunRegPath, autoRunName, "");
                 string exePath = GetExePath();
-                if (value?.Equals(exePath) == true)
+                if (value?.Equals(exePath) == true || value?.Equals($"\"{exePath}\"") == true)
                 {
                     return true;
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             return false;
         }
@@ -590,8 +596,9 @@ namespace v2rayN
                     return value;
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             finally
             {
@@ -600,13 +607,13 @@ namespace v2rayN
             return def;
         }
 
-        public static void RegWriteValue(string path, string name, string value)
+        public static void RegWriteValue(string path, string name, object value)
         {
             RegistryKey regKey = null;
             try
             {
                 regKey = Registry.CurrentUser.CreateSubKey(path);
-                if (IsNullOrEmpty(value))
+                if (IsNullOrEmpty(value.ToString()))
                 {
                     regKey?.DeleteValue(name, false);
                 }
@@ -615,14 +622,35 @@ namespace v2rayN
                     regKey?.SetValue(name, value);
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             finally
             {
                 regKey?.Close();
             }
         }
+
+        /// <summary>
+        /// 判断.Net Framework的Release是否符合
+        /// (.Net Framework 版本在4.0及以上)
+        /// </summary>
+        /// <param name="release">需要的版本4.6.2=394802;4.8=528040</param>
+        /// <returns></returns>
+        public static bool GetDotNetRelease(int release)
+        {
+            const string subkey = @"SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full\";
+            using (RegistryKey ndpKey = RegistryKey.OpenBaseKey(RegistryHive.LocalMachine, RegistryView.Registry32).OpenSubKey(subkey))
+            {
+                if (ndpKey != null && ndpKey.GetValue("Release") != null)
+                {
+                    return (int)ndpKey.GetValue("Release") >= release ? true : false;
+                }
+                return false;
+            }
+        }
+
         #endregion
 
         #region 测速
@@ -656,8 +684,9 @@ namespace v2rayN
                     }
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return -1;
             }
             return roundtripTime;
@@ -679,20 +708,54 @@ namespace v2rayN
                         lstIPAddress.Add(ipa.ToString());
                 }
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             return lstIPAddress;
         }
 
         public static void SetSecurityProtocol()
         {
-            ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3
-                                       | SecurityProtocolType.Tls
-                                       | SecurityProtocolType.Tls11
-                                       | SecurityProtocolType.Tls12;
+            string securityProtocolTls13 = RegReadValue(Global.MyRegPath, Global.MyRegKeySecurityProtocolTls13, "0");
+
+            if (securityProtocolTls13.Equals("1"))
+            {
+                ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3
+                                           | SecurityProtocolType.Tls
+                                           | SecurityProtocolType.Tls11
+                                           | SecurityProtocolType.Tls12
+                                           | SecurityProtocolType.Tls13;
+            }
+            else
+            {
+                ServicePointManager.SecurityProtocol = SecurityProtocolType.Ssl3
+                                           | SecurityProtocolType.Tls
+                                           | SecurityProtocolType.Tls11
+                                           | SecurityProtocolType.Tls12;
+            }
             ServicePointManager.DefaultConnectionLimit = 256;
         }
+
+        public static bool PortInUse(int port)
+        {
+            bool inUse = false;
+
+            IPGlobalProperties ipProperties = IPGlobalProperties.GetIPGlobalProperties();
+            IPEndPoint[] ipEndPoints = ipProperties.GetActiveTcpListeners();
+
+            var lstIpEndPoints = new List<IPEndPoint>(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
+
+            foreach (IPEndPoint endPoint in ipEndPoints)
+            {
+                if (endPoint.Port == port)
+                {
+                    inUse = true;
+                    break;
+                }
+            }
+            return inUse;
+        }
         #endregion
 
         #region 杂项
@@ -710,8 +773,9 @@ namespace v2rayN
                         FileVersionInfo.GetVersionInfo(location).FileVersion.ToString(),
                         File.GetLastWriteTime(location).ToString("yyyy/MM/dd"));
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return string.Empty;
             }
         }
@@ -748,14 +812,15 @@ namespace v2rayN
             try
             {
                 IDataObject data = Clipboard.GetDataObject();
-                if (data.GetDataPresent(DataFormats.Text))
+                if (data.GetDataPresent(DataFormats.UnicodeText))
                 {
-                    strData = data.GetData(DataFormats.Text).ToString();
+                    strData = data.GetData(DataFormats.UnicodeText).ToString();
                 }
                 return strData;
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             return strData;
         }
@@ -785,8 +850,9 @@ namespace v2rayN
             {
                 return Guid.NewGuid().ToString("D");
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
             }
             return string.Empty;
         }
@@ -804,8 +870,9 @@ namespace v2rayN
                 //WindowsBuiltInRole可以枚举出很多权限，例如系统用户、User、Guest等等
                 return windowsPrincipal.IsInRole(WindowsBuiltInRole.Administrator);
             }
-            catch
+            catch (Exception ex)
             {
+                SaveLog(ex.Message, ex);
                 return false;
             }
         }
@@ -814,6 +881,14 @@ namespace v2rayN
         {
             i.SubItems.Add(new ListViewItem.ListViewSubItem() { Name = name, Text = text });
         }
+
+        public static string GetDownloadFileName(string url)
+        {
+            var fileName = System.IO.Path.GetFileName(url);
+            fileName += "_temp";
+
+            return fileName;
+        }
         #endregion
 
         #region TempPath
@@ -852,37 +927,14 @@ namespace v2rayN
 
         public static void SaveLog(string strContent)
         {
-            SaveLog("info", new Exception(strContent));
+            var logger = LogManager.GetLogger("Log1");
+            logger.Info(strContent);
         }
         public static void SaveLog(string strTitle, Exception ex)
         {
-            try
-            {
-                string path = Path.Combine(StartupPath(), "guiLogs");
-                string FilePath = Path.Combine(path, DateTime.Now.ToString("yyyyMMdd") + ".txt");
-                if (!Directory.Exists(path))
-                {
-                    Directory.CreateDirectory(path);
-                }
-                if (!File.Exists(FilePath))
-                {
-                    FileStream FsCreate = new FileStream(FilePath, FileMode.Create);
-                    FsCreate.Close();
-                    FsCreate.Dispose();
-                }
-                FileStream FsWrite = new FileStream(FilePath, FileMode.Append, FileAccess.Write);
-                StreamWriter SwWrite = new StreamWriter(FsWrite);
-
-                string strContent = ex.ToString();
-
-                SwWrite.WriteLine(string.Format("{0}{1}[{2}]{3}", "--------------------------------", strTitle, DateTime.Now.ToString("HH:mm:ss"), "--------------------------------"));
-                SwWrite.Write(strContent);
-                SwWrite.WriteLine(Environment.NewLine);
-                SwWrite.WriteLine(" ");
-                SwWrite.Flush();
-                SwWrite.Close();
-            }
-            catch { }
+            var logger = LogManager.GetLogger("Log2");
+            logger.Debug(strTitle);
+            logger.Debug(ex);
         }
 
         #endregion
@@ -936,7 +988,10 @@ namespace v2rayN
                     }
                 }
             }
-            catch { }
+            catch (Exception ex)
+            {
+                SaveLog(ex.Message, ex);
+            }
             return string.Empty;
         }
 

v2rayN/v2rayN/app.config

@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <configuration>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   
 </configuration>

v2rayN/v2rayN/v2rayN.csproj

@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>v2rayN</RootNamespace>
     <AssemblyName>v2rayN</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
     <IsWebBootstrapper>false</IsWebBootstrapper>
@@ -125,6 +125,12 @@
     <Compile Include="Forms\BaseServerForm.Designer.cs">
       <DependentUpon>BaseServerForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\MsgFilterSetForm.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\MsgFilterSetForm.Designer.cs">
+      <DependentUpon>MsgFilterSetForm.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\RoutingRuleSettingDetailsForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -137,7 +143,14 @@
     <Compile Include="Forms\RoutingRuleSettingForm.Designer.cs">
       <DependentUpon>RoutingRuleSettingForm.cs</DependentUpon>
     </Compile>
+    <Compile Include="Forms\ServerTransportControl.cs">
+      <SubType>UserControl</SubType>
+    </Compile>
+    <Compile Include="Forms\ServerTransportControl.Designer.cs">
+      <DependentUpon>ServerTransportControl.cs</DependentUpon>
+    </Compile>
     <Compile Include="Handler\ShareHandler.cs" />
+    <Compile Include="Handler\UpdateHandle.cs" />
     <Compile Include="Mode\ComboItem.cs" />
     <Compile Include="Forms\MainForm.cs">
       <SubType>Form</SubType>
@@ -249,6 +262,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Tool\FileManager.cs" />
     <Compile Include="Tool\Job.cs" />
+    <Compile Include="Tool\Logging.cs" />
     <Compile Include="Tool\QueryableExtension.cs" />
     <Compile Include="Tool\UIRes.cs" />
     <Compile Include="Tool\UI.cs" />
@@ -301,6 +315,12 @@
       <DependentUpon>MainForm.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\MsgFilterSetForm.resx">
+      <DependentUpon>MsgFilterSetForm.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\MsgFilterSetForm.zh-Hans.resx">
+      <DependentUpon>MsgFilterSetForm.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\OptionSettingForm.zh-Hans.resx">
       <DependentUpon>OptionSettingForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -323,6 +343,12 @@
     <EmbeddedResource Include="Forms\RoutingRuleSettingForm.zh-Hans.resx">
       <DependentUpon>RoutingRuleSettingForm.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\ServerTransportControl.resx">
+      <DependentUpon>ServerTransportControl.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\ServerTransportControl.zh-Hans.resx">
+      <DependentUpon>ServerTransportControl.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\SubSettingControl.resx">
       <DependentUpon>SubSettingControl.cs</DependentUpon>
       <SubType>Designer</SubType>
@@ -388,6 +414,8 @@
     <None Include="Resources\sysproxy64.exe.gz" />
     <EmbeddedResource Include="Sample\custom_routing_white" />
     <EmbeddedResource Include="Sample\custom_routing_global" />
+    <EmbeddedResource Include="Sample\custom_routing_locked" />
+    <EmbeddedResource Include="Sample\custom_routing_black" />
     <Protobuf Include="Protos\Statistics.proto" />
   </ItemGroup>
   <ItemGroup>
@@ -459,21 +487,24 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Google.Protobuf">
-      <Version>3.11.4</Version>
+      <Version>3.19.1</Version>
     </PackageReference>
     <PackageReference Include="Grpc.Core">
-      <Version>2.27.0</Version>
+      <Version>2.42.0</Version>
     </PackageReference>
     <PackageReference Include="Grpc.Tools">
-      <Version>2.27.0</Version>
+      <Version>2.42.0</Version>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="log4net">
+      <Version>2.0.14</Version>
+    </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
-      <Version>12.0.3</Version>
+      <Version>13.0.1</Version>
     </PackageReference>
     <PackageReference Include="ZXing.Net">
-      <Version>0.16.5</Version>
+      <Version>0.16.7</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

v2rayN/v2rayUpgrade/App.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
 </configuration>

v2rayN/v2rayUpgrade/MainForm.cs

@@ -3,6 +3,7 @@ using System.Diagnostics;
 using System.IO;
 using System.IO.Compression;
 using System.Text;
+using System.Web;
 using System.Windows.Forms;
 
 namespace v2rayUpgrade
@@ -17,7 +18,8 @@ namespace v2rayUpgrade
             InitializeComponent();
             if (args.Length > 0)
             {
-                fileName = args[0];
+                fileName = string.Join(" ", args);
+                fileName = HttpUtility.UrlDecode(fileName);
             }
         }
         private void showWarn(string message)

v2rayN/v2rayUpgrade/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace v2rayUpgrade.Properties {
     // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
     // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
     // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

v2rayN/v2rayUpgrade/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace v2rayUpgrade.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.3.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

v2rayN/v2rayUpgrade/v2rayUpgrade.csproj

@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>v2rayUpgrade</RootNamespace>
     <AssemblyName>v2rayUpgrade</AssemblyName>
-    <TargetFrameworkVersion>v4.6</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
@@ -39,6 +39,7 @@
     <Reference Include="System.Core" />
     <Reference Include="System.IO.Compression" />
     <Reference Include="System.IO.Compression.FileSystem" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />

v2rayN/v2rayUpgrade/v2rayUpgrade.csproj.user

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <StartArguments>D:\Github\v2rayN\v2rayN\v2rayUpgrade\bin\Debug\v2ray-windows.zip</StartArguments>
+    <StartArguments>C:\Githubb\v2rayN\v2rayN\v2rayUpgrade\bin\Debug\v2ray-windows.zip</StartArguments>
   </PropertyGroup>
 </Project>