upgrade

README.md

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

v2rayN/v2rayN/Forms/AddServer5Form.Designer.cs

@@ -0,0 +1,489 @@
+namespace v2rayN.Forms
+{
+    partial class AddServer5Form
+    {
+        /// <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(AddServer5Form));
+            this.btnClose = new System.Windows.Forms.Button();
+            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();
+            this.label6 = new System.Windows.Forms.Label();
+            this.label5 = new System.Windows.Forms.Label();
+            this.txtId = new System.Windows.Forms.TextBox();
+            this.label3 = new System.Windows.Forms.Label();
+            this.txtPort = new System.Windows.Forms.TextBox();
+            this.label2 = new System.Windows.Forms.Label();
+            this.txtAddress = new System.Windows.Forms.TextBox();
+            this.label1 = new System.Windows.Forms.Label();
+            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.groupBox1.SuspendLayout();
+            this.groupBox2.SuspendLayout();
+            this.panTlsMore.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.menuServer.SuspendLayout();
+            this.SuspendLayout();
+            // 
+            // 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
+            // 
+            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);
+            this.groupBox1.Controls.Add(this.label6);
+            this.groupBox1.Controls.Add(this.label5);
+            this.groupBox1.Controls.Add(this.txtId);
+            this.groupBox1.Controls.Add(this.label3);
+            this.groupBox1.Controls.Add(this.txtPort);
+            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;
+            // 
+            // btnGUID
+            // 
+            resources.ApplyResources(this.btnGUID, "btnGUID");
+            this.btnGUID.Name = "btnGUID";
+            this.btnGUID.UseVisualStyleBackColor = true;
+            this.btnGUID.Click += new System.EventHandler(this.btnGUID_Click);
+            // 
+            // label13
+            // 
+            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");
+            this.label8.Name = "label8";
+            // 
+            // cmbSecurity
+            // 
+            this.cmbSecurity.DropDownStyle = System.Windows.Forms.ComboBoxStyle.Simple;
+            this.cmbSecurity.FormattingEnabled = true;
+            this.cmbSecurity.Items.AddRange(new object[] {
+            resources.GetString("cmbSecurity.Items")});
+            resources.ApplyResources(this.cmbSecurity, "cmbSecurity");
+            this.cmbSecurity.Name = "cmbSecurity";
+            // 
+            // txtRemarks
+            // 
+            resources.ApplyResources(this.txtRemarks, "txtRemarks");
+            this.txtRemarks.Name = "txtRemarks";
+            // 
+            // label6
+            // 
+            resources.ApplyResources(this.label6, "label6");
+            this.label6.Name = "label6";
+            // 
+            // label5
+            // 
+            resources.ApplyResources(this.label5, "label5");
+            this.label5.Name = "label5";
+            // 
+            // txtId
+            // 
+            resources.ApplyResources(this.txtId, "txtId");
+            this.txtId.Name = "txtId";
+            // 
+            // label3
+            // 
+            resources.ApplyResources(this.label3, "label3");
+            this.label3.Name = "label3";
+            // 
+            // txtPort
+            // 
+            resources.ApplyResources(this.txtPort, "txtPort");
+            this.txtPort.Name = "txtPort";
+            // 
+            // label2
+            // 
+            resources.ApplyResources(this.label2, "label2");
+            this.label2.Name = "label2";
+            // 
+            // txtAddress
+            // 
+            resources.ApplyResources(this.txtAddress, "txtAddress");
+            this.txtAddress.Name = "txtAddress";
+            // 
+            // label1
+            // 
+            resources.ApplyResources(this.label1, "label1");
+            this.label1.Name = "label1";
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.btnClose);
+            this.panel2.Controls.Add(this.btnOK);
+            resources.ApplyResources(this.panel2, "panel2");
+            this.panel2.Name = "panel2";
+            // 
+            // btnOK
+            // 
+            resources.ApplyResources(this.btnOK, "btnOK");
+            this.btnOK.Name = "btnOK";
+            this.btnOK.UseVisualStyleBackColor = true;
+            this.btnOK.Click += new System.EventHandler(this.btnOK_Click);
+            // 
+            // panel1
+            // 
+            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.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);
+            // 
+            // AddServer5Form
+            // 
+            resources.ApplyResources(this, "$this");
+            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+            this.CancelButton = this.btnClose;
+            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.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.ResumeLayout(false);
+            this.PerformLayout();
+
+        }
+
+        #endregion
+
+        private System.Windows.Forms.GroupBox groupBox1;
+        private System.Windows.Forms.Button btnClose;
+        private System.Windows.Forms.Button btnOK;
+        private System.Windows.Forms.TextBox txtRemarks;
+        private System.Windows.Forms.Label label6;
+        private System.Windows.Forms.Label label5;
+        private System.Windows.Forms.TextBox txtId;
+        private System.Windows.Forms.Label label3;
+        private System.Windows.Forms.TextBox txtPort;
+        private System.Windows.Forms.Label label2;
+        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;
+    }
+}

v2rayN/v2rayN/Forms/AddServer5Form.cs

@@ -0,0 +1,284 @@
+using System;
+using System.Windows.Forms;
+using v2rayN.Handler;
+using v2rayN.Mode;
+
+namespace v2rayN.Forms
+{
+    public partial class AddServer5Form : BaseForm
+    {
+        public int EditIndex { get; set; }
+        VmessItem vmessItem = null;
+
+        public AddServer5Form()
+        {
+            InitializeComponent();
+        }
+
+        private void AddServer5Form_Load(object sender, EventArgs e)
+        {
+            if (EditIndex >= 0)
+            {
+                vmessItem = config.vmess[EditIndex];
+                BindingServer();
+            }
+            else
+            {
+                vmessItem = new VmessItem();
+                ClearServer();
+            }
+        }
+
+        /// <summary>
+        /// 绑定数据
+        /// </summary>
+        private void BindingServer()
+        {
+            txtAddress.Text = vmessItem.address;
+            txtPort.Text = vmessItem.port.ToString();
+            txtId.Text = vmessItem.id; 
+            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;
+        }
+
+
+        /// <summary>
+        /// 清除设置
+        /// </summary>
+        private void ClearServer()
+        {
+            txtAddress.Text = "";
+            txtPort.Text = "";
+            txtId.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;
+        }
+
+        private void btnOK_Click(object sender, EventArgs e)
+        {
+            string address = txtAddress.Text;
+            string port = txtPort.Text;
+            string id = txtId.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"));
+                return;
+            }
+            if (Utils.IsNullOrEmpty(port) || !Utils.IsNumberic(port))
+            {
+                UI.Show(UIRes.I18N("FillCorrectServerPort"));
+                return;
+            }
+            if (Utils.IsNullOrEmpty(id))
+            {
+                UI.Show(UIRes.I18N("FillUUID"));
+                return;
+            }
+           
+
+            vmessItem.address = address;
+            vmessItem.port = Utils.ToInt(port);
+            vmessItem.id = id;
+            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;
+            }
+            else
+            {
+                UI.ShowWarning(UIRes.I18N("OperationFailed"));
+            }
+        }
+
+        private void btnGUID_Click(object sender, EventArgs e)
+        {
+            txtId.Text = Utils.GetGUID();
+        }
+
+        private void btnClose_Click(object sender, EventArgs e)
+        {
+            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 = V2rayConfigHandler.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.zh-Hans.resx

@@ -0,0 +1,302 @@
+<?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="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>95, 12</value>
+  </data>
+  <data name="label24.Text" xml:space="preserve">
+    <value>3)QUIC 加密密钥</value>
+  </data>
+  <data name="label23.Size" type="System.Drawing.Size, System.Drawing">
+    <value>95, 12</value>
+  </data>
+  <data name="label23.Text" xml:space="preserve">
+    <value>4)QUIC 加密方式</value>
+  </data>
+  <data name="label21.Size" type="System.Drawing.Size, System.Drawing">
+    <value>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.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="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
+    <value>124, 32</value>
+  </data>
+  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
+    <value>211, 20</value>
+  </data>
+  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>107, 12</value>
+  </data>
+  <data name="label7.Text" xml:space="preserve">
+    <value>传输协议(network)</value>
+  </data>
+  <data name="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.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
+  </data>
+  <data name="label15.Text" xml:space="preserve">
+    <value>底层传输安全</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>124, 94</value>
+  </data>
+  <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
+    <value>334, 51</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.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="label8.Size" type="System.Drawing.Size, System.Drawing">
+    <value>71, 12</value>
+  </data>
+  <data name="label8.Text" xml:space="preserve">
+    <value>*非空(none)</value>
+  </data>
+  <data name="cmbSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>127, 143</value>
+  </data>
+  <data name="cmbSecurity.Size" type="System.Drawing.Size, System.Drawing">
+    <value>220, 20</value>
+  </data>
+  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="label6.Text" xml:space="preserve">
+    <value>别名(remarks)</value>
+  </data>
+  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>101, 12</value>
+  </data>
+  <data name="label5.Text" xml:space="preserve">
+    <value>加密(encryption)</value>
+  </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="label3.Text" xml:space="preserve">
+    <value>用户ID(id)</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 12</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>端口(port)</value>
+  </data>
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>83, 12</value>
+  </data>
+  <data name="label1.Text" xml:space="preserve">
+    <value>地址(address)</value>
+  </data>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>确定(&amp;O)</value>
+  </data>
+  <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>
+</root>

v2rayN/v2rayN/Forms/AddServerForm.Designer.cs

@@ -39,8 +39,11 @@
             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();
@@ -53,10 +56,7 @@
             this.label11 = new System.Windows.Forms.Label();
             this.label10 = new System.Windows.Forms.Label();
             this.cmbHeaderType = new System.Windows.Forms.ComboBox();
-            this.label9 = new System.Windows.Forms.Label();
             this.label8 = new System.Windows.Forms.Label();
-            this.cmbNetwork = new System.Windows.Forms.ComboBox();
-            this.label7 = new System.Windows.Forms.Label();
             this.cmbSecurity = new System.Windows.Forms.ComboBox();
             this.txtRemarks = new System.Windows.Forms.TextBox();
             this.label6 = new System.Windows.Forms.Label();
@@ -99,10 +99,7 @@
             this.groupBox1.Controls.Add(this.btnGUID);
             this.groupBox1.Controls.Add(this.label13);
             this.groupBox1.Controls.Add(this.groupBox2);
-            this.groupBox1.Controls.Add(this.label9);
             this.groupBox1.Controls.Add(this.label8);
-            this.groupBox1.Controls.Add(this.cmbNetwork);
-            this.groupBox1.Controls.Add(this.label7);
             this.groupBox1.Controls.Add(this.cmbSecurity);
             this.groupBox1.Controls.Add(this.txtRemarks);
             this.groupBox1.Controls.Add(this.label6);
@@ -136,8 +133,11 @@
             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);
@@ -186,6 +186,11 @@
             resources.GetString("cmbAllowInsecure.Items2")});
             this.cmbAllowInsecure.Name = "cmbAllowInsecure";
             // 
+            // label9
+            // 
+            resources.ApplyResources(this.label9, "label9");
+            this.label9.Name = "label9";
+            // 
             // label20
             // 
             resources.ApplyResources(this.label20, "label20");
@@ -196,6 +201,25 @@
             resources.ApplyResources(this.txtPath, "txtPath");
             this.txtPath.Name = "txtPath";
             // 
+            // cmbNetwork
+            // 
+            resources.ApplyResources(this.cmbNetwork, "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")});
+            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");
@@ -272,35 +296,11 @@
             resources.GetString("cmbHeaderType.Items6")});
             this.cmbHeaderType.Name = "cmbHeaderType";
             // 
-            // label9
-            // 
-            resources.ApplyResources(this.label9, "label9");
-            this.label9.Name = "label9";
-            // 
             // label8
             // 
             resources.ApplyResources(this.label8, "label8");
             this.label8.Name = "label8";
             // 
-            // cmbNetwork
-            // 
-            resources.ApplyResources(this.cmbNetwork, "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")});
-            this.cmbNetwork.Name = "cmbNetwork";
-            this.cmbNetwork.SelectedIndexChanged += new System.EventHandler(this.cmbNetwork_SelectedIndexChanged);
-            // 
-            // label7
-            // 
-            resources.ApplyResources(this.label7, "label7");
-            this.label7.Name = "label7";
-            // 
             // cmbSecurity
             // 
             resources.ApplyResources(this.cmbSecurity, "cmbSecurity");

v2rayN/v2rayN/Forms/AddServerForm.cs

@@ -180,6 +180,18 @@ 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 导入客户端/服务端配置
 
@@ -278,17 +290,5 @@ namespace v2rayN.Forms
         }
         #endregion
 
-        private void cmbStreamSecurity_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            string security = cmbStreamSecurity.Text;
-            if (Utils.IsNullOrEmpty(security))
-            {
-                panTlsMore.Hide();
-            }
-            else
-            {
-                panTlsMore.Show();
-            }
-        }
     }
 }

v2rayN/v2rayN/Forms/AddServerForm.resx

@@ -118,26 +118,26 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <data name="&gt;&gt;cmbSecurity.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>4</value>
   </data>
   <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="&gt;&gt;label4.ZOrder" xml:space="preserve">
-    <value>12</value>
+    <value>9</value>
   </data>
   <data name="label13.Location" type="System.Drawing.Point, System.Drawing">
-    <value>285, 203</value>
+    <value>285, 179</value>
   </data>
   <data name="cmbHeaderType.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 30</value>
+    <value>124, 62</value>
   </data>
   <data name="&gt;&gt;txtPath.Parent" xml:space="preserve">
     <value>groupBox2</value>
   </data>
   <data name="&gt;&gt;label6.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>6</value>
   </data>
   <data name="label19.Text" xml:space="preserve">
     <value>Path</value>
@@ -149,17 +149,17 @@
     <value>Transport protocol(network)</value>
   </data>
   <data name="&gt;&gt;label5.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>7</value>
   </data>
   <data name="&gt;&gt;panTlsMore.Name" xml:space="preserve">
     <value>panTlsMore</value>
   </data>
-  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
-    <value>groupBox1</value>
-  </data>
   <data name="&gt;&gt;label23.ZOrder" xml:space="preserve">
     <value>1</value>
   </data>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 12</value>
+  </data>
   <data name="&gt;&gt;label15.Name" xml:space="preserve">
     <value>label15</value>
   </data>
@@ -187,7 +187,7 @@
     <value>false</value>
   </data>
   <data name="&gt;&gt;cmbHeaderType.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>19</value>
   </data>
   <data name="label14.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -205,7 +205,7 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;cmbNetwork.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
   </data>
   <data name="cmbStreamSecurity.TabIndex" type="System.Int32, mscorlib">
     <value>21</value>
@@ -244,7 +244,7 @@
     <value>True</value>
   </data>
   <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>729, 474</value>
+    <value>729, 499</value>
   </data>
   <data name="cmbAllowInsecure.Items" xml:space="preserve">
     <value />
@@ -268,7 +268,7 @@
     <value>panTlsMore</value>
   </data>
   <data name="&gt;&gt;txtId.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>10</value>
   </data>
   <data name="cmbSecurity.Items" xml:space="preserve">
     <value>aes-128-gcm</value>
@@ -280,22 +280,22 @@
     <value>127, 85</value>
   </data>
   <data name="&gt;&gt;txtRequestHost.ZOrder" xml:space="preserve">
-    <value>13</value>
+    <value>16</value>
   </data>
   <data name="label6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 203</value>
+    <value>12, 179</value>
   </data>
-  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
+  <data name="btnClose.Text" xml:space="preserve">
-    <value>1</value>
+    <value>&amp;Cancel</value>
   </data>
   <data name="&gt;&gt;label10.Name" xml:space="preserve">
     <value>label10</value>
   </data>
   <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>723, 234</value>
+    <value>723, 281</value>
   </data>
   <data name="&gt;&gt;txtPath.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
   </data>
   <data name="&gt;&gt;label21.Name" xml:space="preserve">
     <value>label21</value>
@@ -325,7 +325,7 @@
     <value>5</value>
   </data>
   <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
-    <value>158, 58</value>
+    <value>158, 90</value>
   </data>
   <data name="&gt;&gt;panTlsMore.ZOrder" xml:space="preserve">
     <value>2</value>
@@ -342,6 +342,9 @@
   <data name="MenuItemImportServer.Size" type="System.Drawing.Size, System.Drawing">
     <value>237, 22</value>
   </data>
+  <data name="cmbNetwork.TabIndex" type="System.Int32, mscorlib">
+    <value>12</value>
+  </data>
   <data name="label15.Text" xml:space="preserve">
     <value>TLS</value>
   </data>
@@ -361,7 +364,7 @@
     <value>2</value>
   </data>
   <data name="&gt;&gt;label7.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+    <value>groupBox2</value>
   </data>
   <data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Bottom</value>
@@ -370,7 +373,7 @@
     <value>True</value>
   </data>
   <data name="txtRemarks.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 199</value>
+    <value>127, 175</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>
@@ -394,19 +397,19 @@
     <value>ws</value>
   </data>
   <data name="&gt;&gt;label2.ZOrder" xml:space="preserve">
-    <value>16</value>
+    <value>13</value>
   </data>
   <data name="label11.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 34</value>
+    <value>9, 66</value>
   </data>
   <data name="&gt;&gt;label1.ZOrder" xml:space="preserve">
-    <value>18</value>
+    <value>15</value>
   </data>
   <data name="MenuItemImportServer.Text" xml:space="preserve">
     <value>Import server configuration</value>
   </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>6, 12</value>
+    <value>173, 12</value>
   </data>
   <data name="&gt;&gt;btnOK.ZOrder" xml:space="preserve">
     <value>1</value>
@@ -423,9 +426,6 @@
   <data name="&gt;&gt;panel1.Name" xml:space="preserve">
     <value>panel1</value>
   </data>
-  <data name="&gt;&gt;label14.Name" xml:space="preserve">
-    <value>label14</value>
-  </data>
   <data name="&gt;&gt;label20.Parent" xml:space="preserve">
     <value>groupBox2</value>
   </data>
@@ -474,9 +474,6 @@
   <data name="&gt;&gt;label14.Parent" xml:space="preserve">
     <value>groupBox2</value>
   </data>
-  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
-    <value>panel2</value>
-  </data>
   <data name="cmbAllowInsecure.Items1" xml:space="preserve">
     <value>true</value>
   </data>
@@ -490,16 +487,13 @@
     <value>127, 114</value>
   </data>
   <data name="panTlsMore.Location" type="System.Drawing.Point, System.Drawing">
-    <value>284, 189</value>
+    <value>284, 234</value>
   </data>
   <data name="label11.Size" type="System.Drawing.Size, System.Drawing">
     <value>95, 12</value>
   </data>
-  <data name="label23.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>NoControl</value>
-  </data>
   <data name="label9.Location" type="System.Drawing.Point, System.Drawing">
-    <value>353, 175</value>
+    <value>350, 32</value>
   </data>
   <data name="&gt;&gt;cmbNetwork.Name" xml:space="preserve">
     <value>cmbNetwork</value>
@@ -535,10 +529,10 @@
     <value>True</value>
   </data>
   <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
-    <value>282, 34</value>
+    <value>282, 66</value>
   </data>
   <data name="&gt;&gt;label14.ZOrder" xml:space="preserve">
-    <value>9</value>
+    <value>12</value>
   </data>
   <data name="label17.TabIndex" type="System.Int32, mscorlib">
     <value>25</value>
@@ -546,8 +540,8 @@
   <data name="&gt;&gt;label23.Name" xml:space="preserve">
     <value>label23</value>
   </data>
-  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
+  <data name="label21.Text" xml:space="preserve">
-    <value>groupBox1</value>
+    <value>allowInsecure</value>
   </data>
   <data name="cmbStreamSecurity.Size" type="System.Drawing.Size, System.Drawing">
     <value>143, 20</value>
@@ -582,8 +576,8 @@
   <data name="&gt;&gt;label8.Name" xml:space="preserve">
     <value>label8</value>
   </data>
-  <data name="btnClose.Text" xml:space="preserve">
+  <data name="&gt;&gt;MenuItemImportClipboard.Type" xml:space="preserve">
-    <value>&amp;Cancel</value>
+    <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;label13.Name" xml:space="preserve">
     <value>label13</value>
@@ -598,7 +592,7 @@
     <value>35</value>
   </data>
   <data name="&gt;&gt;label15.ZOrder" xml:space="preserve">
-    <value>10</value>
+    <value>13</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>
@@ -610,7 +604,7 @@
     <value>True</value>
   </data>
   <data name="label14.Location" type="System.Drawing.Point, System.Drawing">
-    <value>469, 53</value>
+    <value>469, 85</value>
   </data>
   <data name="&gt;&gt;label9.Name" xml:space="preserve">
     <value>label9</value>
@@ -619,7 +613,7 @@
     <value>label20</value>
   </data>
   <data name="txtPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 125</value>
+    <value>124, 157</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>
@@ -633,8 +627,8 @@
   <data name="&gt;&gt;MenuItem1.Name" xml:space="preserve">
     <value>MenuItem1</value>
   </data>
-  <data name="&gt;&gt;label1.Name" xml:space="preserve">
+  <data name="&gt;&gt;label3.Parent" xml:space="preserve">
-    <value>label1</value>
+    <value>groupBox1</value>
   </data>
   <data name="label7.TabIndex" type="System.Int32, mscorlib">
     <value>13</value>
@@ -678,14 +672,11 @@
   <data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
     <value>729, 60</value>
   </data>
-  <data name="label21.Text" xml:space="preserve">
-    <value>allowInsecure</value>
-  </data>
   <data name="label7.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="label20.Location" type="System.Drawing.Point, System.Drawing">
-    <value>469, 83</value>
+    <value>469, 115</value>
   </data>
   <data name="&gt;&gt;menuServer.Parent" xml:space="preserve">
     <value>$this</value>
@@ -709,7 +700,7 @@
     <value>143, 21</value>
   </data>
   <data name="label16.Location" type="System.Drawing.Point, System.Drawing">
-    <value>526, 130</value>
+    <value>526, 162</value>
   </data>
   <data name="cmbHeaderType.TabIndex" type="System.Int32, mscorlib">
     <value>18</value>
@@ -718,7 +709,7 @@
     <value>12, 147</value>
   </data>
   <data name="&gt;&gt;label10.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>18</value>
   </data>
   <data name="&gt;&gt;txtId.Parent" xml:space="preserve">
     <value>groupBox1</value>
@@ -738,6 +729,9 @@
   <data name="label8.Size" type="System.Drawing.Size, System.Drawing">
     <value>119, 12</value>
   </data>
+  <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 21</value>
+  </data>
   <data name="txtPath.Multiline" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -750,9 +744,15 @@
   <data name="cmbAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
     <value>91, 20</value>
   </data>
+  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+    <value>53, 12</value>
+  </data>
   <data name="label19.TabIndex" type="System.Int32, mscorlib">
     <value>27</value>
   </data>
+  <data name="&gt;&gt;txtRequestHost.Parent" xml:space="preserve">
+    <value>groupBox2</value>
+  </data>
   <data name="btnGUID.TabIndex" type="System.Int32, mscorlib">
     <value>23</value>
   </data>
@@ -760,7 +760,7 @@
     <value>groupBox2</value>
   </data>
   <data name="&gt;&gt;label11.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>17</value>
   </data>
   <data name="label2.Text" xml:space="preserve">
     <value>Port</value>
@@ -775,10 +775,10 @@
     <value>chacha20-poly1305</value>
   </data>
   <data name="&gt;&gt;txtPort.ZOrder" xml:space="preserve">
-    <value>15</value>
+    <value>12</value>
   </data>
   <data name="&gt;&gt;cmbNetwork.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+    <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>
@@ -802,7 +802,7 @@
     <value>True</value>
   </data>
   <data name="&gt;&gt;label16.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>11</value>
   </data>
   <data name="&gt;&gt;txtAddress.Parent" xml:space="preserve">
     <value>groupBox1</value>
@@ -813,17 +813,14 @@
   <data name="label8.Text" xml:space="preserve">
     <value>*Recommended (auto)</value>
   </data>
-  <data name="cmbSecurity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>195, 143</value>
-  </data>
   <data name="&gt;&gt;label20.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
   </data>
   <data name="&gt;&gt;groupBox2.Parent" xml:space="preserve">
     <value>groupBox1</value>
   </data>
-  <data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="&gt;&gt;btnOK.Parent" xml:space="preserve">
-    <value>0, 509</value>
+    <value>panel2</value>
   </data>
   <data name="cmbHeaderType.Size" type="System.Drawing.Size, System.Drawing">
     <value>143, 20</value>
@@ -831,11 +828,11 @@
   <data name="label14.TabIndex" type="System.Int32, mscorlib">
     <value>23</value>
   </data>
-  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
+  <data name="&gt;&gt;panel2.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>1</value>
   </data>
   <data name="&gt;&gt;label17.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>10</value>
   </data>
   <data name="label8.TabIndex" type="System.Int32, mscorlib">
     <value>14</value>
@@ -847,7 +844,7 @@
     <value>True</value>
   </data>
   <data name="groupBox2.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 237</value>
+    <value>3, 215</value>
   </data>
   <data name="MenuItem1.Text" xml:space="preserve">
     <value>Import configuration file</value>
@@ -855,9 +852,6 @@
   <data name="cmbHeaderType.Items4" xml:space="preserve">
     <value>wechat-video</value>
   </data>
-  <data name="&gt;&gt;label12.ZOrder" xml:space="preserve">
-    <value>12</value>
-  </data>
   <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
     <value>23, 12</value>
   </data>
@@ -865,7 +859,7 @@
     <value>729, 10</value>
   </data>
   <data name="label23.Location" type="System.Drawing.Point, System.Drawing">
-    <value>470, 99</value>
+    <value>470, 131</value>
   </data>
   <data name="label9.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -876,9 +870,6 @@
   <data name="label13.TabIndex" type="System.Int32, mscorlib">
     <value>22</value>
   </data>
-  <data name="txtPath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>396, 54</value>
-  </data>
   <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
     <value>300, 53</value>
   </data>
@@ -889,7 +880,7 @@
     <value>12, 31</value>
   </data>
   <data name="&gt;&gt;cmbStreamSecurity.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>14</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>
@@ -909,6 +900,9 @@
   <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="panel2.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 534</value>
+  </data>
   <data name="&gt;&gt;label2.Parent" xml:space="preserve">
     <value>groupBox1</value>
   </data>
@@ -924,6 +918,9 @@
   <data name="cmbStreamSecurity.Items" xml:space="preserve">
     <value />
   </data>
+  <data name="cmbStreamSecurity.Location" type="System.Drawing.Point, System.Drawing">
+    <value>124, 242</value>
+  </data>
   <data name="groupBox1.Text" xml:space="preserve">
     <value>Server</value>
   </data>
@@ -939,8 +936,8 @@
   <data name="&gt;&gt;label8.Parent" xml:space="preserve">
     <value>groupBox1</value>
   </data>
-  <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
+  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
-    <value>txtAddress</value>
+    <value>6</value>
   </data>
   <data name="label13.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -961,7 +958,7 @@
     <value>8</value>
   </data>
   <data name="groupBox2.Text" xml:space="preserve">
-    <value>Keep the default value if it is not clear</value>
+    <value>Transport</value>
   </data>
   <data name="&gt;&gt;label18.Parent" xml:space="preserve">
     <value>groupBox2</value>
@@ -970,13 +967,13 @@
     <value>* Fill in manually</value>
   </data>
   <data name="label19.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 125</value>
+    <value>9, 157</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="cmbNetwork.TabIndex" type="System.Int32, mscorlib">
+  <data name="txtPath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>12</value>
+    <value>396, 54</value>
   </data>
   <data name="label6.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -1011,9 +1008,6 @@
   <data name="&gt;&gt;txtRequestHost.Name" xml:space="preserve">
     <value>txtRequestHost</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;txtPath.Type" xml:space="preserve">
     <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
@@ -1029,14 +1023,14 @@
   <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
   </data>
-  <data name="&gt;&gt;cmbAllowInsecure.Name" xml:space="preserve">
+  <data name="&gt;&gt;txtPort.Type" xml:space="preserve">
-    <value>cmbAllowInsecure</value>
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="btnOK.Text" xml:space="preserve">
     <value>&amp;OK</value>
   </data>
   <data name="&gt;&gt;label7.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
   </data>
   <data name="txtPort.TabIndex" type="System.Int32, mscorlib">
     <value>3</value>
@@ -1044,14 +1038,17 @@
   <data name="cmbHeaderType.Items1" xml:space="preserve">
     <value>http</value>
   </data>
+  <data name="&gt;&gt;label1.Name" xml:space="preserve">
+    <value>label1</value>
+  </data>
   <data name="label24.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
   <data name="label18.Location" type="System.Drawing.Point, System.Drawing">
-    <value>526, 147</value>
+    <value>526, 179</value>
   </data>
   <data name="&gt;&gt;label18.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>9</value>
   </data>
   <data name="&gt;&gt;groupBox2.Name" xml:space="preserve">
     <value>groupBox2</value>
@@ -1069,7 +1066,7 @@
     <value>1</value>
   </data>
   <data name="&gt;&gt;label8.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>3</value>
   </data>
   <data name="label3.Text" xml:space="preserve">
     <value>UUID(id)</value>
@@ -1089,6 +1086,9 @@
   <data name="&gt;&gt;cmbSecurity.Parent" xml:space="preserve">
     <value>groupBox1</value>
   </data>
+  <data name="&gt;&gt;cmbAllowInsecure.Name" xml:space="preserve">
+    <value>cmbAllowInsecure</value>
+  </data>
   <data name="MenuItemImportClient.Size" type="System.Drawing.Size, System.Drawing">
     <value>237, 22</value>
   </data>
@@ -1099,13 +1099,13 @@
     <value>True</value>
   </data>
   <data name="&gt;&gt;label19.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>8</value>
   </data>
   <data name="&gt;&gt;btnGUID.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="label10.Text" xml:space="preserve">
+  <data name="&gt;&gt;label12.ZOrder" xml:space="preserve">
-    <value>Camouflage domain(host)</value>
+    <value>15</value>
   </data>
   <data name="label1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -1120,7 +1120,7 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
-    <value>195, 171</value>
+    <value>192, 28</value>
   </data>
   <data name="label20.Size" type="System.Drawing.Size, System.Drawing">
     <value>203, 12</value>
@@ -1128,18 +1128,21 @@
   <data name="cmbHeaderType.Items3" xml:space="preserve">
     <value>utp</value>
   </data>
-  <data name="cmbStreamSecurity.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="&gt;&gt;txtAddress.Name" xml:space="preserve">
-    <value>124, 197</value>
+    <value>txtAddress</value>
   </data>
   <data name="cmbAllowInsecure.TabIndex" type="System.Int32, mscorlib">
     <value>30</value>
   </data>
   <data name="&gt;&gt;txtAddress.ZOrder" xml:space="preserve">
-    <value>17</value>
+    <value>14</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="label17.Location" type="System.Drawing.Point, System.Drawing">
+    <value>469, 100</value>
+  </data>
   <data name="txtAddress.Size" type="System.Drawing.Size, System.Drawing">
     <value>359, 21</value>
   </data>
@@ -1152,14 +1155,14 @@
   <data name="&gt;&gt;txtAlterId.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="label17.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
-    <value>469, 68</value>
+    <value>groupBox1</value>
   </data>
   <data name="label2.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
   </data>
   <data name="label10.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 62</value>
+    <value>9, 94</value>
   </data>
   <data name="&gt;&gt;label3.Name" xml:space="preserve">
     <value>label3</value>
@@ -1168,7 +1171,7 @@
     <value>srtp</value>
   </data>
   <data name="&gt;&gt;txtRemarks.ZOrder" xml:space="preserve">
-    <value>8</value>
+    <value>5</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>
@@ -1182,8 +1185,8 @@
   <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
     <value>75, 23</value>
   </data>
-  <data name="label5.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="label10.Text" xml:space="preserve">
-    <value>173, 12</value>
+    <value>Camouflage domain(host)</value>
   </data>
   <data name="label9.Text" xml:space="preserve">
     <value>*Default value tcp</value>
@@ -1192,7 +1195,7 @@
     <value>0</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>729, 569</value>
+    <value>729, 594</value>
   </data>
   <data name="&gt;&gt;label4.Name" xml:space="preserve">
     <value>label4</value>
@@ -1204,7 +1207,7 @@
     <value>True</value>
   </data>
   <data name="label15.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 201</value>
+    <value>9, 246</value>
   </data>
   <data name="label8.Location" type="System.Drawing.Point, System.Drawing">
     <value>353, 147</value>
@@ -1216,7 +1219,7 @@
     <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="&gt;&gt;txtAlterId.ZOrder" xml:space="preserve">
-    <value>11</value>
+    <value>8</value>
   </data>
   <data name="&gt;&gt;btnGUID.Parent" xml:space="preserve">
     <value>groupBox1</value>
@@ -1249,7 +1252,7 @@
     <value>107, 7</value>
   </data>
   <data name="&gt;&gt;label9.Parent" xml:space="preserve">
-    <value>groupBox1</value>
+    <value>groupBox2</value>
   </data>
   <data name="MenuItemImportClient.Text" xml:space="preserve">
     <value>Import client configuration</value>
@@ -1299,14 +1302,11 @@
   <data name="&gt;&gt;panTlsMore.Parent" xml:space="preserve">
     <value>groupBox2</value>
   </data>
-  <data name="txtId.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="label23.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
-    <value>278, 21</value>
+    <value>NoControl</value>
   </data>
   <data name="label7.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 175</value>
+    <value>9, 32</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;label24.Name" xml:space="preserve">
     <value>label24</value>
@@ -1318,10 +1318,10 @@
     <value>panel2</value>
   </data>
   <data name="&gt;&gt;label3.ZOrder" xml:space="preserve">
-    <value>14</value>
+    <value>11</value>
   </data>
-  <data name="&gt;&gt;txtRequestHost.Parent" xml:space="preserve">
+  <data name="cmbSecurity.Location" type="System.Drawing.Point, System.Drawing">
-    <value>groupBox2</value>
+    <value>195, 143</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>
@@ -1348,13 +1348,13 @@
     <value>System.Windows.Forms.ToolStripMenuItem, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
   <data name="label24.Location" type="System.Drawing.Point, System.Drawing">
-    <value>526, 165</value>
+    <value>526, 197</value>
   </data>
   <data name="&gt;&gt;panel1.ZOrder" xml:space="preserve">
     <value>2</value>
   </data>
-  <data name="label3.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="&gt;&gt;label14.Name" xml:space="preserve">
-    <value>53, 12</value>
+    <value>label14</value>
   </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>

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

@@ -130,7 +130,7 @@
     <value>*手填,方便识别管理</value>
   </data>
   <data name="groupBox2.Text" xml:space="preserve">
-    <value>不清楚则保持默认值</value>
+    <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">
@@ -146,20 +146,38 @@
     <value>4)QUIC 加密方式</value>
   </data>
   <data name="label21.Size" type="System.Drawing.Size, System.Drawing">
-    <value>203, 12</value>
+    <value>167, 12</value>
   </data>
   <data name="label21.Text" xml:space="preserve">
-    <value>允许不安全连接(allowInsecure)</value>
+    <value>跳过证书验证(allowInsecure)</value>
   </data>
   <data name="cmbAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
     <value>223, 7</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="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
+    <value>124, 32</value>
+  </data>
+  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
+    <value>211, 20</value>
+  </data>
+  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
+    <value>107, 12</value>
+  </data>
+  <data name="label7.Text" xml:space="preserve">
+    <value>传输协议(network)</value>
+  </data>
   <data name="label19.Size" type="System.Drawing.Size, System.Drawing">
     <value>65, 12</value>
   </data>
@@ -185,7 +203,7 @@
     <value>*tcp或kcp或QUIC伪装类型,默认none</value>
   </data>
   <data name="txtRequestHost.Location" type="System.Drawing.Point, System.Drawing">
-    <value>124, 58</value>
+    <value>124, 94</value>
   </data>
   <data name="txtRequestHost.Size" type="System.Drawing.Size, System.Drawing">
     <value>334, 51</value>
@@ -202,30 +220,12 @@
   <data name="label10.Text" xml:space="preserve">
     <value>伪装域名(host)</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="label8.Size" type="System.Drawing.Size, System.Drawing">
     <value>113, 12</value>
   </data>
   <data name="label8.Text" xml:space="preserve">
     <value>*随便选,建议(auto)</value>
   </data>
-  <data name="cmbNetwork.Location" type="System.Drawing.Point, System.Drawing">
-    <value>127, 171</value>
-  </data>
-  <data name="cmbNetwork.Size" type="System.Drawing.Size, System.Drawing">
-    <value>211, 20</value>
-  </data>
-  <data name="label7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>107, 12</value>
-  </data>
-  <data name="label7.Text" xml:space="preserve">
-    <value>传输协议(network)</value>
-  </data>
   <data name="cmbSecurity.Location" type="System.Drawing.Point, System.Drawing">
     <value>127, 143</value>
   </data>

v2rayN/v2rayN/Forms/MainForm.Designer.cs

@@ -34,6 +34,7 @@
             this.lvServers = new v2rayN.Base.ListViewFlickerFree();
             this.cmsLv = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.menuAddVmessServer = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuAddVlessServer = new System.Windows.Forms.ToolStripMenuItem();
             this.menuAddShadowsocksServer = new System.Windows.Forms.ToolStripMenuItem();
             this.menuAddSocksServer = new System.Windows.Forms.ToolStripMenuItem();
             this.menuAddCustomServer = new System.Windows.Forms.ToolStripMenuItem();
@@ -61,8 +62,8 @@
             this.menuExport2ServerConfig = new System.Windows.Forms.ToolStripMenuItem();
             this.menuExport2ShareUrl = new System.Windows.Forms.ToolStripMenuItem();
             this.menuExport2SubContent = new System.Windows.Forms.ToolStripMenuItem();
-            this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
             this.qrCodeControl = new v2rayN.Forms.QRCodeControl();
+            this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
             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();
@@ -144,17 +145,19 @@
             // 
             // scMain.Panel1
             // 
+            resources.ApplyResources(this.scMain.Panel1, "scMain.Panel1");
             this.scMain.Panel1.Controls.Add(this.lvServers);
             // 
             // scMain.Panel2
             // 
+            resources.ApplyResources(this.scMain.Panel2, "scMain.Panel2");
             this.scMain.Panel2.Controls.Add(this.qrCodeControl);
             this.scMain.TabStop = false;
             // 
             // lvServers
             // 
-            this.lvServers.ContextMenuStrip = this.cmsLv;
             resources.ApplyResources(this.lvServers, "lvServers");
+            this.lvServers.ContextMenuStrip = this.cmsLv;
             this.lvServers.FullRowSelect = true;
             this.lvServers.GridLines = true;
             this.lvServers.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
@@ -173,9 +176,11 @@
             // 
             // 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.menuAddVmessServer,
+            this.menuAddVlessServer,
             this.menuAddShadowsocksServer,
             this.menuAddSocksServer,
             this.menuAddCustomServer,
@@ -205,194 +210,199 @@
             this.menuExport2SubContent});
             this.cmsLv.Name = "cmsLv";
             this.cmsLv.OwnerItem = this.tsbServer;
-            resources.ApplyResources(this.cmsLv, "cmsLv");
             // 
             // menuAddVmessServer
             // 
-            this.menuAddVmessServer.Name = "menuAddVmessServer";
             resources.ApplyResources(this.menuAddVmessServer, "menuAddVmessServer");
+            this.menuAddVmessServer.Name = "menuAddVmessServer";
             this.menuAddVmessServer.Click += new System.EventHandler(this.menuAddVmessServer_Click);
             // 
+            // menuAddVlessServer
+            // 
+            resources.ApplyResources(this.menuAddVlessServer, "menuAddVlessServer");
+            this.menuAddVlessServer.Name = "menuAddVlessServer";
+            this.menuAddVlessServer.Click += new System.EventHandler(this.menuAddVlessServer_Click);
+            // 
             // menuAddShadowsocksServer
             // 
-            this.menuAddShadowsocksServer.Name = "menuAddShadowsocksServer";
             resources.ApplyResources(this.menuAddShadowsocksServer, "menuAddShadowsocksServer");
+            this.menuAddShadowsocksServer.Name = "menuAddShadowsocksServer";
             this.menuAddShadowsocksServer.Click += new System.EventHandler(this.menuAddShadowsocksServer_Click);
             // 
             // menuAddSocksServer
             // 
-            this.menuAddSocksServer.Name = "menuAddSocksServer";
             resources.ApplyResources(this.menuAddSocksServer, "menuAddSocksServer");
+            this.menuAddSocksServer.Name = "menuAddSocksServer";
             this.menuAddSocksServer.Click += new System.EventHandler(this.menuAddSocksServer_Click);
             // 
             // menuAddCustomServer
             // 
-            this.menuAddCustomServer.Name = "menuAddCustomServer";
             resources.ApplyResources(this.menuAddCustomServer, "menuAddCustomServer");
+            this.menuAddCustomServer.Name = "menuAddCustomServer";
             this.menuAddCustomServer.Click += new System.EventHandler(this.menuAddCustomServer_Click);
             // 
             // menuAddServers
             // 
-            this.menuAddServers.Name = "menuAddServers";
             resources.ApplyResources(this.menuAddServers, "menuAddServers");
+            this.menuAddServers.Name = "menuAddServers";
             this.menuAddServers.Click += new System.EventHandler(this.menuAddServers_Click);
             // 
             // menuScanScreen
             // 
-            this.menuScanScreen.Name = "menuScanScreen";
             resources.ApplyResources(this.menuScanScreen, "menuScanScreen");
+            this.menuScanScreen.Name = "menuScanScreen";
             this.menuScanScreen.Click += new System.EventHandler(this.menuScanScreen_Click);
             // 
             // toolStripSeparator1
             // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
             resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
             // 
             // menuRemoveServer
             // 
-            this.menuRemoveServer.Name = "menuRemoveServer";
             resources.ApplyResources(this.menuRemoveServer, "menuRemoveServer");
+            this.menuRemoveServer.Name = "menuRemoveServer";
             this.menuRemoveServer.Click += new System.EventHandler(this.menuRemoveServer_Click);
             // 
             // menuRemoveDuplicateServer
             // 
-            this.menuRemoveDuplicateServer.Name = "menuRemoveDuplicateServer";
             resources.ApplyResources(this.menuRemoveDuplicateServer, "menuRemoveDuplicateServer");
+            this.menuRemoveDuplicateServer.Name = "menuRemoveDuplicateServer";
             this.menuRemoveDuplicateServer.Click += new System.EventHandler(this.menuRemoveDuplicateServer_Click);
             // 
             // menuCopyServer
             // 
-            this.menuCopyServer.Name = "menuCopyServer";
             resources.ApplyResources(this.menuCopyServer, "menuCopyServer");
+            this.menuCopyServer.Name = "menuCopyServer";
             this.menuCopyServer.Click += new System.EventHandler(this.menuCopyServer_Click);
             // 
             // menuSetDefaultServer
             // 
-            this.menuSetDefaultServer.Name = "menuSetDefaultServer";
             resources.ApplyResources(this.menuSetDefaultServer, "menuSetDefaultServer");
+            this.menuSetDefaultServer.Name = "menuSetDefaultServer";
             this.menuSetDefaultServer.Click += new System.EventHandler(this.menuSetDefaultServer_Click);
             // 
             // toolStripSeparator3
             // 
-            this.toolStripSeparator3.Name = "toolStripSeparator3";
             resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
+            this.toolStripSeparator3.Name = "toolStripSeparator3";
             // 
             // menuMoveTop
             // 
-            this.menuMoveTop.Name = "menuMoveTop";
             resources.ApplyResources(this.menuMoveTop, "menuMoveTop");
+            this.menuMoveTop.Name = "menuMoveTop";
             this.menuMoveTop.Click += new System.EventHandler(this.menuMoveTop_Click);
             // 
             // menuMoveUp
             // 
-            this.menuMoveUp.Name = "menuMoveUp";
             resources.ApplyResources(this.menuMoveUp, "menuMoveUp");
+            this.menuMoveUp.Name = "menuMoveUp";
             this.menuMoveUp.Click += new System.EventHandler(this.menuMoveUp_Click);
             // 
             // menuMoveDown
             // 
-            this.menuMoveDown.Name = "menuMoveDown";
             resources.ApplyResources(this.menuMoveDown, "menuMoveDown");
+            this.menuMoveDown.Name = "menuMoveDown";
             this.menuMoveDown.Click += new System.EventHandler(this.menuMoveDown_Click);
             // 
             // menuMoveBottom
             // 
-            this.menuMoveBottom.Name = "menuMoveBottom";
             resources.ApplyResources(this.menuMoveBottom, "menuMoveBottom");
+            this.menuMoveBottom.Name = "menuMoveBottom";
             this.menuMoveBottom.Click += new System.EventHandler(this.menuMoveBottom_Click);
             // 
             // menuSelectAll
             // 
-            this.menuSelectAll.Name = "menuSelectAll";
             resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
+            this.menuSelectAll.Name = "menuSelectAll";
             this.menuSelectAll.Click += new System.EventHandler(this.menuSelectAll_Click);
             // 
             // toolStripSeparator9
             // 
-            this.toolStripSeparator9.Name = "toolStripSeparator9";
             resources.ApplyResources(this.toolStripSeparator9, "toolStripSeparator9");
+            this.toolStripSeparator9.Name = "toolStripSeparator9";
             // 
             // menuPingServer
             // 
-            this.menuPingServer.Name = "menuPingServer";
             resources.ApplyResources(this.menuPingServer, "menuPingServer");
+            this.menuPingServer.Name = "menuPingServer";
             this.menuPingServer.Click += new System.EventHandler(this.menuPingServer_Click);
             // 
             // menuTcpingServer
             // 
-            this.menuTcpingServer.Name = "menuTcpingServer";
             resources.ApplyResources(this.menuTcpingServer, "menuTcpingServer");
+            this.menuTcpingServer.Name = "menuTcpingServer";
             this.menuTcpingServer.Click += new System.EventHandler(this.menuTcpingServer_Click);
             // 
             // menuRealPingServer
             // 
-            this.menuRealPingServer.Name = "menuRealPingServer";
             resources.ApplyResources(this.menuRealPingServer, "menuRealPingServer");
+            this.menuRealPingServer.Name = "menuRealPingServer";
             this.menuRealPingServer.Click += new System.EventHandler(this.menuRealPingServer_Click);
             // 
             // menuSpeedServer
             // 
-            this.menuSpeedServer.Name = "menuSpeedServer";
             resources.ApplyResources(this.menuSpeedServer, "menuSpeedServer");
+            this.menuSpeedServer.Name = "menuSpeedServer";
             this.menuSpeedServer.Click += new System.EventHandler(this.menuSpeedServer_Click);
             // 
             // tsbTestMe
             // 
-            this.tsbTestMe.Name = "tsbTestMe";
             resources.ApplyResources(this.tsbTestMe, "tsbTestMe");
+            this.tsbTestMe.Name = "tsbTestMe";
             this.tsbTestMe.Click += new System.EventHandler(this.tsbTestMe_Click);
             // 
             // toolStripSeparator6
             // 
-            this.toolStripSeparator6.Name = "toolStripSeparator6";
             resources.ApplyResources(this.toolStripSeparator6, "toolStripSeparator6");
+            this.toolStripSeparator6.Name = "toolStripSeparator6";
             // 
             // menuExport2ClientConfig
             // 
-            this.menuExport2ClientConfig.Name = "menuExport2ClientConfig";
             resources.ApplyResources(this.menuExport2ClientConfig, "menuExport2ClientConfig");
+            this.menuExport2ClientConfig.Name = "menuExport2ClientConfig";
             this.menuExport2ClientConfig.Click += new System.EventHandler(this.menuExport2ClientConfig_Click);
             // 
             // menuExport2ServerConfig
             // 
-            this.menuExport2ServerConfig.Name = "menuExport2ServerConfig";
             resources.ApplyResources(this.menuExport2ServerConfig, "menuExport2ServerConfig");
+            this.menuExport2ServerConfig.Name = "menuExport2ServerConfig";
             this.menuExport2ServerConfig.Click += new System.EventHandler(this.menuExport2ServerConfig_Click);
             // 
             // menuExport2ShareUrl
             // 
-            this.menuExport2ShareUrl.Name = "menuExport2ShareUrl";
             resources.ApplyResources(this.menuExport2ShareUrl, "menuExport2ShareUrl");
+            this.menuExport2ShareUrl.Name = "menuExport2ShareUrl";
             this.menuExport2ShareUrl.Click += new System.EventHandler(this.menuExport2ShareUrl_Click);
             // 
             // menuExport2SubContent
             // 
-            this.menuExport2SubContent.Name = "menuExport2SubContent";
             resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent");
+            this.menuExport2SubContent.Name = "menuExport2SubContent";
             this.menuExport2SubContent.Click += new System.EventHandler(this.menuExport2SubContent_Click);
             // 
-            // tsbServer
-            // 
-            this.tsbServer.DropDown = this.cmsLv;
-            this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
-            resources.ApplyResources(this.tsbServer, "tsbServer");
-            this.tsbServer.Name = "tsbServer";
-            // 
             // qrCodeControl
             // 
             resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
             this.qrCodeControl.Name = "qrCodeControl";
             // 
+            // tsbServer
+            // 
+            resources.ApplyResources(this.tsbServer, "tsbServer");
+            this.tsbServer.DropDown = this.cmsLv;
+            this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
+            this.tsbServer.Name = "tsbServer";
+            // 
             // notifyMain
             // 
-            this.notifyMain.ContextMenuStrip = this.cmsMain;
             resources.ApplyResources(this.notifyMain, "notifyMain");
+            this.notifyMain.ContextMenuStrip = this.cmsMain;
             this.notifyMain.MouseClick += new System.Windows.Forms.MouseEventHandler(this.notifyMain_MouseClick);
             // 
             // cmsMain
             // 
-            this.cmsMain.ImageScalingSize = new System.Drawing.Size(20, 20);
             resources.ApplyResources(this.cmsMain, "cmsMain");
+            this.cmsMain.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.cmsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuSysAgentMode,
             this.menuServers,
@@ -409,6 +419,7 @@
             // 
             // menuSysAgentMode
             // 
+            resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode");
             this.menuSysAgentMode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuNotEnabledHttp,
             this.menuGlobal,
@@ -418,88 +429,87 @@
             this.menuKeepNothing,
             this.menuKeepPACNothing});
             this.menuSysAgentMode.Name = "menuSysAgentMode";
-            resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode");
             // 
             // menuNotEnabledHttp
             // 
-            this.menuNotEnabledHttp.Name = "menuNotEnabledHttp";
             resources.ApplyResources(this.menuNotEnabledHttp, "menuNotEnabledHttp");
+            this.menuNotEnabledHttp.Name = "menuNotEnabledHttp";
             this.menuNotEnabledHttp.Click += new System.EventHandler(this.menuNotEnabledHttp_Click);
             // 
             // menuGlobal
             // 
-            this.menuGlobal.Name = "menuGlobal";
             resources.ApplyResources(this.menuGlobal, "menuGlobal");
+            this.menuGlobal.Name = "menuGlobal";
             this.menuGlobal.Click += new System.EventHandler(this.menuGlobal_Click);
             // 
             // menuGlobalPAC
             // 
-            this.menuGlobalPAC.Name = "menuGlobalPAC";
             resources.ApplyResources(this.menuGlobalPAC, "menuGlobalPAC");
+            this.menuGlobalPAC.Name = "menuGlobalPAC";
             this.menuGlobalPAC.Click += new System.EventHandler(this.menuGlobalPAC_Click);
             // 
             // menuKeep
             // 
-            this.menuKeep.Name = "menuKeep";
             resources.ApplyResources(this.menuKeep, "menuKeep");
+            this.menuKeep.Name = "menuKeep";
             this.menuKeep.Click += new System.EventHandler(this.menuKeep_Click);
             // 
             // menuKeepPAC
             // 
-            this.menuKeepPAC.Name = "menuKeepPAC";
             resources.ApplyResources(this.menuKeepPAC, "menuKeepPAC");
+            this.menuKeepPAC.Name = "menuKeepPAC";
             this.menuKeepPAC.Click += new System.EventHandler(this.menuKeepPAC_Click);
             // 
             // menuKeepNothing
             // 
-            this.menuKeepNothing.Name = "menuKeepNothing";
             resources.ApplyResources(this.menuKeepNothing, "menuKeepNothing");
+            this.menuKeepNothing.Name = "menuKeepNothing";
             this.menuKeepNothing.Click += new System.EventHandler(this.menuKeepNothing_Click);
             // 
             // menuKeepPACNothing
             // 
-            this.menuKeepPACNothing.Name = "menuKeepPACNothing";
             resources.ApplyResources(this.menuKeepPACNothing, "menuKeepPACNothing");
+            this.menuKeepPACNothing.Name = "menuKeepPACNothing";
             this.menuKeepPACNothing.Click += new System.EventHandler(this.menuKeepPACNothing_Click);
             // 
             // menuServers
             // 
-            this.menuServers.Name = "menuServers";
             resources.ApplyResources(this.menuServers, "menuServers");
+            this.menuServers.Name = "menuServers";
             // 
             // menuAddServers2
             // 
-            this.menuAddServers2.Name = "menuAddServers2";
             resources.ApplyResources(this.menuAddServers2, "menuAddServers2");
+            this.menuAddServers2.Name = "menuAddServers2";
             this.menuAddServers2.Click += new System.EventHandler(this.menuAddServers_Click);
             // 
             // menuScanScreen2
             // 
-            this.menuScanScreen2.Name = "menuScanScreen2";
             resources.ApplyResources(this.menuScanScreen2, "menuScanScreen2");
+            this.menuScanScreen2.Name = "menuScanScreen2";
             this.menuScanScreen2.Click += new System.EventHandler(this.menuScanScreen_Click);
             // 
             // menuCopyPACUrl
             // 
-            this.menuCopyPACUrl.Name = "menuCopyPACUrl";
             resources.ApplyResources(this.menuCopyPACUrl, "menuCopyPACUrl");
+            this.menuCopyPACUrl.Name = "menuCopyPACUrl";
             this.menuCopyPACUrl.Click += new System.EventHandler(this.menuCopyPACUrl_Click);
             // 
             // menuUpdateSubscriptions
             // 
-            this.menuUpdateSubscriptions.Name = "menuUpdateSubscriptions";
             resources.ApplyResources(this.menuUpdateSubscriptions, "menuUpdateSubscriptions");
+            this.menuUpdateSubscriptions.Name = "menuUpdateSubscriptions";
             this.menuUpdateSubscriptions.Click += new System.EventHandler(this.menuUpdateSubscriptions_Click);
             // 
             // toolStripSeparator2
             // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
             resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
             // 
             // menuExit
             // 
-            this.menuExit.Name = "menuExit";
             resources.ApplyResources(this.menuExit, "menuExit");
+            this.menuExit.Name = "menuExit";
             this.menuExit.Click += new System.EventHandler(this.menuExit_Click);
             // 
             // bgwScan
@@ -510,30 +520,31 @@
             // 
             // groupBox1
             // 
-            this.groupBox1.Controls.Add(this.scMain);
             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);
-            resources.ApplyResources(this.groupBox2, "groupBox2");
             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;
-            resources.ApplyResources(this.txtMsgBox, "txtMsgBox");
             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.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolSslSocksPortLab,
             this.toolSslSocksPort,
@@ -546,7 +557,6 @@
             this.toolSslBlank3,
             this.toolSslServerSpeed,
             this.toolSslBlank4});
-            resources.ApplyResources(this.ssMain, "ssMain");
             this.ssMain.Name = "ssMain";
             this.ssMain.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.ssMain_ItemClicked);
             // 
@@ -557,8 +567,8 @@
             // 
             // toolSslSocksPort
             // 
-            this.toolSslSocksPort.Name = "toolSslSocksPort";
             resources.ApplyResources(this.toolSslSocksPort, "toolSslSocksPort");
+            this.toolSslSocksPort.Name = "toolSslSocksPort";
             // 
             // toolSslBlank1
             // 
@@ -573,8 +583,8 @@
             // 
             // toolSslHttpPort
             // 
-            this.toolSslHttpPort.Name = "toolSslHttpPort";
             resources.ApplyResources(this.toolSslHttpPort, "toolSslHttpPort");
+            this.toolSslHttpPort.Name = "toolSslHttpPort";
             // 
             // toolSslBlank2
             // 
@@ -589,8 +599,8 @@
             // 
             // toolSslPacPort
             // 
-            this.toolSslPacPort.Name = "toolSslPacPort";
             resources.ApplyResources(this.toolSslPacPort, "toolSslPacPort");
+            this.toolSslPacPort.Name = "toolSslPacPort";
             // 
             // toolSslBlank3
             // 
@@ -606,8 +616,8 @@
             // 
             // toolSslBlank4
             // 
-            this.toolSslBlank4.Name = "toolSslBlank4";
             resources.ApplyResources(this.toolSslBlank4, "toolSslBlank4");
+            this.toolSslBlank4.Name = "toolSslBlank4";
             // 
             // panel1
             // 
@@ -616,6 +626,7 @@
             // 
             // tsMain
             // 
+            resources.ApplyResources(this.tsMain, "tsMain");
             this.tsMain.ImageScalingSize = new System.Drawing.Size(32, 32);
             this.tsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbServer,
@@ -633,61 +644,60 @@
             this.tsbPromotion,
             this.toolStripSeparator11,
             this.tsbClose});
-            resources.ApplyResources(this.tsMain, "tsMain");
             this.tsMain.Name = "tsMain";
             this.tsMain.TabStop = true;
             // 
             // toolStripSeparator4
             // 
-            this.toolStripSeparator4.Name = "toolStripSeparator4";
             resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4");
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
             // 
             // tsbSub
             // 
+            resources.ApplyResources(this.tsbSub, "tsbSub");
             this.tsbSub.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbSubSetting,
             this.tsbSubUpdate});
             this.tsbSub.Image = global::v2rayN.Properties.Resources.sub;
-            resources.ApplyResources(this.tsbSub, "tsbSub");
             this.tsbSub.Name = "tsbSub";
             // 
             // tsbSubSetting
             // 
-            this.tsbSubSetting.Name = "tsbSubSetting";
             resources.ApplyResources(this.tsbSubSetting, "tsbSubSetting");
+            this.tsbSubSetting.Name = "tsbSubSetting";
             this.tsbSubSetting.Click += new System.EventHandler(this.tsbSubSetting_Click);
             // 
             // tsbSubUpdate
             // 
-            this.tsbSubUpdate.Name = "tsbSubUpdate";
             resources.ApplyResources(this.tsbSubUpdate, "tsbSubUpdate");
+            this.tsbSubUpdate.Name = "tsbSubUpdate";
             this.tsbSubUpdate.Click += new System.EventHandler(this.tsbSubUpdate_Click);
             // 
             // tsbQRCodeSwitch
             // 
+            resources.ApplyResources(this.tsbQRCodeSwitch, "tsbQRCodeSwitch");
             this.tsbQRCodeSwitch.CheckOnClick = true;
             this.tsbQRCodeSwitch.ForeColor = System.Drawing.Color.Black;
             this.tsbQRCodeSwitch.Image = global::v2rayN.Properties.Resources.share;
-            resources.ApplyResources(this.tsbQRCodeSwitch, "tsbQRCodeSwitch");
             this.tsbQRCodeSwitch.Name = "tsbQRCodeSwitch";
             this.tsbQRCodeSwitch.CheckedChanged += new System.EventHandler(this.tsbQRCodeSwitch_CheckedChanged);
             // 
             // toolStripSeparator8
             // 
-            this.toolStripSeparator8.Name = "toolStripSeparator8";
             resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8");
+            this.toolStripSeparator8.Name = "toolStripSeparator8";
             // 
             // tsbOptionSetting
             // 
-            this.tsbOptionSetting.Image = global::v2rayN.Properties.Resources.option;
             resources.ApplyResources(this.tsbOptionSetting, "tsbOptionSetting");
+            this.tsbOptionSetting.Image = global::v2rayN.Properties.Resources.option;
             this.tsbOptionSetting.Name = "tsbOptionSetting";
             this.tsbOptionSetting.Click += new System.EventHandler(this.tsbOptionSetting_Click);
             // 
             // toolStripSeparator5
             // 
-            this.toolStripSeparator5.Name = "toolStripSeparator5";
             resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5");
+            this.toolStripSeparator5.Name = "toolStripSeparator5";
             // 
             // tsbReload
             // 
@@ -697,11 +707,12 @@
             // 
             // toolStripSeparator7
             // 
-            this.toolStripSeparator7.Name = "toolStripSeparator7";
             resources.ApplyResources(this.toolStripSeparator7, "toolStripSeparator7");
+            this.toolStripSeparator7.Name = "toolStripSeparator7";
             // 
             // tsbCheckUpdate
             // 
+            resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate");
             this.tsbCheckUpdate.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbCheckUpdateN,
             this.tsbCheckUpdateCore,
@@ -709,45 +720,45 @@
             this.toolStripSeparator13,
             this.tsbCheckClearPACList});
             this.tsbCheckUpdate.Image = global::v2rayN.Properties.Resources.checkupdate;
-            resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate");
             this.tsbCheckUpdate.Name = "tsbCheckUpdate";
             // 
             // tsbCheckUpdateN
             // 
-            this.tsbCheckUpdateN.Name = "tsbCheckUpdateN";
             resources.ApplyResources(this.tsbCheckUpdateN, "tsbCheckUpdateN");
+            this.tsbCheckUpdateN.Name = "tsbCheckUpdateN";
             this.tsbCheckUpdateN.Click += new System.EventHandler(this.tsbCheckUpdateN_Click);
             // 
             // tsbCheckUpdateCore
             // 
-            this.tsbCheckUpdateCore.Name = "tsbCheckUpdateCore";
             resources.ApplyResources(this.tsbCheckUpdateCore, "tsbCheckUpdateCore");
+            this.tsbCheckUpdateCore.Name = "tsbCheckUpdateCore";
             this.tsbCheckUpdateCore.Click += new System.EventHandler(this.tsbCheckUpdateCore_Click);
             // 
             // tsbCheckUpdatePACList
             // 
-            this.tsbCheckUpdatePACList.Name = "tsbCheckUpdatePACList";
             resources.ApplyResources(this.tsbCheckUpdatePACList, "tsbCheckUpdatePACList");
+            this.tsbCheckUpdatePACList.Name = "tsbCheckUpdatePACList";
             this.tsbCheckUpdatePACList.Click += new System.EventHandler(this.tsbCheckUpdatePACList_Click);
             // 
             // toolStripSeparator13
             // 
-            this.toolStripSeparator13.Name = "toolStripSeparator13";
             resources.ApplyResources(this.toolStripSeparator13, "toolStripSeparator13");
+            this.toolStripSeparator13.Name = "toolStripSeparator13";
             // 
             // tsbCheckClearPACList
             // 
-            this.tsbCheckClearPACList.Name = "tsbCheckClearPACList";
             resources.ApplyResources(this.tsbCheckClearPACList, "tsbCheckClearPACList");
+            this.tsbCheckClearPACList.Name = "tsbCheckClearPACList";
             this.tsbCheckClearPACList.Click += new System.EventHandler(this.tsbCheckClearPACList_Click);
             // 
             // toolStripSeparator10
             // 
-            this.toolStripSeparator10.Name = "toolStripSeparator10";
             resources.ApplyResources(this.toolStripSeparator10, "toolStripSeparator10");
+            this.toolStripSeparator10.Name = "toolStripSeparator10";
             // 
             // tsbHelp
             // 
+            resources.ApplyResources(this.tsbHelp, "tsbHelp");
             this.tsbHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbAbout,
             this.tsbV2rayWebsite,
@@ -755,50 +766,49 @@
             this.tsbLanguageDef,
             this.tsbLanguageZhHans});
             this.tsbHelp.Image = global::v2rayN.Properties.Resources.help;
-            resources.ApplyResources(this.tsbHelp, "tsbHelp");
             this.tsbHelp.Name = "tsbHelp";
             // 
             // tsbAbout
             // 
-            this.tsbAbout.Name = "tsbAbout";
             resources.ApplyResources(this.tsbAbout, "tsbAbout");
+            this.tsbAbout.Name = "tsbAbout";
             this.tsbAbout.Click += new System.EventHandler(this.tsbAbout_Click);
             // 
             // tsbV2rayWebsite
             // 
-            this.tsbV2rayWebsite.Name = "tsbV2rayWebsite";
             resources.ApplyResources(this.tsbV2rayWebsite, "tsbV2rayWebsite");
+            this.tsbV2rayWebsite.Name = "tsbV2rayWebsite";
             this.tsbV2rayWebsite.Click += new System.EventHandler(this.tsbV2rayWebsite_Click);
             // 
             // toolStripSeparator12
             // 
-            this.toolStripSeparator12.Name = "toolStripSeparator12";
             resources.ApplyResources(this.toolStripSeparator12, "toolStripSeparator12");
+            this.toolStripSeparator12.Name = "toolStripSeparator12";
             // 
             // tsbLanguageDef
             // 
-            this.tsbLanguageDef.Name = "tsbLanguageDef";
             resources.ApplyResources(this.tsbLanguageDef, "tsbLanguageDef");
+            this.tsbLanguageDef.Name = "tsbLanguageDef";
             this.tsbLanguageDef.Click += new System.EventHandler(this.tsbLanguageDef_Click);
             // 
             // tsbLanguageZhHans
             // 
-            this.tsbLanguageZhHans.Name = "tsbLanguageZhHans";
             resources.ApplyResources(this.tsbLanguageZhHans, "tsbLanguageZhHans");
+            this.tsbLanguageZhHans.Name = "tsbLanguageZhHans";
             this.tsbLanguageZhHans.Click += new System.EventHandler(this.tsbLanguageZhHans_Click);
             // 
             // tsbPromotion
             // 
+            resources.ApplyResources(this.tsbPromotion, "tsbPromotion");
             this.tsbPromotion.ForeColor = System.Drawing.Color.Black;
             this.tsbPromotion.Image = global::v2rayN.Properties.Resources.promotion;
-            resources.ApplyResources(this.tsbPromotion, "tsbPromotion");
             this.tsbPromotion.Name = "tsbPromotion";
             this.tsbPromotion.Click += new System.EventHandler(this.tsbPromotion_Click);
             // 
             // toolStripSeparator11
             // 
-            this.toolStripSeparator11.Name = "toolStripSeparator11";
             resources.ApplyResources(this.toolStripSeparator11, "toolStripSeparator11");
+            this.toolStripSeparator11.Name = "toolStripSeparator11";
             // 
             // tsbClose
             // 
@@ -936,6 +946,7 @@
         private System.Windows.Forms.ToolStripMenuItem tsbTestMe;
         private System.Windows.Forms.ToolStripButton tsbReload;
         private System.Windows.Forms.ToolStripButton tsbQRCodeSwitch;
+        private System.Windows.Forms.ToolStripMenuItem menuAddVlessServer;
     }
 }
 

v2rayN/v2rayN/Forms/MainForm.cs

@@ -404,7 +404,7 @@ namespace v2rayN.Forms
             {
                 return;
             }
-            
+
         }
         #endregion
 
@@ -513,6 +513,19 @@ namespace v2rayN.Forms
                     LoadV2ray();
                 }
             }
+            else if (config.vmess[index].configType == (int)EConfigType.VLESS)
+            {
+                AddServer5Form fm = new AddServer5Form
+                {
+                    EditIndex = index
+                };
+                if (fm.ShowDialog() == DialogResult.OK)
+                {
+                    //刷新
+                    RefreshServers();
+                    LoadV2ray();
+                }
+            }
             else
             {
                 AddServer2Form fm2 = new AddServer2Form
@@ -600,6 +613,20 @@ namespace v2rayN.Forms
             }
         }
 
+        private void menuAddVlessServer_Click(object sender, EventArgs e)
+        {
+            var fm = new AddServer5Form
+            {
+                EditIndex = -1
+            };
+            if (fm.ShowDialog() == DialogResult.OK)
+            {
+                //刷新
+                RefreshServers();
+                LoadV2ray();
+            }
+        }
+
         private void menuRemoveServer_Click(object sender, EventArgs e)
         {
 
@@ -1298,7 +1325,16 @@ namespace v2rayN.Forms
                         try
                         {
                             string fileName = Utils.GetPath(downloadHandle.DownloadFileName);
-                            Process process = Process.Start("v2rayUpgrade.exe", "\"" + fileName + "\"");
+                            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);
@@ -1595,5 +1631,6 @@ namespace v2rayN.Forms
 
         #endregion
 
+      
     }
 }

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

@@ -124,6 +124,12 @@
   <data name="menuAddVmessServer.Text" xml:space="preserve">
     <value>添加[VMess]服务器</value>
   </data>
+  <data name="menuAddVlessServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 22</value>
+  </data>
+  <data name="menuAddVlessServer.Text" xml:space="preserve">
+    <value>添加[VLESS]服务器</value>
+  </data>
   <data name="menuAddShadowsocksServer.Size" type="System.Drawing.Size, System.Drawing">
     <value>300, 22</value>
   </data>
@@ -241,6 +247,12 @@
   <data name="menuSpeedServer.Text" xml:space="preserve">
     <value>测试服务器速度(多选) (Ctrl+T)</value>
   </data>
+  <data name="tsbTestMe.Size" type="System.Drawing.Size, System.Drawing">
+    <value>300, 22</value>
+  </data>
+  <data name="tsbTestMe.Text" xml:space="preserve">
+    <value>测试当前服务状态</value>
+  </data>
   <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing">
     <value>297, 6</value>
   </data>
@@ -275,7 +287,7 @@
     <value>  服务器  </value>
   </data>
   <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
-    <value>301, 534</value>
+    <value>301, 600</value>
   </data>
   <data name="lvServers.Items" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
@@ -294,6 +306,15 @@
         ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw==
 </value>
   </data>
+  <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>196, 164</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>Http代理</value>
+  </data>
   <data name="menuNotEnabledHttp.Size" type="System.Drawing.Size, System.Drawing">
     <value>316, 22</value>
   </data>
@@ -336,12 +357,6 @@
   <data name="menuKeepPACNothing.Text" xml:space="preserve">
     <value>仅开启PAC,不改变系统代理</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>Http代理</value>
-  </data>
   <data name="menuServers.Size" type="System.Drawing.Size, System.Drawing">
     <value>195, 22</value>
   </data>
@@ -381,17 +396,80 @@
   <data name="menuExit.Text" xml:space="preserve">
     <value>退出</value>
   </data>
-  <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>196, 164</value>
-  </data>
   <data name="groupBox1.Text" xml:space="preserve">
     <value>服务器列表</value>
   </data>
+  <data name="groupBox2.Text" xml:space="preserve">
+    <value>信息</value>
+  </data>
   <data name="toolSslServerSpeed.Text" xml:space="preserve">
     <value>网速显示未启用</value>
   </data>
-  <data name="groupBox2.Text" xml:space="preserve">
+  <data name="tsbSub.Size" type="System.Drawing.Size, System.Drawing">
-    <value>信息</value>
+    <value>61, 53</value>
+  </data>
+  <data name="tsbSub.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>76, 53</value>
+  </data>
+  <data name="tsbOptionSetting.Text" xml:space="preserve">
+    <value>  参数设置  </value>
+  </data>
+  <data name="tsbReload.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAE3SURBVFhH7ZaBDQIhDEVvBEdwBDfQDXQER3AD3cARdAPd
+        QDfSDbQvuSb1AicFjJrwkxcN0FIolOuamv5VE2E+gLaPayWchEcE+hhTXVPhIoQmDcFYbKpoJtwEdX4X
+        jgIrXfTwnzb6dBw22BaJVdjJmWQs1/SdBRtE0U5cBXW2oSFRO0HtSEeW2FZ1wsq9sjuRdTDVAXnNuWLY
+        6JnAl0sYa/Q5q1dhq35ci+Bkq2HJvbZpxGeybAAuw4Fq+cnW1wPITgHFYxvBUw+qHEIL1yq1vDKhVlH3
+        NQwF4JkcFRWiUAB7IVW2FFPO3YqlgPd+LJf02e8Fdi3rMdIAcLDuf9UpeT0IS0G/hvhPm305vSl7EQFY
+        B6zCvozvYGzRM8zEoeg5TPZwDaGvpHQni1yzSxbXPW9q+hF13ROHuJnQcjbhtQAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="tsbReload.Size" type="System.Drawing.Size, System.Drawing">
+    <value>76, 53</value>
+  </data>
+  <data name="tsbReload.Text" xml:space="preserve">
+    <value>  重启服务  </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="tsbHelp.Size" type="System.Drawing.Size, System.Drawing">
+    <value>69, 53</value>
+  </data>
+  <data name="tsbHelp.Text" xml:space="preserve">
+    <value>   帮助   </value>
+  </data>
+  <data name="tsbPromotion.Size" type="System.Drawing.Size, System.Drawing">
+    <value>68, 53</value>
+  </data>
+  <data name="tsbPromotion.Text" xml:space="preserve">
+    <value>    推广    </value>
+  </data>
+  <data name="tsbClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAySURBVFhH7c6xDQAgCEVBRnVTHU2ZABuMxV3yOvJDAAA/
+        GqfZVG6X8mg1dfUAAPBQxAZd0SJruVXHWwAAAABJRU5ErkJggg==
+</value>
+  </data>
+  <data name="tsbClose.Size" type="System.Drawing.Size, System.Drawing">
+    <value>76, 53</value>
+  </data>
+  <data name="tsbClose.Text" xml:space="preserve">
+    <value>  关闭窗口  </value>
   </data>
   <data name="tsbSubSetting.Size" type="System.Drawing.Size, System.Drawing">
     <value>124, 22</value>
@@ -405,47 +483,6 @@
   <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="tsbOptionSetting.Size" type="System.Drawing.Size, System.Drawing">
-    <value>76, 53</value>
-  </data>
-  <data name="tsbOptionSetting.Text" xml:space="preserve">
-    <value>  参数设置  </value>
-  </data>
-  <data name="tsbReload.Size" type="System.Drawing.Size, System.Drawing">
-    <value>148, 22</value>
-  </data>
-  <data name="tsbReload.Text" xml:space="preserve">
-    <value>  重启服务  </value>
-  </data>
-  <data name="tsbTestMe.Size" type="System.Drawing.Size, System.Drawing">
-    <value>148, 22</value>
-  </data>
-  <data name="tsbTestMe.Text" xml:space="preserve">
-    <value>测试当前服务状态</value>
-  </data>
-  <data name="tsbService.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAATdJREFUWEftloENAiEMRW8ER3AEN9ANdARHcAPdwBF0A91AN9INtC+5JvUCJwWM
-        mvCTFw3QUiiU65qa/lUTYT6Ato9rJZyERwT6GFNdU+EihCYNwVhsqmgm3AR1fheOAitd9PCfNvp0HDbY
-        FolV2MmZZCzX9J0FG0TRTlwFdbahIVE7Qe1IR5bYVnXCyr2yO5F1MNUBec25YtjomcCXSxhr9DmrV2Gr
-        flyL4GSrYcm9tmnEZ7JsAC7DgWr5ydbXA8hOAcVjG8FTD6ocQgvXKrW8MqFWUfc1DAXgmRwVFaJQAHsh
-        VbYUU87diqWA934sl/TZ7wV2Lesx0gBwsO5/1Sl5PQhLQb+G+E+bfTm9KXsRAVgHrMK+jO9gbNEzzMSh
-        6DlM9nANoa+kdCeLXLNLFtc9b2r6EXXdE4e4mdByNuG1AAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="tsbService.Size" type="System.Drawing.Size, System.Drawing">
-    <value>85, 53</value>
-  </data>
-  <data name="tsbService.Text" xml:space="preserve">
-    <value>  当前服务  </value>
-  </data>
   <data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing">
     <value>223, 22</value>
   </data>
@@ -473,44 +510,10 @@
   <data name="tsbCheckClearPACList.Text" xml:space="preserve">
     <value>简化PAC (请设置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>
   <data name="tsbV2rayWebsite.Text" xml:space="preserve">
     <value>V2Ray 官网</value>
   </data>
-  <data name="tsbHelp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>69, 53</value>
-  </data>
-  <data name="tsbHelp.Text" xml:space="preserve">
-    <value>   帮助   </value>
-  </data>
-  <data name="tsbPromotion.Size" type="System.Drawing.Size, System.Drawing">
-    <value>68, 53</value>
-  </data>
-  <data name="tsbPromotion.Text" xml:space="preserve">
-    <value>    推广    </value>
-  </data>
-  <data name="tsbClose.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wwAADsMBx2+oZAAAADJJREFUWEftzrENACAIRUFGdVMdTZkAG4zFXfI68kMAAD8ap9lUbpfyaDV19QAA
-        8FDEBl3RImu5VcdbAAAAAElFTkSuQmCC
-</value>
-  </data>
-  <data name="tsbClose.Size" type="System.Drawing.Size, System.Drawing">
-    <value>76, 53</value>
-  </data>
-  <data name="tsbClose.Text" xml:space="preserve">
-    <value>  关闭窗口  </value>
-  </data>
-  <data name="tsbQRCodeSwitch.Text" xml:space="preserve">
-    <value>  分享  </value>
-  </data>
 </root>

v2rayN/v2rayN/Forms/OptionSettingForm.cs

@@ -444,7 +444,7 @@ namespace v2rayN.Forms
 
         private void linkLabelRoutingDoc_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            System.Diagnostics.Process.Start("https://www.v2fly.org/chapter_02/03_routing.html");
+            System.Diagnostics.Process.Start("https://www.v2fly.org/config/routing.html");
         }
     }
 

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

@@ -128,7 +128,7 @@
     <value>222, 16</value>
   </data>
   <data name="chkdefAllowInsecure.Text" xml:space="preserve">
-    <value>底层传输安全选tls时，默认允许不安全连接(allowInsecure)</value>
+    <value>底层传输安全选tls时，默认跳过证书验证(allowInsecure)</value>
   </data>
   <data name="label16.Size" type="System.Drawing.Size, System.Drawing">
     <value>53, 12</value>

v2rayN/v2rayN/Global.cs

@@ -6,7 +6,7 @@ namespace v2rayN
         #region 常量
 
 
-        public const string v2rayWebsiteUrl = @"https://www.v2ray.com/";
+        public const string v2rayWebsiteUrl = @"https://www.v2fly.org/";
         public const string AboutUrl = @"https://github.com/cg3s/v2rayN";
         public const string UpdateUrl = AboutUrl + @"/releases";
 
@@ -100,7 +100,7 @@ namespace v2rayN
         public const string blockTag = "block";
 
         /// <summary>
-        /// 
+        ///
         /// </summary>
         public const string StreamSecurity = "tls";
 
@@ -116,14 +116,26 @@ namespace v2rayN
         /// </summary>
         public const string vmessProtocol = "vmess://";
         /// <summary>
+        /// vmess
+        /// </summary>
+        public const string vmessProtocolLite = "vmess";
+        /// <summary>
         /// shadowsocks
         /// </summary>
         public const string ssProtocol = "ss://";
         /// <summary>
+        /// shadowsocks
+        /// </summary>
+        public const string ssProtocolLite = "shadowsocks";
+        /// <summary>
         /// socks
         /// </summary>
         public const string socksProtocol = "socks://";
         /// <summary>
+        /// socks
+        /// </summary>
+        public const string socksProtocolLite = "socks";
+        /// <summary>
         /// http
         /// </summary>
         public const string httpProtocol = "http://";
@@ -131,6 +143,14 @@ namespace v2rayN
         /// https
         /// </summary>
         public const string httpsProtocol = "https://";
+        /// <summary>
+        /// vless
+        /// </summary>
+        public const string vlessProtocol = "vless://";
+        /// <summary>
+        /// vless
+        /// </summary>
+        public const string vlessProtocolLite = "vless";
 
         /// <summary>
         /// pac
@@ -211,7 +231,7 @@ namespace v2rayN
         }
 
         /// <summary>
-        ///  
+        ///
         /// </summary>
         public static int statePort
         {

v2rayN/v2rayN/Handler/ConfigHandler.cs

@@ -960,5 +960,56 @@ namespace v2rayN.Handler
             ToJsonFile(config);
             return 0;
         }
+
+        /// <summary>
+        /// 添加服务器或编辑
+        /// </summary>
+        /// <param name="config"></param>
+        /// <param name="vmessItem"></param>
+        /// <param name="index"></param>
+        /// <returns></returns>
+        public static int AddVlessServer(ref Config config, VmessItem vmessItem, int index)
+        {
+            vmessItem.configVersion = 2;
+            vmessItem.configType = (int)EConfigType.VLESS;
+
+            vmessItem.address = vmessItem.address.TrimEx();
+            vmessItem.id = vmessItem.id.TrimEx();
+            vmessItem.security = vmessItem.security.TrimEx();
+            vmessItem.network = vmessItem.network.TrimEx();
+            vmessItem.headerType = vmessItem.headerType.TrimEx();
+            vmessItem.requestHost = vmessItem.requestHost.TrimEx();
+            vmessItem.path = vmessItem.path.TrimEx();
+            vmessItem.streamSecurity = vmessItem.streamSecurity.TrimEx();
+
+            if (index >= 0)
+            {
+                //修改
+                config.vmess[index] = vmessItem;
+                if (config.index.Equals(index))
+                {
+                    Global.reloadV2ray = true;
+                }
+            }
+            else
+            {
+                //添加
+                if (Utils.IsNullOrEmpty(vmessItem.allowInsecure))
+                {
+                    vmessItem.allowInsecure = config.defAllowInsecure.ToString();
+                }
+                config.vmess.Add(vmessItem);
+                if (config.vmess.Count == 1)
+                {
+                    config.index = 0;
+                    Global.reloadV2ray = true;
+                }
+            }
+
+            ToJsonFile(config);
+
+            return 0;
+        }
+
     }
 }

v2rayN/v2rayN/Handler/DownloadHandle.cs

@@ -101,7 +101,7 @@ namespace v2rayN.Handler
                 string filePath = Utils.GetPath("V2ray.exe");
                 if (!File.Exists(filePath))
                 {
-                    string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2ray/v2ray-core/releases");
+                    string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2fly/v2ray-core/releases");
                     //ShowMsg(true, msg);
                     return "";
                 }
@@ -172,7 +172,7 @@ namespace v2rayN.Handler
 
         #endregion
 
-        #region Download 
+        #region Download
 
         public WebClientEx DownloadFileAsync(string url, WebProxy webProxy, int downloadTimeout)
         {
@@ -271,7 +271,7 @@ namespace v2rayN.Handler
 
         /// <summary>
         /// DownloadString
-        /// </summary> 
+        /// </summary>
         /// <param name="url"></param>
         public void WebDownloadString(string url)
         {

v2rayN/v2rayN/Handler/MainFormHandler.cs

@@ -72,7 +72,8 @@ namespace v2rayN.Handler
             {
                 return;
             }
-            if (config.vmess[index].configType != (int)EConfigType.Vmess)
+            if (config.vmess[index].configType != (int)EConfigType.Vmess
+                && config.vmess[index].configType != (int)EConfigType.VLESS)
             {
                 UI.Show(UIRes.I18N("NonVmessService"));
                 return;
@@ -112,7 +113,8 @@ namespace v2rayN.Handler
             {
                 return;
             }
-            if (config.vmess[index].configType != (int)EConfigType.Vmess)
+            if (config.vmess[index].configType != (int)EConfigType.Vmess
+                && config.vmess[index].configType != (int)EConfigType.VLESS)
             {
                 UI.Show(UIRes.I18N("NonVmessService"));
                 return;

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -190,7 +190,7 @@ namespace v2rayN.Handler
                 _updateFunc(testCounter, args.GetException().Message);
             };
 
-            var timeout = 12;
+            var timeout = 10;
             foreach (int itemIndex in _selecteds)
             {
                 if (itemIndex >= _config.vmess.Count)

v2rayN/v2rayN/Handler/V2rayConfigHandler.cs

@@ -1,8 +1,12 @@
 using System;
 using System.Collections.Generic;
+using System.Collections.Specialized;
 using System.IO;
 using System.Linq;
 using System.Net;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Web;
 using v2rayN.Base;
 using v2rayN.Mode;
 
@@ -366,7 +370,7 @@ namespace v2rayN.Handler
                     StreamSettings streamSettings = outbound.streamSettings;
                     boundStreamSettings(config, "out", ref streamSettings);
 
-                    outbound.protocol = "vmess";
+                    outbound.protocol = Global.vmessProtocolLite;
                     outbound.settings.servers = null;
                 }
                 else if (config.configType() == (int)EConfigType.Shadowsocks)
@@ -392,9 +396,9 @@ namespace v2rayN.Handler
 
                     outbound.mux.enabled = false;
                     outbound.mux.concurrency = -1;
-                    
 
-                    outbound.protocol = "shadowsocks";
+
+                    outbound.protocol = Global.ssProtocolLite;
                     outbound.settings.vnext = null;
                 }
                 else if (config.configType() == (int)EConfigType.Socks)
@@ -431,9 +435,52 @@ namespace v2rayN.Handler
                     outbound.mux.enabled = false;
                     outbound.mux.concurrency = -1;
 
-                    outbound.protocol = "socks";
+                    outbound.protocol = Global.socksProtocolLite;
                     outbound.settings.vnext = null;
                 }
+                else if (config.configType() == (int)EConfigType.VLESS)
+                {
+                    VnextItem vnextItem;
+                    if (outbound.settings.vnext.Count <= 0)
+                    {
+                        vnextItem = new VnextItem();
+                        outbound.settings.vnext.Add(vnextItem);
+                    }
+                    else
+                    {
+                        vnextItem = outbound.settings.vnext[0];
+                    }
+                    //远程服务器地址和端口
+                    vnextItem.address = config.address();
+                    vnextItem.port = config.port();
+
+                    UsersItem usersItem;
+                    if (vnextItem.users.Count <= 0)
+                    {
+                        usersItem = new UsersItem();
+                        vnextItem.users.Add(usersItem);
+                    }
+                    else
+                    {
+                        usersItem = vnextItem.users[0];
+                    }
+                    //远程服务器用户ID
+                    usersItem.id = config.id();
+                    usersItem.alterId = 0;
+                    usersItem.email = Global.userEMail;
+                    usersItem.encryption = config.security();
+
+                    //Mux
+                    outbound.mux.enabled = config.muxEnabled;
+                    outbound.mux.concurrency = config.muxEnabled ? 8 : -1;
+
+                    //远程服务器底层传输配置
+                    StreamSettings streamSettings = outbound.streamSettings;
+                    boundStreamSettings(config, "out", ref streamSettings);
+
+                    outbound.protocol = Global.vlessProtocolLite;
+                    outbound.settings.servers = null;
+                }
             }
             catch
             {
@@ -454,7 +501,7 @@ namespace v2rayN.Handler
             {
                 //远程服务器底层传输配置
                 streamSettings.network = config.network();
-                string host = config.requestHost();               
+                string host = config.requestHost();
                 //if tls
                 if (config.streamSecurity() == Global.StreamSecurity)
                 {
@@ -842,9 +889,21 @@ namespace v2rayN.Handler
 
                 //远程服务器用户ID
                 usersItem.id = config.id();
-                usersItem.alterId = config.alterId();
                 usersItem.email = Global.userEMail;
 
+                if (config.configType() == (int)EConfigType.Vmess)
+                {
+                    inbound.protocol = Global.vmessProtocolLite;
+                    usersItem.alterId = config.alterId();
+
+                }
+                else if (config.configType() == (int)EConfigType.VLESS)
+                {
+                    inbound.protocol = Global.vlessProtocolLite;
+                    usersItem.alterId = 0;
+                    inbound.settings.decryption = config.security();
+                }
+
                 //远程服务器底层传输配置
                 StreamSettings streamSettings = inbound.streamSettings;
                 boundStreamSettings(config, "in", ref streamSettings);
@@ -918,7 +977,7 @@ namespace v2rayN.Handler
                 Outbounds outbound = v2rayConfig.outbounds[0];
                 if (outbound == null
                     || Utils.IsNullOrEmpty(outbound.protocol)
-                    || outbound.protocol != "vmess"
+                    || outbound.protocol != Global.vmessProtocolLite
                     || outbound.settings == null
                     || outbound.settings.vnext == null
                     || outbound.settings.vnext.Count <= 0
@@ -1064,7 +1123,7 @@ namespace v2rayN.Handler
                 Inbounds inbound = v2rayConfig.inbounds[0];
                 if (inbound == null
                     || Utils.IsNullOrEmpty(inbound.protocol)
-                    || inbound.protocol != "vmess"
+                    || inbound.protocol != Global.vmessProtocolLite
                     || inbound.settings == null
                     || inbound.settings.clients == null
                     || inbound.settings.clients.Count <= 0)
@@ -1195,7 +1254,7 @@ namespace v2rayN.Handler
                     int indexSplit = result.IndexOf("?");
                     if (indexSplit > 0)
                     {
-                        vmessItem = ResolveVmess4Kitsunebi(result);
+                        vmessItem = ResolveStdVmess(result) ?? ResolveVmess4Kitsunebi(result);
                     }
                     else
                     {
@@ -1242,46 +1301,21 @@ namespace v2rayN.Handler
                 {
                     msg = UIRes.I18N("ConfigurationFormatIncorrect");
 
-                    vmessItem.configType = (int)EConfigType.Shadowsocks;
+                    vmessItem = ResolveSSLegacy(result);
-                    result = result.Substring(Global.ssProtocol.Length);
+                    if (vmessItem == null)
-                    //remark
-                    int indexRemark = result.IndexOf("#");
-                    if (indexRemark > 0)
                     {
-                        try
+                        vmessItem = ResolveSip002(result);
-                        {
-                            vmessItem.remarks = WebUtility.UrlDecode(result.Substring(indexRemark + 1, result.Length - indexRemark - 1));
-                        }
-                        catch { }
-                        result = result.Substring(0, indexRemark);
                     }
-                    //part decode
+                    if (vmessItem == null)
-                    int indexS = result.IndexOf("@");
-                    if (indexS > 0)
                     {
-                        result = Utils.Base64Decode(result.Substring(0, indexS)) + result.Substring(indexS, result.Length - indexS);
+                        return null;
                     }
-                    else
+                    if (vmessItem.address.Length == 0 || vmessItem.port == 0 || vmessItem.security.Length == 0 || vmessItem.id.Length == 0)
                     {
-                        result = Utils.Base64Decode(result);
+                        return null;
                     }
 
-                    string[] arr1 = result.Split('@');
+                    vmessItem.configType = (int)EConfigType.Shadowsocks;
-                    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];
                 }
                 else if (result.StartsWith(Global.socksProtocol))
                 {
@@ -1406,6 +1440,177 @@ 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 (!tag.IsNullOrEmpty())
+            {
+                server.remarks = HttpUtility.UrlDecode(tag, Encoding.UTF8);
+            }
+            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
+            {
+                configType = (int)EConfigType.Vmess,
+                security = "auto"
+            };
+
+            Uri u = new Uri(result);
+
+            i.address = u.IdnHost;
+            i.port = u.Port;
+            i.remarks = u.GetComponents(UriComponents.Fragment, UriFormat.Unescaped);
+            var q = HttpUtility.ParseQueryString(u.Query);
+
+            var m = StdVmessUserInfo.Match(u.UserInfo);
+            if (!m.Success) return null;
+
+            i.id = m.Groups["id"].Value;
+            if (!int.TryParse(m.Groups["alterId"].Value, out int aid))
+            {
+                return null;
+            }
+            i.alterId = aid;
+
+            if (m.Groups["streamSecurity"].Success)
+            {
+                i.streamSecurity = m.Groups["streamSecurity"].Value;
+            }
+            switch (i.streamSecurity)
+            {
+                case "tls":
+                    // TODO tls config
+                    break;
+                default:
+                    if (!string.IsNullOrWhiteSpace(i.streamSecurity))
+                        return null;
+                    break;
+            }
+
+            i.network = m.Groups["network"].Value;
+            switch (i.network)
+            {
+                case "tcp":
+                    string t1 = q["type"] ?? "none";
+                    i.headerType = t1;
+                    // TODO http option
+
+                    break;
+                case "kcp":
+                    i.headerType = q["type"] ?? "none";
+                    // TODO kcp seed
+                    break;
+
+                case "ws":
+                    string p1 = q["path"] ?? "/";
+                    string h1 = q["host"] ?? "";
+                    i.requestHost = h1;
+                    i.path = p1;
+                    break;
+
+                case "http":
+                    i.network = "h2";
+                    string p2 = q["path"] ?? "/";
+                    string h2 = q["host"] ?? "";
+                    i.requestHost = h2;
+                    i.path = p2;
+                    break;
+
+                case "quic":
+                    string s = q["security"] ?? "none";
+                    string k = q["key"] ?? "";
+                    string t3 = q["type"] ?? "none";
+                    i.headerType = t3;
+                    i.requestHost = s;
+                    i.path = k;
+                    break;
+
+                default:
+                    return null;
+            }
+
+            return i;
+        }
         #endregion
 
         #region Gen speedtest config
@@ -1427,7 +1632,7 @@ namespace v2rayN.Handler
 
                 msg = UIRes.I18N("InitialConfiguration");
 
-                Config configCopy = Utils.DeepCopy(config);             
+                Config configCopy = Utils.DeepCopy(config);
 
                 string result = Utils.GetEmbedText(SampleClient);
                 if (Utils.IsNullOrEmpty(result))

v2rayN/v2rayN/Handler/V2rayHandler.cs

@@ -174,7 +174,7 @@ namespace v2rayN.Handler
             }
             if (Utils.IsNullOrEmpty(fileName))
             {
-                string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2ray/v2ray-core/releases");
+                string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2fly/v2ray-core/releases");
                 ShowMsg(false, msg);
             }
             return fileName;

v2rayN/v2rayN/Mode/Config.cs

@@ -422,6 +422,10 @@ namespace v2rayN.Mode
             {
                 summary += string.Format("{0}({1}:{2})", remarks, addr, port);
             }
+            if (configType == (int)EConfigType.VLESS)
+            {
+                summary += string.Format("{0}({1}:{2})", remarks, addr, port);
+            }
             else
             {
                 summary += string.Format("{0}", remarks);

v2rayN/v2rayN/Mode/EConfigType.cs

@@ -6,6 +6,7 @@ namespace v2rayN.Mode
         Vmess = 1,
         Custom = 2,
         Shadowsocks = 3,
-        Socks = 4
+        Socks = 4,
+        VLESS = 5
     }
 }

v2rayN/v2rayN/Mode/V2rayConfig.cs

@@ -132,6 +132,13 @@ namespace v2rayN.Mode
         /// 
         /// </summary>
         public List<UsersItem> clients { get; set; }
+
+        
+        /// <summary>
+        /// VLESS
+        /// </summary>
+        public string decryption { get; set; }
+        
     }
 
     public class UsersItem
@@ -152,6 +159,11 @@ namespace v2rayN.Mode
         /// 
         /// </summary>
         public string security { get; set; }
+
+        /// <summary>
+        /// VLESS
+        /// </summary>
+        public string encryption { get; set; }
     }
     public class Sniffing
     {

v2rayN/v2rayN/Properties/AssemblyInfo.cs

@@ -24,7 +24,7 @@ using System.Runtime.InteropServices;
 // 程序集的版本信息由下面四个值组成:
 //
 //      主版本
-//      次版本 
+//      次版本
 //      生成号
 //      修订号
 //
@@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("3.18")]
+[assembly: AssemblyFileVersion("3.21")]

v2rayN/v2rayN/v2rayN.csproj

@@ -93,6 +93,7 @@
     <Reference Include="System.Net" />
     <Reference Include="System.Net.Http" />
     <Reference Include="System.Net.Http.WebRequest" />
+    <Reference Include="System.Web" />
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
   </ItemGroup>
@@ -106,6 +107,12 @@
     <Compile Include="Base\ListViewFlickerFree.cs">
       <SubType>Component</SubType>
     </Compile>
+    <Compile Include="Forms\AddServer5Form.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Forms\AddServer5Form.Designer.cs">
+      <DependentUpon>AddServer5Form.cs</DependentUpon>
+    </Compile>
     <Compile Include="Forms\MainForm.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -230,6 +237,14 @@
       <DependentUpon>AddServer3Form.cs</DependentUpon>
       <SubType>Designer</SubType>
     </EmbeddedResource>
+    <EmbeddedResource Include="Forms\AddServer5Form.resx">
+      <DependentUpon>AddServer5Form.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Forms\AddServer5Form.zh-Hans.resx">
+      <DependentUpon>AddServer5Form.cs</DependentUpon>
+      <SubType>Designer</SubType>
+    </EmbeddedResource>
     <EmbeddedResource Include="Forms\AddServerForm.zh-Hans.resx">
       <DependentUpon>AddServerForm.cs</DependentUpon>
       <SubType>Designer</SubType>