Update AssemblyInfo.cs

up speedtest
Clean code
2026-05-18 23:54:49 +03:00 · 2019-10-21 10:38:15 +08:00 · 2019-10-21 10:35:54 +08:00 · 2019-10-18 14:49:42 +08:00 · 2019-10-17 13:29:58 +08:00 · 2019-10-17 11:00:36 +08:00
42 changed files with 2593 additions and 1364 deletions
@@ -3,14 +3,14 @@ using System.Net;
 using System.Text;
 using System.Threading;

-namespace v2rayN.HttpProxyHandler
+namespace v2rayN.Base
 {
    public class HttpWebServer
    {
        private HttpListener _listener;
-        private Func<HttpListenerRequest, string> _responderMethod;
+        private Func<string, string> _responderMethod;

-        public HttpWebServer(string[] prefixes, Func<HttpListenerRequest, string> method)
+        public HttpWebServer(string[] prefixes, Func<string, string> method)
        {
            try
            {
@@ -39,10 +39,11 @@ namespace v2rayN.HttpProxyHandler
            catch (Exception ex)
            {
                Utils.SaveLog(ex.Message, ex);
+                throw;
            }
        }

-        public HttpWebServer(Func<HttpListenerRequest, string> method, params string[] prefixes)
+        public HttpWebServer(Func<string, string> method, params string[] prefixes)
            : this(prefixes, method) { }

        public void Run()
@@ -59,7 +60,8 @@ namespace v2rayN.HttpProxyHandler
                            var ctx = c as HttpListenerContext;
                            try
                            {
-                                string rstr = _responderMethod(ctx.Request);
+                                string address = ctx.Request.LocalEndPoint.Address.ToString();
+                                string rstr = _responderMethod(address);
                                byte[] buf = Encoding.UTF8.GetBytes(rstr);
                                ctx.Response.StatusCode = 200;
                                ctx.Response.ContentType = "application/x-ns-proxy-autoconfig";
@@ -0,0 +1,122 @@
+using System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+
+namespace v2rayN.Base
+{
+    public class HttpWebServerB
+    {
+        private TcpListener listener;
+        private int port;
+        private Func<string, string> _responderMethod;
+
+        public HttpWebServerB(int port, Func<string, string> method)
+        {
+            this.port = port;
+            this._responderMethod = method;
+
+            Thread thread = new Thread(StartListen);
+            thread.IsBackground = true;
+            thread.Start();
+        }
+
+        public void Stop()
+        {
+            if (listener != null)
+            {
+                listener.Stop();
+                listener = null;
+            }
+        }
+
+        private void StartListen()
+        {
+            listener = new TcpListener(IPAddress.Any, port);
+            listener.Start();
+            Utils.SaveLog("WebserverB running...");
+
+            while (true)
+            {
+                TcpClient socket = listener.AcceptTcpClient();
+                Thread thread = new Thread(new ParameterizedThreadStart(ProcessThread));
+                thread.Start(socket);
+                Thread.Sleep(1);
+            }
+        }
+        private void ProcessThread(object obj)
+        {
+            try
+            {
+                var socket = obj as TcpClient;
+
+                var inputStream = new BufferedStream(socket.GetStream());
+                var outputStream = new StreamWriter(new BufferedStream(socket.GetStream()));
+                if (inputStream.CanRead)
+                {
+                    var data = ReadStream(inputStream);
+
+                    if (data.Contains("/pac/"))
+                    {
+                        if (_responderMethod != null)
+                        {
+                            var address = ((IPEndPoint)socket.Client.LocalEndPoint).Address.ToString();
+                            string pac = _responderMethod(address);
+
+                            if (inputStream.CanWrite)
+                            {
+                                WriteStream(outputStream, pac);
+                            }
+                        }
+                    }
+                }
+
+                outputStream.BaseStream.Flush();
+                inputStream = null;
+                outputStream = null;
+                socket.Close();
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        private string ReadStream(Stream inputStream)
+        {
+            int nextchar;
+            string data = "";
+            while (true)
+            {
+                nextchar = inputStream.ReadByte();
+                if (nextchar == '\n')
+                {
+                    break;
+                }
+                if (nextchar == '\r')
+                {
+                    continue;
+                }
+                if (nextchar == -1)
+                {
+                    Thread.Sleep(1);
+                    continue;
+                };
+                data += Convert.ToChar(nextchar);
+            }
+            return data;
+        }
+
+        private void WriteStream(StreamWriter outputStream, string pac)
+        {
+            var content_type = "application/x-ns-proxy-autoconfig";
+            outputStream.WriteLine("HTTP/1.1 200 OK");
+            outputStream.WriteLine(String.Format("Content-Type:{0}", content_type));
+            outputStream.WriteLine("Connection: close");
+            outputStream.WriteLine("");
+            outputStream.WriteLine(pac);
+            outputStream.Flush();
+        }
+    }
+}
@@ -0,0 +1,56 @@
+using System.Drawing;
+using System.Windows.Forms;
+
+namespace v2rayN.Base
+{
+    class ListViewFlickerFree : ListView
+    {
+        public ListViewFlickerFree()
+        {
+            SetStyle(ControlStyles.OptimizedDoubleBuffer
+                    | ControlStyles.AllPaintingInWmPaint
+                    , true);
+            UpdateStyles();
+        }
+
+
+        public void AutoResizeColumns()
+        {
+            try
+            {
+                int count = this.Columns.Count;
+                int MaxWidth = 0;
+                Graphics graphics = this.CreateGraphics();
+                Font font = this.Font;
+                ListView.ListViewItemCollection items = this.Items;
+
+                string str;
+                int width;
+
+                this.AutoResizeColumns(ColumnHeaderAutoResizeStyle.HeaderSize);
+
+                for (int i = 0; i < count; i++)
+                {
+                    str = this.Columns[i].Text;
+                    MaxWidth = this.Columns[i].Width;
+
+                    foreach (ListViewItem item in items)
+                    {
+                        str = item.SubItems[i].Text;
+                        width = (int)graphics.MeasureString(str, font).Width;
+                        if (width > MaxWidth)
+                        {
+                            MaxWidth = width;
+                        }
+                    }
+                    if (i == 0)
+                    {
+                        this.Columns[i].Width = MaxWidth;
+                    }
+                    this.Columns[i].Width = MaxWidth;
+                }
+            }
+            catch { }
+        }
+    }
+}
@@ -2,7 +2,7 @@
 using System.IO;
 using System.Linq;

-namespace v2rayN
+namespace v2rayN.Base
 {
    static class StringEx
    {
@@ -0,0 +1,47 @@
+using System;
+using System.Net;
+
+namespace v2rayN.Base
+{
+    class WebClientEx : WebClient
+    {
+        public int Timeout
+        {
+            get; set;
+        }
+        public WebClientEx(int timeout = 3000)
+        {
+            Timeout = timeout;
+        }
+
+        protected override WebRequest GetWebRequest(Uri address)
+        {
+            HttpWebRequest request;
+            if (address.Scheme == "https")
+            {
+                ServicePointManager.ServerCertificateValidationCallback = (a, b, c, d) => { return true; };
+                request = (HttpWebRequest)base.GetWebRequest(address);
+                request.ProtocolVersion = HttpVersion.Version10;
+            }
+            else
+            {
+                request = (HttpWebRequest)base.GetWebRequest(address);
+            }
+
+            request.Timeout = Timeout;
+            request.ReadWriteTimeout = Timeout;
+            //request.AllowAutoRedirect = false;
+            //request.AllowWriteStreamBuffering = true;
+
+            request.ServicePoint.BindIPEndPointDelegate = (servicePoint, remoteEndPoint, retryCount) =>
+            {
+                if (remoteEndPoint.AddressFamily == System.Net.Sockets.AddressFamily.InterNetworkV6)
+                    return new IPEndPoint(IPAddress.IPv6Any, 0);
+                else
+                    return new IPEndPoint(IPAddress.Any, 0);
+            };
+
+            return request;
+        }
+    }
+}
@@ -35,5 +35,6 @@ namespace v2rayN.Forms
                Utils.SaveLog($"Loading custom icon failed: {e.Message}");
            }
        }
+
    }
 }
@@ -1,15 +0,0 @@
-using System.Windows.Forms;
-
-namespace v2rayN.Forms
-{
-    class ListViewFlickerFree : ListView
-    {
-        public ListViewFlickerFree()
-        {
-            SetStyle(ControlStyles.OptimizedDoubleBuffer
-                    | ControlStyles.AllPaintingInWmPaint
-                    , true);
-            UpdateStyles();
-        }
-    }
-}
@@ -31,7 +31,7 @@
            this.components = new System.ComponentModel.Container();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
            this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.lvServers = new v2rayN.Forms.ListViewFlickerFree();
+            this.lvServers = new v2rayN.Base.ListViewFlickerFree();
            this.cmsLv = new System.Windows.Forms.ContextMenuStrip(this.components);
            this.menuAddVmessServer = new System.Windows.Forms.ToolStripMenuItem();
            this.menuAddShadowsocksServer = new System.Windows.Forms.ToolStripMenuItem();
@@ -52,14 +52,16 @@
            this.menuSelectAll = new System.Windows.Forms.ToolStripMenuItem();
            this.toolStripSeparator9 = new System.Windows.Forms.ToolStripSeparator();
            this.menuPingServer = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuTcpingServer = new System.Windows.Forms.ToolStripMenuItem();
+            this.menuRealPingServer = new System.Windows.Forms.ToolStripMenuItem();
            this.menuSpeedServer = new System.Windows.Forms.ToolStripMenuItem();
            this.toolStripSeparator6 = new System.Windows.Forms.ToolStripSeparator();
            this.menuExport2ClientConfig = new System.Windows.Forms.ToolStripMenuItem();
            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.menuSysAgentEnabled = new System.Windows.Forms.ToolStripMenuItem();
@@ -74,7 +76,6 @@
            this.menuCopyPACUrl = new System.Windows.Forms.ToolStripMenuItem();
            this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
            this.menuExit = new System.Windows.Forms.ToolStripMenuItem();
-            this.bgwPing = new System.ComponentModel.BackgroundWorker();
            this.bgwScan = new System.ComponentModel.BackgroundWorker();
            this.groupBox1 = new System.Windows.Forms.GroupBox();
            this.groupBox2 = new System.Windows.Forms.GroupBox();
@@ -184,6 +185,8 @@
            this.menuSelectAll,
            this.toolStripSeparator9,
            this.menuPingServer,
+            this.menuTcpingServer,
+            this.menuRealPingServer,
            this.menuSpeedServer,
            this.toolStripSeparator6,
            this.menuExport2ClientConfig,
@@ -305,6 +308,18 @@
            resources.ApplyResources(this.menuPingServer, "menuPingServer");
            this.menuPingServer.Click += new System.EventHandler(this.menuPingServer_Click);
            // 
+            // menuTcpingServer
+            // 
+            this.menuTcpingServer.Name = "menuTcpingServer";
+            resources.ApplyResources(this.menuTcpingServer, "menuTcpingServer");
+            this.menuTcpingServer.Click += new System.EventHandler(this.menuTcpingServer_Click);
+            // 
+            // menuRealPingServer
+            // 
+            this.menuRealPingServer.Name = "menuRealPingServer";
+            resources.ApplyResources(this.menuRealPingServer, "menuRealPingServer");
+            this.menuRealPingServer.Click += new System.EventHandler(this.menuRealPingServer_Click);
+            // 
            // menuSpeedServer
            // 
            this.menuSpeedServer.Name = "menuSpeedServer";
@@ -340,6 +355,11 @@
            resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent");
            this.menuExport2SubContent.Click += new System.EventHandler(this.menuExport2SubContent_Click);
            // 
+            // qrCodeControl
+            // 
+            resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
+            this.qrCodeControl.Name = "qrCodeControl";
+            // 
            // tsbServer
            // 
            this.tsbServer.DropDown = this.cmsLv;
@@ -347,11 +367,6 @@
            resources.ApplyResources(this.tsbServer, "tsbServer");
            this.tsbServer.Name = "tsbServer";
            // 
-            // qrCodeControl
-            // 
-            resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
-            this.qrCodeControl.Name = "qrCodeControl";
-            // 
            // notifyMain
            // 
            this.notifyMain.ContextMenuStrip = this.cmsMain;
@@ -450,12 +465,6 @@
            resources.ApplyResources(this.menuExit, "menuExit");
            this.menuExit.Click += new System.EventHandler(this.menuExit_Click);
            // 
-            // bgwPing
-            // 
-            this.bgwPing.WorkerReportsProgress = true;
-            this.bgwPing.DoWork += new System.ComponentModel.DoWorkEventHandler(this.bgwPing_DoWork);
-            this.bgwPing.ProgressChanged += new System.ComponentModel.ProgressChangedEventHandler(this.bgwPing_ProgressChanged);
-            // 
            // bgwScan
            // 
            this.bgwScan.WorkerReportsProgress = true;
@@ -506,8 +515,8 @@
            // 
            // toolSslSocksPortLab
            // 
-            this.toolSslSocksPortLab.Name = "toolSslSocksPortLab";
            resources.ApplyResources(this.toolSslSocksPortLab, "toolSslSocksPortLab");
+            this.toolSslSocksPortLab.Name = "toolSslSocksPortLab";
            // 
            // toolSslSocksPort
            // 
@@ -516,14 +525,14 @@
            // 
            // toolSslBlank1
            // 
-            this.toolSslBlank1.Name = "toolSslBlank1";
            resources.ApplyResources(this.toolSslBlank1, "toolSslBlank1");
+            this.toolSslBlank1.Name = "toolSslBlank1";
            this.toolSslBlank1.Spring = true;
            // 
            // toolSslHttpPortLab
            // 
-            this.toolSslHttpPortLab.Name = "toolSslHttpPortLab";
            resources.ApplyResources(this.toolSslHttpPortLab, "toolSslHttpPortLab");
+            this.toolSslHttpPortLab.Name = "toolSslHttpPortLab";
            // 
            // toolSslHttpPort
            // 
@@ -532,14 +541,14 @@
            // 
            // toolSslBlank2
            // 
-            this.toolSslBlank2.Name = "toolSslBlank2";
            resources.ApplyResources(this.toolSslBlank2, "toolSslBlank2");
+            this.toolSslBlank2.Name = "toolSslBlank2";
            this.toolSslBlank2.Spring = true;
            // 
            // toolSslPacPortLab
            // 
-            this.toolSslPacPortLab.Name = "toolSslPacPortLab";
            resources.ApplyResources(this.toolSslPacPortLab, "toolSslPacPortLab");
+            this.toolSslPacPortLab.Name = "toolSslPacPortLab";
            // 
            // toolSslPacPort
            // 
@@ -548,8 +557,8 @@
            // 
            // toolSslBlank3
            // 
-            this.toolSslBlank3.Name = "toolSslBlank3";
            resources.ApplyResources(this.toolSslBlank3, "toolSslBlank3");
+            this.toolSslBlank3.Name = "toolSslBlank3";
            this.toolSslBlank3.Spring = true;
            // 
            // toolSslServerSpeed
@@ -775,14 +784,13 @@
        private System.Windows.Forms.GroupBox groupBox1;
        private System.Windows.Forms.GroupBox groupBox2;
        private System.Windows.Forms.TextBox txtMsgBox;
-        private v2rayN.Forms.ListViewFlickerFree lvServers;
+        private v2rayN.Base.ListViewFlickerFree lvServers;
        private System.Windows.Forms.NotifyIcon notifyMain;
        private System.Windows.Forms.ContextMenuStrip cmsMain;
        private System.Windows.Forms.ToolStripMenuItem menuExit;
        private System.Windows.Forms.Panel panel1;
        private System.Windows.Forms.ToolStripMenuItem menuServers;
        private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
-        private System.ComponentModel.BackgroundWorker bgwPing;
        private System.Windows.Forms.ContextMenuStrip cmsLv;
        private System.Windows.Forms.ToolStripMenuItem menuAddVmessServer;
        private System.Windows.Forms.ToolStripMenuItem menuRemoveServer;
@@ -858,6 +866,8 @@
        private System.Windows.Forms.ToolStripStatusLabel toolSslServerSpeed;
        private System.Windows.Forms.ToolStripStatusLabel toolSslBlank4;
        private System.Windows.Forms.ToolStripMenuItem menuRemoveDuplicateServer;
+        private System.Windows.Forms.ToolStripMenuItem menuTcpingServer;
+        private System.Windows.Forms.ToolStripMenuItem menuRealPingServer;
    }
 }

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.IO;
 using System.IO.Compression;
 using System.Text;
@@ -7,6 +8,7 @@ using System.Windows.Forms;
 using v2rayN.Handler;
 using v2rayN.HttpProxyHandler;
 using v2rayN.Mode;
+using v2rayN.Base;

 namespace v2rayN.Forms
 {
@@ -14,8 +16,7 @@ namespace v2rayN.Forms
    {
        private V2rayHandler v2rayHandler;
        private PACListHandle pacListHandle;
-        private V2rayUpdateHandle v2rayUpdateHandle;
-        private V2rayUpdateHandle v2rayUpdateHandle2;
+        private DownloadHandle downloadHandle;
        private List<int> lvSelecteds = new List<int>();
        private StatisticsHandler statistics = null;

@@ -41,64 +42,13 @@ namespace v2rayN.Forms
            ConfigHandler.LoadConfig(ref config);
            v2rayHandler = new V2rayHandler();
            v2rayHandler.ProcessEvent += v2rayHandler_ProcessEvent;
+
            if (config.enableStatistics)
            {
                statistics = new StatisticsHandler(config, UpdateStatisticsHandler);
            }
        }

-        private void UpdateStatisticsHandler(ulong totalUp, ulong totalDown, ulong up, ulong down, List<Mode.ServerStatistics> statistics)
-        {
-            try
-            {
-                up /= (ulong)(config.statisticsFreshRate / 1000f);
-                down /= (ulong)(config.statisticsFreshRate / 1000f);
-                toolSslServerSpeed.Text = string.Format(
-                    "{0}/s↑ | {1}/s↓",
-                      Utils.HumanFy(up),
-                      Utils.HumanFy(down)
-                );
-
-            List<string[]> datas = new List<string[]>();
-	            for (int i = 0; i < config.vmess.Count; i++)
-	            {
-	                string totalUp_ = string.Empty,
-	                        totalDown_ = string.Empty,
-	                        todayUp_ = string.Empty,
-	                        todayDown_ = string.Empty;
-	                var index = statistics.FindIndex(item_ => Utils.IsIdenticalServer(item_, new ServerStatistics(config.vmess[i].remarks, config.vmess[i].address, config.vmess[i].port, config.vmess[i].path, config.vmess[i].requestHost, 0, 0, 0, 0)));
-	                if (index != -1)
-	                {
-	                        totalUp_ = Utils.HumanFy(statistics[index].totalUp);
-	                        totalDown_ = Utils.HumanFy(statistics[index].totalDown);
-	                        todayUp_ = Utils.HumanFy(statistics[index].todayUp);
-	                        todayDown_ = Utils.HumanFy(statistics[index].todayDown);
-                    }
-
-                    datas.Add(new string[] { totalUp_, totalDown_, todayUp_, todayDown_ });
-                }
-                
-                lvServers.Invoke((MethodInvoker)delegate
-                {
-                    lvServers.SuspendLayout();
-                    for (int i = 0; i < datas.Count; i++)
-                    {
-                        var indexStart = 9;
-                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][0];
-                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][1];
-                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][2];
-                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][3];
-                    }
-                    lvServers.ResumeLayout();
-                });
-
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-        }
-
        private void MainForm_VisibleChanged(object sender, EventArgs e)
        {
            if (statistics == null || !statistics.Enable) return;
@@ -116,6 +66,7 @@ namespace v2rayN.Forms
        {
            InitServersView();
            RefreshServers();
+            lvServers.AutoResizeColumns();

            LoadV2ray();

@@ -212,7 +163,7 @@ namespace v2rayN.Forms
            lvServers.Columns.Add(UIRes.I18N("LvEncryptionMethod"), 90, HorizontalAlignment.Left);
            lvServers.Columns.Add(UIRes.I18N("LvTransportProtocol"), 70, HorizontalAlignment.Left);
            lvServers.Columns.Add(UIRes.I18N("LvSubscription"), 50, HorizontalAlignment.Left);
-            lvServers.Columns.Add(UIRes.I18N("LvTestResults"), 100, HorizontalAlignment.Left);
+            lvServers.Columns.Add(UIRes.I18N("LvTestResults"), 70, HorizontalAlignment.Left);

            if (statistics != null && statistics.Enable)
            {
@@ -369,21 +320,29 @@ namespace v2rayN.Forms

        private void DisplayToolStatus()
        {
-            var localIP = "127.0.0.1";
            toolSslSocksPort.Text =
            toolSslHttpPort.Text =
            toolSslPacPort.Text = "NONE";

-            toolSslSocksPort.Text = $"{localIP}:{config.inbound[0].localPort}";
+            toolSslSocksPort.Text = $"{Global.Loopback}:{config.inbound[0].localPort}";

            if (config.sysAgentEnabled)
            {
-                toolSslHttpPort.Text = $"{localIP}:{Global.sysAgentPort}";
+                toolSslHttpPort.Text = $"{Global.Loopback}:{Global.httpPort}";
                if (config.listenerType == 2 || config.listenerType == 4)
                {
-                    toolSslPacPort.Text = $"{HttpProxyHandle.GetPacUrl()}";
+                    if (PACServerHandle.IsRunning)
+                    {
+                        toolSslPacPort.Text = $"{HttpProxyHandle.GetPacUrl()}";
+                    }
+                    else
+                    {
+                        toolSslPacPort.Text = UIRes.I18N("StartPacFailed");
+                    }
                }
            }
+            notifyMain.Icon = GetNotifyIcon();
+
        }
        private void ssMain_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
        {
@@ -392,6 +351,46 @@ namespace v2rayN.Forms
                Utils.SetClipboardData(e.ClickedItem.Text);
            }
        }
+
+        private Icon GetNotifyIcon()
+        {
+            try
+            {
+                var color = ColorTranslator.FromHtml("#3399CC");
+                var index = config.sysAgentEnabled ? config.listenerType : 0;
+                if (index > 0)
+                {
+                    color = (new Color[] { Color.Red, Color.Purple, Color.DarkGreen, Color.Orange })[index - 1];
+                    //color = ColorTranslator.FromHtml(new string[] { "#CC0066", "#CC6600", "#99CC99", "#666699" }[index - 1]);
+                }
+
+                var width = 128;
+                var height = 128;
+
+                var bitmap = new Bitmap(width, height);
+                var graphics = Graphics.FromImage(bitmap);
+                var drawBrush = new SolidBrush(color);
+
+                graphics.FillEllipse(drawBrush, new Rectangle(0, 0, width, height));
+                var zoom = 16;
+                graphics.DrawImage(new Bitmap(Properties.Resources.notify, width - zoom, width - zoom), zoom / 2, zoom / 2);
+
+                bitmap.Save(Utils.GetPath("temp_icon.ico"), System.Drawing.Imaging.ImageFormat.Icon);
+
+                Icon createdIcon = Icon.FromHandle(bitmap.GetHicon());
+
+                drawBrush.Dispose();
+                graphics.Dispose();
+                bitmap.Dispose();
+
+                return createdIcon;
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                return this.Icon;
+            }
+        }
        #endregion

        #region v2ray 操作
@@ -407,6 +406,7 @@ namespace v2rayN.Forms
            }
            v2rayHandler.LoadV2ray(config);
            Global.reloadV2ray = false;
+            ConfigHandler.ToJsonFile(config);

            ChangeSysAgent(config.sysAgentEnabled);
            DisplayToolStatus();
@@ -489,12 +489,18 @@ namespace v2rayN.Forms
                    case Keys.A:
                        menuSelectAll_Click(null, null);
                        break;
-                    case Keys.T:
-                        menuSpeedServer_Click(null, null);
-                        break;
                    case Keys.P:
                        menuPingServer_Click(null, null);
                        break;
+                    case Keys.O:
+                        menuTcpingServer_Click(null, null);
+                        break;
+                    case Keys.R:
+                        menuRealPingServer_Click(null, null);
+                        break;
+                    case Keys.T:
+                        menuSpeedServer_Click(null, null);
+                        break;
                }
            }
            switch (e.KeyCode)
@@ -559,9 +565,6 @@ namespace v2rayN.Forms
            //刷新
            RefreshServers();
            LoadV2ray();
-
-            // save to config file
-            ConfigHandler.ToJsonFile(config);
        }

        private void menuCopyServer_Click(object sender, EventArgs e)
@@ -593,12 +596,18 @@ namespace v2rayN.Forms
        {
            GetLvSelectedIndex();
            ClearTestResult();
-            bgwPing.RunWorkerAsync();
+            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "ping", UpdateSpeedtestHandler);
+        }
+        private void menuTcpingServer_Click(object sender, EventArgs e)
+        {
+            GetLvSelectedIndex();
+            ClearTestResult();
+            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "tcping", UpdateSpeedtestHandler);
        }

-        private void menuSpeedServer_Click(object sender, EventArgs e)
+        private void menuRealPingServer_Click(object sender, EventArgs e)
        {
-            if (!config.sysAgentEnabled || config.listenerType != 1)
+            if (!config.sysAgentEnabled)
            {
                UI.Show(UIRes.I18N("NeedHttpGlobalProxy"));
                return;
@@ -607,7 +616,22 @@ namespace v2rayN.Forms
            UI.Show(UIRes.I18N("SpeedServerTips"));

            GetLvSelectedIndex();
-            ServerSpeedTest();
+            ClearTestResult();
+            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "realping", UpdateSpeedtestHandler);
+        }
+
+        private void menuSpeedServer_Click(object sender, EventArgs e)
+        {
+            if (!config.sysAgentEnabled)
+            {
+                UI.Show(UIRes.I18N("NeedHttpGlobalProxy"));
+                return;
+            }
+
+            UI.Show(UIRes.I18N("SpeedServerTips"));
+
+            GetLvSelectedIndex();
+            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "speedtest", UpdateSpeedtestHandler);
        }

        private void menuExport2ClientConfig_Click(object sender, EventArgs e)
@@ -1011,7 +1035,7 @@ namespace v2rayN.Forms
        {
            //this.WindowState = FormWindowState.Minimized;
            this.Hide();
-            this.notifyMain.Icon = this.Icon;
+            //this.notifyMain.Icon = this.Icon;
            this.notifyMain.Visible = true;
            this.ShowInTaskbar = false;

@@ -1022,39 +1046,6 @@ namespace v2rayN.Forms

        #region 后台测速

-        private void bgwPing_DoWork(object sender, System.ComponentModel.DoWorkEventArgs e)
-        {
-            try
-            {
-                for (int k = 0; k < lvSelecteds.Count; k++)
-                {
-                    int index = lvSelecteds[k];
-                    if (config.vmess[index].configType == (int)EConfigType.Custom)
-                    {
-                        continue;
-                    }
-                    long time = Utils.Ping(config.vmess[index].address);
-                    bgwPing.ReportProgress(index, string.Format("{0}ms", time));
-                }
-            }
-            catch
-            {
-
-            }
-        }
-
-        private void bgwPing_ProgressChanged(object sender, System.ComponentModel.ProgressChangedEventArgs e)
-        {
-            try
-            {
-                int k = e.ProgressPercentage;
-                string time = string.Format("{0}", Convert.ToString(e.UserState));
-                SetTestResult(k, time);
-            }
-            catch
-            {
-            }
-        }
        private void SetTestResult(int k, string txt)
        {
            config.vmess[k].testResult = txt;
@@ -1067,77 +1058,70 @@ namespace v2rayN.Forms
                SetTestResult(k, "");
            }
        }
-
-        private int testCounter = 0;
-        private int ServerSpeedTestSub(int index, string url)
+        private void UpdateSpeedtestHandler(int index, string msg)
        {
-            if (index >= lvSelecteds.Count)
+            lvServers.Invoke((MethodInvoker)delegate
            {
-                return -1;
-            }
+                lvServers.SuspendLayout();

-            if (ConfigHandler.SetDefaultServer(ref config, lvSelecteds[index]) == 0)
-            {
-                SetTestResult(lvSelecteds[index], "testing...");
+                SetTestResult(index, msg);

-                v2rayHandler.LoadV2ray(config);
-                v2rayUpdateHandle2.DownloadFileAsync(config, url);
-                testCounter++;
-                return 0;
-            }
-            else
+                lvServers.ResumeLayout();
+            });
+        }
+
+        private void UpdateStatisticsHandler(ulong totalUp, ulong totalDown, ulong up, ulong down, List<Mode.ServerStatistics> statistics)
+        {
+            try
            {
-                return -1;
+                up /= (ulong)(config.statisticsFreshRate / 1000f);
+                down /= (ulong)(config.statisticsFreshRate / 1000f);
+                toolSslServerSpeed.Text = string.Format(
+                    "{0}/s↑ | {1}/s↓",
+                      Utils.HumanFy(up),
+                      Utils.HumanFy(down)
+                );
+
+                List<string[]> datas = new List<string[]>();
+                for (int i = 0; i < config.vmess.Count; i++)
+                {
+                    string totalUp_ = string.Empty,
+                            totalDown_ = string.Empty,
+                            todayUp_ = string.Empty,
+                            todayDown_ = string.Empty;
+                    var index = statistics.FindIndex(item_ => Utils.IsIdenticalServer(item_, new ServerStatistics(config.vmess[i].remarks, config.vmess[i].address, config.vmess[i].port, config.vmess[i].path, config.vmess[i].requestHost, 0, 0, 0, 0)));
+                    if (index != -1)
+                    {
+                        totalUp_ = Utils.HumanFy(statistics[index].totalUp);
+                        totalDown_ = Utils.HumanFy(statistics[index].totalDown);
+                        todayUp_ = Utils.HumanFy(statistics[index].todayUp);
+                        todayDown_ = Utils.HumanFy(statistics[index].todayDown);
+                    }
+
+                    datas.Add(new string[] { totalUp_, totalDown_, todayUp_, todayDown_ });
+                }
+
+                lvServers.Invoke((MethodInvoker)delegate
+                {
+                    lvServers.SuspendLayout();
+                    for (int i = 0; i < datas.Count; i++)
+                    {
+                        var indexStart = 9;
+                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][0];
+                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][1];
+                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][2];
+                        lvServers.Items[i].SubItems[indexStart++].Text = datas[i][3];
+                    }
+                    lvServers.ResumeLayout();
+                });
+
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
            }
        }
-        private void ServerSpeedTest()
-        {
-            if (config.vmess.Count <= 0)
-            {
-                return;
-            }
-            ClearTestResult();

-            string url = Global.SpeedTestUrl;
-            testCounter = 0;
-            if (v2rayUpdateHandle2 == null)
-            {
-                v2rayUpdateHandle2 = new V2rayUpdateHandle();
-                v2rayUpdateHandle2.UpdateCompleted += (sender2, args) =>
-                {
-                    if (args.Success)
-                    {
-                        AppendText(false, args.Msg);
-                        SetTestResult(lvSelecteds[testCounter - 1], args.Msg);
-
-                        if (ServerSpeedTestSub(testCounter, url) != 0)
-                        {
-                            RefreshServers();
-                            return;
-                        }
-                    }
-                    else
-                    {
-                        AppendText(false, args.Msg);
-                    }
-                };
-                v2rayUpdateHandle2.Error += (sender2, args) =>
-                {
-                    SetTestResult(lvSelecteds[testCounter - 1], args.GetException().Message);
-                    AppendText(true, args.GetException().Message);
-
-                    if (ServerSpeedTestSub(testCounter, url) != 0)
-                    {
-                        RefreshServers();
-                        return;
-                    }
-                };
-            }
-            if (ServerSpeedTestSub(testCounter, url) != 0)
-            {
-                return;
-            }
-        }
        #endregion

        #region 移动服务器
@@ -1268,7 +1252,7 @@ namespace v2rayN.Forms
        {
            if (isChecked)
            {
-                if (HttpProxyHandle.RestartHttpAgent(config, true))
+                if (HttpProxyHandle.RestartHttpAgent(config, false))
                {
                    ChangePACButtonStatus(config.listenerType);
                }
@@ -1296,10 +1280,10 @@ namespace v2rayN.Forms

        private void tsbCheckUpdateCore_Click(object sender, EventArgs e)
        {
-            if (v2rayUpdateHandle == null)
+            if (downloadHandle == null)
            {
-                v2rayUpdateHandle = new V2rayUpdateHandle();
-                v2rayUpdateHandle.AbsoluteCompleted += (sender2, args) =>
+                downloadHandle = new DownloadHandle();
+                downloadHandle.AbsoluteCompleted += (sender2, args) =>
                {
                    if (args.Success)
                    {
@@ -1315,7 +1299,7 @@ namespace v2rayN.Forms
                            }
                            else
                            {
-                                v2rayUpdateHandle.DownloadFileAsync(config, url);
+                                downloadHandle.DownloadFileAsync(config, url, null);
                            }
                        }));
                    }
@@ -1324,7 +1308,7 @@ namespace v2rayN.Forms
                        AppendText(false, args.Msg);
                    }
                };
-                v2rayUpdateHandle.UpdateCompleted += (sender2, args) =>
+                downloadHandle.UpdateCompleted += (sender2, args) =>
                {
                    if (args.Success)
                    {
@@ -1335,7 +1319,7 @@ namespace v2rayN.Forms
                        {
                            CloseV2ray();

-                            string fileName = v2rayUpdateHandle.DownloadFileName;
+                            string fileName = downloadHandle.DownloadFileName;
                            fileName = Utils.GetPath(fileName);
                            using (ZipArchive archive = ZipFile.OpenRead(fileName))
                            {
@@ -1363,14 +1347,14 @@ namespace v2rayN.Forms
                        AppendText(false, args.Msg);
                    }
                };
-                v2rayUpdateHandle.Error += (sender2, args) =>
+                downloadHandle.Error += (sender2, args) =>
                {
                    AppendText(true, args.GetException().Message);
                };
            }

            AppendText(false, UIRes.I18N("MsgStartUpdatingV2rayCore"));
-            v2rayUpdateHandle.AbsoluteV2rayCore(config);
+            downloadHandle.AbsoluteV2rayCore(config);
        }

        private void tsbCheckUpdatePACList_Click(object sender, EventArgs e)
@@ -1490,8 +1474,8 @@ namespace v2rayN.Forms
                    continue;
                }

-                V2rayUpdateHandle v2rayUpdateHandle3 = new V2rayUpdateHandle();
-                v2rayUpdateHandle3.UpdateCompleted += (sender2, args) =>
+                DownloadHandle downloadHandle3 = new DownloadHandle();
+                downloadHandle3.UpdateCompleted += (sender2, args) =>
                {
                    if (args.Success)
                    {
@@ -1520,12 +1504,12 @@ namespace v2rayN.Forms
                        AppendText(false, args.Msg);
                    }
                };
-                v2rayUpdateHandle3.Error += (sender2, args) =>
+                downloadHandle3.Error += (sender2, args) =>
                {
                    AppendText(true, args.GetException().Message);
                };

-                v2rayUpdateHandle3.WebDownloadString(url);
+                downloadHandle3.WebDownloadString(url);
                AppendText(false, $"{hashCode}{UIRes.I18N("MsgStartGettingSubscriptions")}");
            }

@@ -1552,5 +1536,7 @@ namespace v2rayN.Forms


        #endregion
+
+
    }
 }
@@ -231,7 +231,19 @@
    <value>447, 22</value>
  </data>
  <data name="menuPingServer.Text" xml:space="preserve">
-    <value>Test server delay (multiple choice)(Ctrl+P)</value>
+    <value>Test server ping (multiple choice)(Ctrl+P)</value>
+  </data>
+  <data name="menuTcpingServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>447, 22</value>
+  </data>
+  <data name="menuTcpingServer.Text" xml:space="preserve">
+    <value>Test server tcping (multiple choice)(Ctrl+O)</value>
+  </data>
+  <data name="menuRealPingServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>447, 22</value>
+  </data>
+  <data name="menuRealPingServer.Text" xml:space="preserve">
+    <value>Test server real ping (multiple choice)(Ctrl+R)</value>
  </data>
  <data name="menuSpeedServer.Size" type="System.Drawing.Size, System.Drawing">
    <value>447, 22</value>
@@ -279,7 +291,7 @@
    <value>ImageAboveText</value>
  </data>
  <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
-    <value>448, 490</value>
+    <value>448, 556</value>
  </data>
  <data name="&gt;&gt;cmsLv.Name" xml:space="preserve">
    <value>cmsLv</value>
@@ -311,7 +323,7 @@
    <value>0, 0</value>
  </data>
  <data name="lvServers.Size" type="System.Drawing.Size, System.Drawing">
-    <value>638, 331</value>
+    <value>686, 331</value>
  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="lvServers.TabIndex" type="System.Int32, mscorlib">
@@ -381,10 +393,10 @@
    <value>100</value>
  </data>
  <data name="splitContainer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>898, 331</value>
+    <value>946, 331</value>
  </data>
  <data name="splitContainer1.SplitterDistance" type="System.Int32, mscorlib">
-    <value>638</value>
+    <value>686</value>
  </data>
  <data name="splitContainer1.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -410,33 +422,12 @@
  <data name="cmsMain.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
-  <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>265, 164</value>
-  </data>
-  <data name="&gt;&gt;cmsMain.Name" xml:space="preserve">
-    <value>cmsMain</value>
-  </data>
-  <data name="&gt;&gt;cmsMain.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="notifyMain.Text" xml:space="preserve">
-    <value>v2rayN</value>
-  </data>
-  <data name="notifyMain.Visible" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
  <data name="menuSysAgentEnabled.Size" type="System.Drawing.Size, System.Drawing">
    <value>264, 22</value>
  </data>
  <data name="menuSysAgentEnabled.Text" xml:space="preserve">
    <value>Enable Http proxy</value>
  </data>
-  <data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>264, 22</value>
-  </data>
-  <data name="menuSysAgentMode.Text" xml:space="preserve">
-    <value>Http proxy mode</value>
-  </data>
  <data name="menuGlobal.Size" type="System.Drawing.Size, System.Drawing">
    <value>547, 22</value>
  </data>
@@ -461,6 +452,12 @@
  <data name="menuKeepPAC.Text" xml:space="preserve">
    <value>Only open PAC, do not automatically configure PAC</value>
  </data>
+  <data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>264, 22</value>
+  </data>
+  <data name="menuSysAgentMode.Text" xml:space="preserve">
+    <value>Http proxy mode</value>
+  </data>
  <data name="menuServers.Size" type="System.Drawing.Size, System.Drawing">
    <value>264, 22</value>
  </data>
@@ -494,9 +491,21 @@
  <data name="menuExit.Text" xml:space="preserve">
    <value>Exit</value>
  </data>
-  <metadata name="bgwPing.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>232, 17</value>
-  </metadata>
+  <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>265, 164</value>
+  </data>
+  <data name="&gt;&gt;cmsMain.Name" xml:space="preserve">
+    <value>cmsMain</value>
+  </data>
+  <data name="&gt;&gt;cmsMain.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ContextMenuStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="notifyMain.Text" xml:space="preserve">
+    <value>v2rayN</value>
+  </data>
+  <data name="notifyMain.Visible" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
  <metadata name="bgwScan.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>498, 17</value>
  </metadata>
@@ -507,7 +516,7 @@
    <value>0, 66</value>
  </data>
  <data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>904, 351</value>
+    <value>952, 351</value>
  </data>
  <data name="groupBox1.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -543,7 +552,7 @@
    <value>Vertical</value>
  </data>
  <data name="txtMsgBox.Size" type="System.Drawing.Size, System.Drawing">
-    <value>898, 134</value>
+    <value>946, 134</value>
  </data>
  <data name="txtMsgBox.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
@@ -561,10 +570,13 @@
    <value>0</value>
  </data>
  <metadata name="ssMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>603, 17</value>
+    <value>228, 18</value>
  </metadata>
+  <data name="toolSslSocksPortLab.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 8pt</value>
+  </data>
  <data name="toolSslSocksPortLab.Size" type="System.Drawing.Size, System.Drawing">
-    <value>55, 17</value>
+    <value>49, 17</value>
  </data>
  <data name="toolSslSocksPortLab.Text" xml:space="preserve">
    <value>SOCKS5</value>
@@ -572,11 +584,17 @@
  <data name="toolSslSocksPort.Size" type="System.Drawing.Size, System.Drawing">
    <value>0, 17</value>
  </data>
+  <data name="toolSslBlank1.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 8pt</value>
+  </data>
  <data name="toolSslBlank1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>176, 17</value>
+    <value>198, 17</value>
+  </data>
+  <data name="toolSslHttpPortLab.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 8pt</value>
  </data>
  <data name="toolSslHttpPortLab.Size" type="System.Drawing.Size, System.Drawing">
-    <value>38, 17</value>
+    <value>36, 17</value>
  </data>
  <data name="toolSslHttpPortLab.Text" xml:space="preserve">
    <value>HTTP</value>
@@ -584,11 +602,17 @@
  <data name="toolSslHttpPort.Size" type="System.Drawing.Size, System.Drawing">
    <value>0, 17</value>
  </data>
+  <data name="toolSslBlank2.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 8pt</value>
+  </data>
  <data name="toolSslBlank2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>176, 17</value>
+    <value>198, 17</value>
+  </data>
+  <data name="toolSslPacPortLab.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 8pt</value>
  </data>
  <data name="toolSslPacPortLab.Size" type="System.Drawing.Size, System.Drawing">
-    <value>31, 17</value>
+    <value>30, 17</value>
  </data>
  <data name="toolSslPacPortLab.Text" xml:space="preserve">
    <value>PAC</value>
@@ -596,21 +620,30 @@
  <data name="toolSslPacPort.Size" type="System.Drawing.Size, System.Drawing">
    <value>0, 17</value>
  </data>
+  <data name="toolSslBlank3.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 8pt</value>
+  </data>
  <data name="toolSslBlank3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>176, 17</value>
+    <value>198, 17</value>
  </data>
  <data name="toolSslServerSpeed.AutoSize" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
+  <data name="toolSslServerSpeed.Font" type="System.Drawing.Font, System.Drawing">
+    <value>微软雅黑, 8pt</value>
+  </data>
  <data name="toolSslServerSpeed.RightToLeft" type="System.Windows.Forms.RightToLeft, System.Windows.Forms">
    <value>No</value>
  </data>
  <data name="toolSslServerSpeed.Size" type="System.Drawing.Size, System.Drawing">
-    <value>200, 17</value>
+    <value>220, 17</value>
  </data>
  <data name="toolSslServerSpeed.Text" xml:space="preserve">
    <value>SPEED Disabled</value>
  </data>
+  <data name="toolSslServerSpeed.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
+    <value>MiddleRight</value>
+  </data>
  <data name="toolSslBlank4.Size" type="System.Drawing.Size, System.Drawing">
    <value>0, 17</value>
  </data>
@@ -618,7 +651,7 @@
    <value>3, 151</value>
  </data>
  <data name="ssMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>898, 22</value>
+    <value>946, 22</value>
  </data>
  <data name="ssMain.TabIndex" type="System.Int32, mscorlib">
    <value>7</value>
@@ -645,7 +678,7 @@
    <value>0, 417</value>
  </data>
  <data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>904, 176</value>
+    <value>952, 176</value>
  </data>
  <data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
@@ -672,7 +705,7 @@
    <value>0, 56</value>
  </data>
  <data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>904, 10</value>
+    <value>952, 10</value>
  </data>
  <data name="panel1.TabIndex" type="System.Int32, mscorlib">
    <value>5</value>
@@ -692,42 +725,9 @@
  <metadata name="tsMain.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>409, 17</value>
  </metadata>
-  <data name="tsMain.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
-  </data>
-  <data name="tsMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>904, 56</value>
-  </data>
-  <data name="tsMain.TabIndex" type="System.Int32, mscorlib">
-    <value>6</value>
-  </data>
-  <data name="&gt;&gt;tsMain.Name" xml:space="preserve">
-    <value>tsMain</value>
-  </data>
-  <data name="&gt;&gt;tsMain.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;tsMain.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;tsMain.ZOrder" xml:space="preserve">
-    <value>5</value>
-  </data>
  <data name="toolStripSeparator4.Size" type="System.Drawing.Size, System.Drawing">
    <value>6, 56</value>
  </data>
-  <data name="tsbSub.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="tsbSub.Size" type="System.Drawing.Size, System.Drawing">
-    <value>93, 53</value>
-  </data>
-  <data name="tsbSub.Text" xml:space="preserve">
-    <value>Subscription</value>
-  </data>
-  <data name="tsbSub.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
-    <value>ImageAboveText</value>
-  </data>
  <data name="tsbSubSetting.Size" type="System.Drawing.Size, System.Drawing">
    <value>197, 22</value>
  </data>
@@ -740,6 +740,18 @@
  <data name="tsbSubUpdate.Text" xml:space="preserve">
    <value>Update subscription</value>
  </data>
+  <data name="tsbSub.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="tsbSub.Size" type="System.Drawing.Size, System.Drawing">
+    <value>93, 53</value>
+  </data>
+  <data name="tsbSub.Text" xml:space="preserve">
+    <value>Subscription</value>
+  </data>
+  <data name="tsbSub.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageAboveText</value>
+  </data>
  <data name="toolStripSeparator8.Size" type="System.Drawing.Size, System.Drawing">
    <value>6, 56</value>
  </data>
@@ -787,18 +799,6 @@
  <data name="toolStripSeparator7.Size" type="System.Drawing.Size, System.Drawing">
    <value>6, 56</value>
  </data>
-  <data name="tsbCheckUpdate.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
-    <value>Magenta</value>
-  </data>
-  <data name="tsbCheckUpdate.Size" type="System.Drawing.Size, System.Drawing">
-    <value>128, 53</value>
-  </data>
-  <data name="tsbCheckUpdate.Text" xml:space="preserve">
-    <value>Check for updates</value>
-  </data>
-  <data name="tsbCheckUpdate.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
-    <value>ImageAboveText</value>
-  </data>
  <data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing">
    <value>338, 22</value>
  </data>
@@ -823,21 +823,21 @@
  <data name="tsbCheckClearPACList.Text" xml:space="preserve">
    <value>Simplify PAC (please set Core route)</value>
  </data>
-  <data name="toolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
-    <value>6, 56</value>
-  </data>
-  <data name="tsbHelp.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+  <data name="tsbCheckUpdate.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
    <value>Magenta</value>
  </data>
-  <data name="tsbHelp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>48, 53</value>
+  <data name="tsbCheckUpdate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>128, 53</value>
  </data>
-  <data name="tsbHelp.Text" xml:space="preserve">
-    <value>Help</value>
+  <data name="tsbCheckUpdate.Text" xml:space="preserve">
+    <value>Check for updates</value>
  </data>
-  <data name="tsbHelp.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+  <data name="tsbCheckUpdate.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
    <value>ImageAboveText</value>
  </data>
+  <data name="toolStripSeparator10.Size" type="System.Drawing.Size, System.Drawing">
+    <value>6, 56</value>
+  </data>
  <data name="tsbAbout.Size" type="System.Drawing.Size, System.Drawing">
    <value>187, 22</value>
  </data>
@@ -859,6 +859,18 @@
  <data name="tsbLanguageZhHans.Text" xml:space="preserve">
    <value>语言-[中文简体]</value>
  </data>
+  <data name="tsbHelp.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>Magenta</value>
+  </data>
+  <data name="tsbHelp.Size" type="System.Drawing.Size, System.Drawing">
+    <value>48, 53</value>
+  </data>
+  <data name="tsbHelp.Text" xml:space="preserve">
+    <value>Help</value>
+  </data>
+  <data name="tsbHelp.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
+    <value>ImageAboveText</value>
+  </data>
  <data name="tsbPromotion.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
    <value>Magenta</value>
  </data>
@@ -893,6 +905,27 @@
  <data name="tsbClose.TextImageRelation" type="System.Windows.Forms.TextImageRelation, System.Windows.Forms">
    <value>ImageAboveText</value>
  </data>
+  <data name="tsMain.Location" type="System.Drawing.Point, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <data name="tsMain.Size" type="System.Drawing.Size, System.Drawing">
+    <value>952, 56</value>
+  </data>
+  <data name="tsMain.TabIndex" type="System.Int32, mscorlib">
+    <value>6</value>
+  </data>
+  <data name="&gt;&gt;tsMain.Name" xml:space="preserve">
+    <value>tsMain</value>
+  </data>
+  <data name="&gt;&gt;tsMain.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStrip, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;tsMain.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;tsMain.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
@@ -903,7 +936,7 @@
    <value>6, 12</value>
  </data>
  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>904, 593</value>
+    <value>952, 593</value>
  </data>
  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>4, 4, 4, 4</value>
@@ -1025,6 +1058,18 @@
  <data name="&gt;&gt;menuPingServer.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;menuTcpingServer.Name" xml:space="preserve">
+    <value>menuTcpingServer</value>
+  </data>
+  <data name="&gt;&gt;menuTcpingServer.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;menuRealPingServer.Name" xml:space="preserve">
+    <value>menuRealPingServer</value>
+  </data>
+  <data name="&gt;&gt;menuRealPingServer.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;menuSpeedServer.Name" xml:space="preserve">
    <value>menuSpeedServer</value>
  </data>
@@ -1145,12 +1190,6 @@
  <data name="&gt;&gt;menuExit.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;bgwPing.Name" xml:space="preserve">
-    <value>bgwPing</value>
-  </data>
-  <data name="&gt;&gt;bgwPing.Type" xml:space="preserve">
-    <value>System.ComponentModel.BackgroundWorker, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="&gt;&gt;bgwScan.Name" xml:space="preserve">
    <value>bgwScan</value>
  </data>
@@ -119,151 +119,157 @@
  </resheader>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="menuAddVmessServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuAddVmessServer.Text" xml:space="preserve">
    <value>添加[VMess]服务器</value>
  </data>
  <data name="menuAddShadowsocksServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuAddShadowsocksServer.Text" xml:space="preserve">
    <value>添加[Shadowsocks]服务器</value>
  </data>
  <data name="menuAddSocksServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuAddSocksServer.Text" xml:space="preserve">
    <value>添加[Socks]服务器</value>
  </data>
  <data name="menuAddCustomServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuAddCustomServer.Text" xml:space="preserve">
    <value>添加自定义配置服务器</value>
  </data>
  <data name="menuAddServers.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuAddServers.Text" xml:space="preserve">
    <value>从剪贴板导入批量URL</value>
  </data>
  <data name="menuScanScreen.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuScanScreen.Text" xml:space="preserve">
    <value>扫描屏幕上的二维码</value>
  </data>
  <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>249, 6</value>
+    <value>275, 6</value>
  </data>
  <data name="menuRemoveServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuRemoveServer.Text" xml:space="preserve">
    <value>移除所选服务器(多选)   (Delete)</value>
  </data>
  <data name="menuRemoveDuplicateServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuRemoveDuplicateServer.Text" xml:space="preserve">
    <value>移除重复的服务器</value>
  </data>
  <data name="menuCopyServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuCopyServer.Text" xml:space="preserve">
    <value>复制所选服务器</value>
  </data>
  <data name="menuSetDefaultServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuSetDefaultServer.Text" xml:space="preserve">
    <value>设为活动服务器   (Enter)</value>
  </data>
  <data name="toolStripSeparator3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>249, 6</value>
+    <value>275, 6</value>
  </data>
  <data name="menuMoveTop.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuMoveTop.Text" xml:space="preserve">
    <value>上移至顶</value>
  </data>
  <data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuMoveUp.Text" xml:space="preserve">
    <value>上移      (U)</value>
  </data>
  <data name="menuMoveDown.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuMoveDown.Text" xml:space="preserve">
    <value>下移      (D)</value>
  </data>
  <data name="menuMoveBottom.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuMoveBottom.Text" xml:space="preserve">
    <value>下移至底</value>
  </data>
  <data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuSelectAll.Text" xml:space="preserve">
    <value>全选      (Ctrl+A)</value>
  </data>
  <data name="toolStripSeparator9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>249, 6</value>
+    <value>275, 6</value>
  </data>
  <data name="menuPingServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuPingServer.Text" xml:space="preserve">
-    <value>测试服务器延迟(多选)(Ctrl+P)</value>
+    <value>测试服务器延迟Ping(多选)(Ctrl+P)</value>
+  </data>
+  <data name="menuTcpingServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 22</value>
+  </data>
+  <data name="menuTcpingServer.Text" xml:space="preserve">
+    <value>测试服务器延迟Tcping(多选)(Ctrl+O)</value>
+  </data>
+  <data name="menuRealPingServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>278, 22</value>
+  </data>
+  <data name="menuRealPingServer.Text" xml:space="preserve">
+    <value>测试服务器真连接延迟(多选)(Ctrl+R)</value>
  </data>
  <data name="menuSpeedServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuSpeedServer.Text" xml:space="preserve">
    <value>测试服务器速度(多选)(Ctrl+T)</value>
  </data>
  <data name="toolStripSeparator6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>249, 6</value>
+    <value>275, 6</value>
  </data>
  <data name="menuExport2ClientConfig.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuExport2ClientConfig.Text" xml:space="preserve">
    <value>导出所选服务器为客户端配置</value>
  </data>
  <data name="menuExport2ServerConfig.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuExport2ServerConfig.Text" xml:space="preserve">
    <value>导出所选服务器为服务端配置</value>
  </data>
  <data name="menuExport2ShareUrl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuExport2ShareUrl.Text" xml:space="preserve">
    <value>批量导出分享URL至剪贴板(多选)</value>
  </data>
  <data name="menuExport2SubContent.Size" type="System.Drawing.Size, System.Drawing">
-    <value>252, 22</value>
+    <value>278, 22</value>
  </data>
  <data name="menuExport2SubContent.Text" xml:space="preserve">
    <value>批量导出订阅内容至剪贴板(多选)</value>
  </data>
-  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>73, 53</value>
-  </data>
-  <data name="tsbServer.Text" xml:space="preserve">
-    <value>  服务器  </value>
-  </data>
  <data name="cmsLv.Size" type="System.Drawing.Size, System.Drawing">
-    <value>253, 490</value>
+    <value>279, 534</value>
  </data>
  <data name="lvServers.Items" mimetype="application/x-microsoft.net.object.binary.base64">
    <value>
@@ -282,6 +288,12 @@
        ZW0uRHJhd2luZy5HcmFwaGljc1VuaXQBAAAAB3ZhbHVlX18ACAMAAAADAAAACw==
 </value>
  </data>
+  <data name="tsbServer.Size" type="System.Drawing.Size, System.Drawing">
+    <value>73, 53</value>
+  </data>
+  <data name="tsbServer.Text" xml:space="preserve">
+    <value>  服务器  </value>
+  </data>
  <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
    <value>196, 164</value>
  </data>
@@ -360,14 +372,8 @@
  <data name="groupBox2.Text" xml:space="preserve">
    <value>信息</value>
  </data>
-  <data name="toolSslBlank1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>176, 17</value>
-  </data>
-  <data name="toolSslBlank2.Size" type="System.Drawing.Size, System.Drawing">
-    <value>176, 17</value>
-  </data>
-  <data name="toolSslBlank3.Size" type="System.Drawing.Size, System.Drawing">
-    <value>176, 17</value>
+  <data name="toolSslServerSpeed.Text" xml:space="preserve">
+    <value>网速显示未启用</value>
  </data>
  <data name="tsbSub.Size" type="System.Drawing.Size, System.Drawing">
    <value>61, 53</value>
@@ -395,13 +401,13 @@
  </data>
  <data name="tsbReload.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
+        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">
@@ -457,15 +463,12 @@
  </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
+        iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAySURBVFhH7c6xDQAgCEVBRnVTHU2ZABuMxV3yOvJDAAA/
+        GqfZVG6X8mg1dfUAAPBQxAZd0SJruVXHWwAAAABJRU5ErkJggg==
 </value>
  </data>
  <data name="tsbClose.Text" xml:space="preserve">
    <value>  关闭  </value>
  </data>
-  <data name="toolSslServerSpeed.Text" xml:space="preserve">
-    <value>网速显示未启用</value>
-  </data>
 </root>
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using v2rayN.Handler;
+using v2rayN.Base;

 namespace v2rayN.Forms
 {
@@ -42,6 +43,10 @@ namespace v2rayN.Forms
                cmbprotocol.Text = config.inbound[0].protocol.ToString();
                chkudpEnabled.Checked = config.inbound[0].udpEnabled;
                chksniffingEnabled.Checked = config.inbound[0].sniffingEnabled;
+
+                txtlocalPort2.Text = "socks + 1";
+                cmbprotocol2.Text = Global.InboundHttp;
+
                if (config.inbound.Count > 1)
                {
                    txtlocalPort2.Text = config.inbound[1].localPort.ToString();
@@ -377,8 +382,8 @@ namespace v2rayN.Forms
            for (int k = 0; k < lstUrl.Count; k++)
            {
                var txt = lstTxt[k];
-                V2rayUpdateHandle v2rayUpdateHandle3 = new V2rayUpdateHandle();
-                v2rayUpdateHandle3.UpdateCompleted += (sender2, args) =>
+                DownloadHandle downloadHandle = new DownloadHandle();
+                downloadHandle.UpdateCompleted += (sender2, args) =>
                {
                    if (args.Success)
                    {
@@ -394,12 +399,12 @@ namespace v2rayN.Forms
                        AppendText(false, args.Msg);
                    }
                };
-                v2rayUpdateHandle3.Error += (sender2, args) =>
+                downloadHandle.Error += (sender2, args) =>
                {
                    AppendText(true, args.GetException().Message);
                };

-                v2rayUpdateHandle3.WebDownloadString(lstUrl[k]);
+                downloadHandle.WebDownloadString(lstUrl[k]);
            }
        }
        void AppendText(bool notify, string text)
@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Forms;
+using v2rayN.Base;
 using v2rayN.Mode;

 namespace v2rayN.Forms
@@ -18,6 +18,7 @@ namespace v2rayN
        /// SpeedTestUrl
        /// </summary>
        public const string SpeedTestUrl = @"http://speedtest-sfo2.digitalocean.com/10mb.test";
+        public const string SpeedPingTestUrl = @"https://www.google.com/generate_204";

        /// <summary>
        /// CustomRoutingListUrl
@@ -95,6 +96,18 @@ namespace v2rayN
        /// 阻止 tag值
        /// </summary>
        public const string blockTag = "block";
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        public const string StreamSecurity = "tls";
+
+        public const string InboundSocks = "socks";
+        public const string InboundHttp = "http";
+        public const string Loopback = "127.0.0.1";
+        public const string InboundAPITagName = "api";
+        public const string InboundAPIProtocal = "dokodemo-door";
+

        /// <summary>
        /// vmess
@@ -141,12 +154,6 @@ namespace v2rayN
        /// </summary>
        public const string CustomIconName = "v2rayN.ico";

-
-        public const string InboundAPITagName = "api";
-        public const string InboundProxyTagName = "proxy";
-        public const string Loopback = "127.0.0.1";
-        public const string InboundAPIProtocal = "dokodemo-door";
-     
        public enum StatisticsFreshRate
        {
            quick = 1000,
@@ -171,17 +178,17 @@ namespace v2rayN
        public static bool sysAgent { get; set; }

        /// <summary>
-        /// socks端口号
+        /// socks端口
        /// </summary>
        public static int socksPort { get; set; }

        /// <summary>
-        /// 全局代理端口(http)
+        /// http端口
        /// </summary>
-        public static int sysAgentPort { get; set; }
+        public static int httpPort { get; set; }

        /// <summary>
-        /// PAC监听端口号
+        /// PAC端口
        /// </summary>
        public static int pacPort { get; set; }

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net;
 using v2rayN.Mode;
+using v2rayN.Base;

 namespace v2rayN.Handler
 {
@@ -56,7 +57,7 @@ namespace v2rayN.Handler
            {
                config.inbound = new List<InItem>();
                InItem inItem = new InItem();
-                inItem.protocol = "socks";
+                inItem.protocol = Global.InboundSocks;
                inItem.localPort = 10808;
                inItem.udpEnabled = true;
                inItem.sniffingEnabled = true;
@@ -75,7 +76,7 @@ namespace v2rayN.Handler
                //http协议不由core提供,只保留socks
                if (config.inbound.Count > 0)
                {
-                    config.inbound[0].protocol = "socks";
+                    config.inbound[0].protocol = Global.InboundSocks;
                }
            }
            //路由规则
@@ -1,19 +1,15 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Net;
-using System.Text;
-using Newtonsoft.Json;
+using v2rayN.Base;
 using v2rayN.Mode;
-using v2rayN.Properties;
-using v2rayN.HttpProxyHandler;

 namespace v2rayN.Handler
 {
    /// <summary>
-    ///Update V2ray Core 
+    ///Download
    /// </summary>
-    class V2rayUpdateHandle
+    class DownloadHandle
    {
        public event EventHandler<ResultEventArgs> AbsoluteCompleted;

@@ -23,7 +19,10 @@ namespace v2rayN.Handler

        public string DownloadFileName
        {
-            get { return "v2ray-windows.zip"; }
+            get
+            {
+                return "v2ray-windows.zip";
+            }
        }

        public class ResultEventArgs : EventArgs
@@ -45,15 +44,16 @@ namespace v2rayN.Handler
        private long totalBytesToReceive = 0;
        private DateTime totalDatetime = new DateTime();

+
        public void AbsoluteV2rayCore(Config config)
        {
            ServicePointManager.SecurityProtocol = (SecurityProtocolType)3072; //TLS 1.2
            ServicePointManager.DefaultConnectionLimit = 256;
            WebRequest request = WebRequest.Create(latestUrl);
-            request.BeginGetResponse(new AsyncCallback(OnResponse), request);
+            request.BeginGetResponse(new AsyncCallback(OnResponseV2rayCore), request);
        }

-        private void OnResponse(IAsyncResult ar)
+        private void OnResponseV2rayCore(IAsyncResult ar)
        {
            try
            {
@@ -87,7 +87,7 @@ namespace v2rayN.Handler
        }


-        public void DownloadFileAsync(Config config, string url)
+        public void DownloadFileAsync(Config config, string url, WebProxy webProxy)
        {
            try
            {
@@ -95,12 +95,17 @@ namespace v2rayN.Handler
                ServicePointManager.DefaultConnectionLimit = 256;
                if (UpdateCompleted != null)
                {
-                    UpdateCompleted(this, new ResultEventArgs(false, url));
+                    UpdateCompleted(this, new ResultEventArgs(false, "Downloading..."));
                }

                progressPercentage = -1;

                WebClientEx ws = new WebClientEx();
+                if (webProxy != null)
+                {
+                    ws.Proxy = webProxy;// new WebProxy(Global.Loopback, Global.httpPort);
+                }
+
                ws.DownloadFileCompleted += ws_DownloadFileCompleted;
                ws.DownloadProgressChanged += ws_DownloadProgressChanged;
                ws.DownloadFileAsync(new Uri(url), Utils.GetPath(DownloadFileName));
@@ -128,7 +133,7 @@ namespace v2rayN.Handler
                if (progressPercentage != e.ProgressPercentage && e.ProgressPercentage % 10 == 0)
                {
                    progressPercentage = e.ProgressPercentage;
-                    string msg = string.Format("......{0}%", e.ProgressPercentage);
+                    string msg = string.Format("...{0}%", e.ProgressPercentage);
                    UpdateCompleted(this, new ResultEventArgs(false, msg));
                }
            }
@@ -210,5 +215,7 @@ namespace v2rayN.Handler
                    Error(this, new ErrorEventArgs(ex));
            }
        }
+
+
    }
 }
@@ -0,0 +1,307 @@
+using Grpc.Core;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using v2rayN.Mode;
+
+namespace v2rayN.Handler
+{
+    class SpeedtestHandler
+    {
+        private DownloadHandle downloadHandle2;
+        private Config _config;
+        private V2rayHandler _v2rayHandler;
+        private List<int> _selecteds;
+        private Thread _workThread;
+        Action<int, string> _updateFunc;
+
+        private int testCounter = 0;
+        private int ItemIndex
+        {
+            get
+            {
+                return _selecteds[testCounter - 1];
+            }
+        }
+
+        public SpeedtestHandler(ref Config config, ref V2rayHandler v2rayHandler, List<int> selecteds, string actionType, Action<int, string> update)
+        {
+            _config = config;
+            _v2rayHandler = v2rayHandler;
+            _selecteds = selecteds;
+            _updateFunc = update;
+
+            if (actionType == "ping")
+            {
+                _workThread = new Thread(new ThreadStart(RunPing));
+                _workThread.Start();
+            }
+            if (actionType == "tcping")
+            {
+                _workThread = new Thread(new ThreadStart(RunTcping));
+                _workThread.Start();
+            }
+            else if (actionType == "realping")
+            {
+                _workThread = new Thread(new ThreadStart(RunRealPing));
+                _workThread.Start();
+            }
+            else if (actionType == "speedtest")
+            {
+                RunSpeedTest();
+            }
+        }
+
+        public void Close()
+        {
+            try
+            {
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void RunPing()
+        {
+            try
+            {
+                for (int k = 0; k < _selecteds.Count; k++)
+                {
+                    int index = _selecteds[k];
+                    if (_config.vmess[index].configType == (int)EConfigType.Custom)
+                    {
+                        continue;
+                    }
+                    try
+                    {
+                        long time = Utils.Ping(_config.vmess[index].address);
+                        _updateFunc(index, string.Format("{0}ms", time));
+                    }
+                    catch (Exception ex)
+                    {
+                        Utils.SaveLog(ex.Message, ex);
+                    }
+                }
+
+                Thread.Sleep(100);
+
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void RunTcping()
+        {
+            try
+            {
+                for (int k = 0; k < _selecteds.Count; k++)
+                {
+                    int index = _selecteds[k];
+                    if (_config.vmess[index].configType == (int)EConfigType.Custom)
+                    {
+                        continue;
+                    }
+                    try
+                    {
+                        var time = GetTcpingTime(_config.vmess[index].address, _config.vmess[index].port);
+                        _updateFunc(index, string.Format("{0}ms", time));
+                    }
+                    catch (Exception ex)
+                    {
+                        Utils.SaveLog(ex.Message, ex);
+                    }
+                }
+
+                Thread.Sleep(100);
+
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void RunRealPing()
+        {
+            try
+            {
+                string msg = string.Empty;
+
+                Global.reloadV2ray = true;
+                _v2rayHandler.LoadV2ray(_config, _selecteds);
+
+                var httpPort = _config.GetLocalPort("speedtest");
+                for (int k = 0; k < _selecteds.Count; k++)
+                {
+                    int index = _selecteds[k];
+                    if (_config.vmess[index].configType == (int)EConfigType.Custom)
+                    {
+                        continue;
+                    }
+
+                    try
+                    {
+                        var webProxy = new WebProxy(Global.Loopback, httpPort + index);
+                        int responseTime = -1;
+                        var status = GetRealPingTime(Global.SpeedPingTestUrl, webProxy, out responseTime);
+                        if (!Utils.IsNullOrEmpty(status))
+                        {
+                            _updateFunc(index, string.Format("{0}", status));
+                        }
+                        else
+                        {
+                            _updateFunc(index, string.Format("{0}ms", responseTime));
+                        }
+                    }
+                    catch (Exception ex)
+                    {
+                        Utils.SaveLog(ex.Message, ex);
+                    }
+                    Thread.Sleep(100);
+                }
+
+                Global.reloadV2ray = true;
+                _v2rayHandler.LoadV2ray(_config);
+                Thread.Sleep(100);
+
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        private void RunSpeedTest()
+        {
+            if (_config.vmess.Count <= 0)
+            {
+                return;
+            }
+
+            Global.reloadV2ray = true;
+            _v2rayHandler.LoadV2ray(_config, _selecteds);
+
+            string url = Global.SpeedTestUrl;
+            testCounter = 0;
+            if (downloadHandle2 == null)
+            {
+                downloadHandle2 = new DownloadHandle();
+                downloadHandle2.UpdateCompleted += (sender2, args) =>
+                {
+                    if (args.Success)
+                    {
+                        _updateFunc(ItemIndex, args.Msg);
+                        if (ServerSpeedTestSub(testCounter, url) != 0)
+                        {
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        _updateFunc(ItemIndex, args.Msg);
+                    }
+                };
+                downloadHandle2.Error += (sender2, args) =>
+                {
+                    _updateFunc(ItemIndex, args.GetException().Message);
+                    if (ServerSpeedTestSub(testCounter, url) != 0)
+                    {
+                        return;
+                    }
+                };
+            }
+
+            if (ServerSpeedTestSub(testCounter, url) != 0)
+            {
+                return;
+            }
+        }
+
+        private int ServerSpeedTestSub(int index, string url)
+        {
+            if (index >= _selecteds.Count)
+            {
+                Global.reloadV2ray = true;
+                _v2rayHandler.LoadV2ray(_config);
+                return -1;
+            }
+
+            var httpPort = _config.GetLocalPort("speedtest");
+            index = _selecteds[index];
+            
+            testCounter++;
+            var webProxy = new WebProxy(Global.Loopback, httpPort + index);
+            downloadHandle2.DownloadFileAsync(_config, url, webProxy);
+
+            return 0;
+        }
+
+        private int GetTcpingTime(string url, int port)
+        {
+            var responseTime = -1;
+
+            try
+            {
+                IPHostEntry ipHostInfo = System.Net.Dns.Resolve(url);
+                IPAddress ipAddress = ipHostInfo.AddressList[0];
+
+                var timer = new Stopwatch();
+                timer.Start();
+
+                Socket clientSocket = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+                clientSocket.Connect(new IPEndPoint(ipAddress, port));
+                timer.Stop();
+                responseTime = timer.Elapsed.Milliseconds;
+                clientSocket.Close();
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+            return responseTime;
+        }
+
+        private string GetRealPingTime(string url, WebProxy webProxy, out int responseTime)
+        {
+            string msg = string.Empty;
+            responseTime = -1;
+
+            try
+            {
+                HttpWebRequest myHttpWebRequest = (HttpWebRequest)WebRequest.Create(url);
+                myHttpWebRequest.Timeout = 5000;
+                myHttpWebRequest.Proxy = webProxy;//new WebProxy(Global.Loopback, Global.httpPort);
+
+                var timer = new Stopwatch();
+                timer.Start();
+
+                HttpWebResponse myHttpWebResponse = (HttpWebResponse)myHttpWebRequest.GetResponse();
+                if (myHttpWebResponse.StatusCode != HttpStatusCode.OK
+                    && myHttpWebResponse.StatusCode != HttpStatusCode.NoContent)
+                {
+                    msg = myHttpWebResponse.StatusDescription;
+                }
+                timer.Stop();
+                responseTime = timer.Elapsed.Milliseconds;
+
+                myHttpWebResponse.Close();
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                msg = ex.Message;
+            }
+            return msg;
+
+        }
+
+
+    }
+}
@@ -23,21 +23,42 @@ namespace v2rayN.Handler
        private bool enabled_;
        public bool Enable
        {
-            get { return enabled_; }
-            set { enabled_ = value; }
+            get
+            {
+                return enabled_;
+            }
+            set
+            {
+                enabled_ = value;
+            }
        }

        public bool UpdateUI;

-        public ulong TotalUp { get; private set; }
+        public ulong TotalUp
+        {
+            get; private set;
+        }

-        public ulong TotalDown { get; private set; }
+        public ulong TotalDown
+        {
+            get; private set;
+        }

-        public List<Mode.ServerStatistics> Statistic { get; set; }
+        public List<Mode.ServerStatistics> Statistic
+        {
+            get; set;
+        }

-        public ulong Up { get; private set; }
+        public ulong Up
+        {
+            get; private set;
+        }

-        public ulong Down { get; private set; }
+        public ulong Down
+        {
+            get; private set;
+        }

        private string logPath_;

@@ -49,7 +70,7 @@ namespace v2rayN.Handler
            enabled_ = config.enableStatistics;
            UpdateUI = false;
            updateFunc_ = update;
-            logPath_ = Utils.GetPath($"{Global.StatisticLogDirectory}\\");
+            logPath_ = Utils.GetPath(Global.StatisticLogDirectory);
            Statistic = new List<Mode.ServerStatistics>();
            exitFlag_ = false;

@@ -74,7 +95,7 @@ namespace v2rayN.Handler
            {
                Global.statePort = GetFreePort();

-                channel_ = new Channel($"127.0.0.1:{Global.statePort}", ChannelCredentials.Insecure);
+                channel_ = new Channel($"{Global.Loopback}:{Global.statePort}", ChannelCredentials.Insecure);
                channel_.ConnectAsync();
                client_ = new StatsService.StatsServiceClient(channel_);
            }
@@ -171,7 +192,7 @@ namespace v2rayN.Handler
                    name = nStr[1];
                    type = nStr[3];

-                    if (name == Global.InboundProxyTagName)
+                    if (name == Global.agentTag)
                    {
                        if (type == "uplink")
                        {
@@ -213,7 +234,7 @@ namespace v2rayN.Handler
                    Utils.ToHumanReadable(TotalUp, out up_amount, out up_unit);
                    Utils.ToHumanReadable(TotalDown, out down_amount, out down_unit);

-                    overallWriter.WriteLine($"LastUpdate {DateTime.Now.ToLongDateString()} {DateTime.Now.ToLongTimeString()}");
+                    overallWriter.WriteLine($"LastUpdate {DateTime.Now.ToString("yyyy-MM-dd")} {DateTime.Now.ToLongTimeString()}");
                    overallWriter.WriteLine($"UP {string.Format("{0:f2}", up_amount)}{up_unit} {TotalUp}");
                    overallWriter.WriteLine($"DOWN {string.Format("{0:f2}", down_amount)}{down_unit} {TotalDown}");
                    foreach (var s in Statistic)
@@ -228,7 +249,7 @@ namespace v2rayN.Handler
            }

            // 当天流量记录文件
-            var dailyPath = Path.Combine(logPath_, $"{DateTime.Now.ToLongDateString()}.txt");
+            var dailyPath = Path.Combine(logPath_, $"{DateTime.Now.ToString("yyyy-MM-dd")}.txt");
            if (!File.Exists(dailyPath))
            {
                File.Create(dailyPath);
@@ -237,7 +258,7 @@ namespace v2rayN.Handler
            {
                using (var dailyWriter = new StreamWriter(dailyPath))
                {
-                    dailyWriter.WriteLine($"LastUpdate {DateTime.Now.ToLongDateString()} {DateTime.Now.ToLongTimeString()}");
+                    dailyWriter.WriteLine($"LastUpdate {DateTime.Now.ToString("yyyy-MM-dd")} {DateTime.Now.ToLongTimeString()}");
                    foreach (var s in Statistic)
                    {
                        dailyWriter.WriteLine($"* {s.name} {s.address} {s.port} {s.path} {s.host} {s.todayUp} {s.todayDown}");
@@ -261,11 +282,12 @@ namespace v2rayN.Handler
            /// UP [readable string] [amount]
            /// DOWN [readable string] [amount]
            /// 每行每个数据空格分隔
-            ///
-            var overallPath = Path.Combine(logPath_, Global.StatisticLogOverall);
-            if (File.Exists(overallPath))
+
+            try
            {
-                try
+                Utils.SaveLog(logPath_ + Global.StatisticLogOverall);
+                var overallPath = Path.Combine(logPath_, Global.StatisticLogOverall);
+                if (File.Exists(overallPath))
                {
                    using (var overallReader = new StreamReader(overallPath))
                    {
@@ -314,20 +336,22 @@ namespace v2rayN.Handler
                                }
                            }
                        }
+
                    }
                }
-                catch (Exception ex)
-                {
-                    Utils.SaveLog(ex.Message, ex);
-                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
            }

-            // 当天流量记录文件
-            var dailyPath = Path.Combine(logPath_, $"{DateTime.Now.ToLongDateString()}.txt");
-            if (File.Exists(dailyPath))
+            try
            {
-                try
+                Utils.SaveLog(logPath_ + $"{DateTime.Now.ToString("yyyy-MM-dd")}.txt");
+                var dailyPath = Path.Combine(logPath_, $"{DateTime.Now.ToString("yyyy-MM-dd")}.txt");
+                if (File.Exists(dailyPath))
                {
+
                    using (var dailyReader = new StreamReader(dailyPath))
                    {
                        while (!dailyReader.EndOfStream)
@@ -365,10 +389,10 @@ namespace v2rayN.Handler
                        }
                    }
                }
-                catch (Exception ex)
-                {
-                    Utils.SaveLog(ex.Message, ex);
-                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
            }
        }

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using v2rayN.Mode;
-using System.Net;
-using System.Text;
 using System.Linq;
+using System.Net;
+using v2rayN.Base;
+using v2rayN.Mode;

 namespace v2rayN.Handler
 {
@@ -159,7 +159,7 @@ namespace v2rayN.Handler
                }
                else
                {
-                    inbound.listen = "127.0.0.1";
+                    inbound.listen = Global.Loopback;
                }
                //开启udp
                inbound.settings.udp = config.inbound[0].udpEnabled;
@@ -443,7 +443,7 @@ namespace v2rayN.Handler
                var host = config.requestHost();

                //if tls
-                if (config.streamSecurity() == "tls")
+                if (config.streamSecurity() == Global.StreamSecurity)
                {
                    streamSettings.security = config.streamSecurity();

@@ -964,6 +964,13 @@ namespace v2rayN.Handler
                    }
                }

+                //tls
+                if (outbound.streamSettings != null
+                    && outbound.streamSettings.security != null
+                    && outbound.streamSettings.security == Global.StreamSecurity)
+                {
+                    vmessItem.streamSecurity = Global.StreamSecurity;
+                }
            }
            catch
            {
@@ -1101,6 +1108,14 @@ namespace v2rayN.Handler
                        vmessItem.requestHost = Utils.List2String(inbound.streamSettings.httpSettings.host);
                    }
                }
+
+                //tls
+                if (inbound.streamSettings != null
+                    && inbound.streamSettings.security != null
+                    && inbound.streamSettings.security == Global.StreamSecurity)
+                {
+                    vmessItem.streamSecurity = Global.StreamSecurity;
+                }
            }
            catch
            {
@@ -1350,5 +1365,90 @@ namespace v2rayN.Handler

        #endregion

+        #region Gen speedtest config
+
+
+        public static int GenerateClientSpeedtestConfig(Config config, List<int> selecteds, string fileName, out string msg)
+        {
+            msg = string.Empty;
+
+            try
+            {
+                if (config == null
+                    || config.index < 0
+                    || config.vmess.Count <= 0
+                    || config.index > config.vmess.Count - 1
+                    )
+                {
+                    msg = UIRes.I18N("CheckServerSettings");
+                    return -1;
+                }
+
+                msg = UIRes.I18N("InitialConfiguration");
+
+                string result = Utils.GetEmbedText(SampleClient);
+                if (Utils.IsNullOrEmpty(result))
+                {
+                    msg = UIRes.I18N("FailedGetDefaultConfiguration");
+                    return -1;
+                }
+
+                V2rayConfig v2rayConfig = Utils.FromJson<V2rayConfig>(result);
+                if (v2rayConfig == null)
+                {
+                    msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                    return -1;
+                }
+
+                log(config, ref v2rayConfig, false);
+                //routing(config, ref v2rayConfig);
+                dns(config, ref v2rayConfig);
+
+
+                var httpPort = config.GetLocalPort("speedtest");
+                for (int k = 0; k < selecteds.Count; k++)
+                {
+                    int index = selecteds[k];
+                    if (config.vmess[index].configType == (int)EConfigType.Custom)
+                    {
+                        continue;
+                    }
+
+                    config.index = index;
+
+                    var inbound = new Inbounds();
+                    inbound.listen = Global.Loopback;
+                    inbound.port = httpPort + index;
+                    inbound.protocol = Global.InboundHttp;
+                    inbound.tag = Global.InboundHttp + inbound.port.ToString();
+                    v2rayConfig.inbounds.Add(inbound);
+
+
+                    var v2rayConfigCopy = Utils.FromJson<V2rayConfig>(result);
+                    outbound(config, ref v2rayConfigCopy);
+                    v2rayConfigCopy.outbounds[0].tag = Global.agentTag + inbound.port.ToString();
+                    v2rayConfig.outbounds.Add(v2rayConfigCopy.outbounds[0]);
+
+                    var rule = new Mode.RulesItem();
+                    rule.inboundTag = inbound.tag;
+                    rule.outboundTag = v2rayConfigCopy.outbounds[0].tag;
+                    rule.type = "field";
+                    v2rayConfig.routing.rules.Add(rule);
+                }
+
+                Utils.ToJsonFile(v2rayConfig, fileName);
+
+                msg = string.Format(UIRes.I18N("SuccessfulConfiguration"), config.getSummary());
+            }
+            catch (Exception ex)
+            {
+                msg = UIRes.I18N("FailedGenDefaultConfiguration");
+                return -1;
+            }
+            return 0;
+        }
+
+        #endregion
+
    }
 }
@@ -52,6 +52,27 @@ namespace v2rayN.Handler
            }
        }

+        /// <summary>
+        /// 载入V2ray
+        /// </summary>
+        public void LoadV2ray(Config config, List<int> _selecteds)
+        {
+            if (Global.reloadV2ray)
+            {
+                string msg = string.Empty;
+                string fileName = Utils.GetPath(v2rayConfigRes);
+                if (V2rayConfigHandler.GenerateClientSpeedtestConfig(config, _selecteds, fileName, out msg) != 0)
+                {
+                    ShowMsg(false, msg);
+                }
+                else
+                {
+                    ShowMsg(true, msg);
+                    V2rayRestart();
+                }
+            }
+        }
+
        /// <summary>
        /// V2ray重启
        /// </summary>
@@ -118,7 +139,7 @@ namespace v2rayN.Handler
                    }
                }
                if (Utils.IsNullOrEmpty(fileName))
-                {       
+                {
                    string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2ray/v2ray-core/releases");
                    ShowMsg(true, msg);
                    return;
@@ -10,21 +10,6 @@ namespace v2rayN.HttpProxyHandler
    /// </summary>
    class HttpProxyHandle
    {
-        private static string GetTimestamp(DateTime value)
-        {
-            return value.ToString("yyyyMMddHHmmssfff");
-        }
-
-        public static void ReSetPACProxy(Config config)
-        {
-            if (config.listenerType == 2)
-            {
-                //SysProxyHandle.SetIEProxy(false, false, null, null);
-                //PACServerHandle.Stop();
-            }
-            Update(config, false);
-        }
-
        public static bool Update(Config config, bool forceDisable)
        {
            int type = config.listenerType;
@@ -38,7 +23,7 @@ namespace v2rayN.HttpProxyHandler
            {
                if (type != 0)
                {
-                    var port = Global.sysAgentPort;
+                    var port = Global.httpPort;
                    if (port <= 0)
                    {
                        return false;
@@ -46,8 +31,7 @@ namespace v2rayN.HttpProxyHandler
                    if (type == 1)
                    {
                        PACServerHandle.Stop();
-                        PACFileWatcherHandle.StopWatch();
-                        SysProxyHandle.SetIEProxy(true, true, "127.0.0.1:" + port, null);
+                        SysProxyHandle.SetIEProxy(true, true, $"{Global.Loopback}:{port}", null);
                    }
                    else if (type == 2)
                    {
@@ -55,12 +39,10 @@ namespace v2rayN.HttpProxyHandler
                        SysProxyHandle.SetIEProxy(true, false, null, pacUrl);
                        PACServerHandle.Stop();
                        PACServerHandle.Init(config);
-                        PACFileWatcherHandle.StartWatch(config);
                    }
                    else if (type == 3)
                    {
                        PACServerHandle.Stop();
-                        PACFileWatcherHandle.StopWatch();
                        SysProxyHandle.SetIEProxy(false, false, null, null);
                    }
                    else if (type == 4)
@@ -69,14 +51,12 @@ namespace v2rayN.HttpProxyHandler
                        SysProxyHandle.SetIEProxy(false, false, null, null);
                        PACServerHandle.Stop();
                        PACServerHandle.Init(config);
-                        PACFileWatcherHandle.StartWatch(config);
                    }
                }
                else
                {
                    SysProxyHandle.SetIEProxy(false, false, null, null);
                    PACServerHandle.Stop();
-                    PACFileWatcherHandle.StopWatch();
                }
            }
            catch (Exception ex)
@@ -94,7 +74,7 @@ namespace v2rayN.HttpProxyHandler
        {
            try
            {
-                int localPort = config.GetLocalPort("socks");
+                int localPort = config.GetLocalPort(Global.InboundSocks);
                if (localPort > 0)
                {
                    PrivoxyHandler.Instance.Start(localPort, config);
@@ -102,8 +82,8 @@ namespace v2rayN.HttpProxyHandler
                    {
                        Global.sysAgent = true;
                        Global.socksPort = localPort;
-                        Global.sysAgentPort = PrivoxyHandler.Instance.RunningPort;
-                        Global.pacPort = Global.sysAgentPort + 1;
+                        Global.httpPort = PrivoxyHandler.Instance.RunningPort;
+                        Global.pacPort = config.GetLocalPort("pac");
                    }
                }
            }
@@ -120,16 +100,12 @@ namespace v2rayN.HttpProxyHandler
        {
            try
            {
-                ////开启全局代理则关闭
-                //if (Global.sysAgent)
-                //{
                PrivoxyHandler.Instance.Stop();

                Global.sysAgent = false;
                Global.socksPort = 0;
-                Global.sysAgentPort = 0;
+                Global.httpPort = 0;
                Global.pacPort = 0;
-                //}
            }
            catch
            {
@@ -151,7 +127,7 @@ namespace v2rayN.HttpProxyHandler
            }
            else
            {
-                int localPort = config.GetLocalPort("socks");
+                int localPort = config.GetLocalPort(Global.InboundSocks);
                if (localPort != Global.socksPort)
                {
                    isRestart = true;
@@ -168,9 +144,7 @@ namespace v2rayN.HttpProxyHandler

        public static string GetPacUrl()
        {
-            string pacUrl = string.Format("http://127.0.0.1:{0}/pac/?t={1}", Global.pacPort,
-                          GetTimestamp(DateTime.Now));
-
+            string pacUrl = $"http://{Global.Loopback}:{Global.pacPort}/pac/?t={ DateTime.Now.ToString("HHmmss")}";
            return pacUrl;
        }
    }
@@ -1,132 +0,0 @@
-using System;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-
-namespace v2rayN.HttpProxyHandler
-{
-    public class HttpWebServerB
-    {
-        private int port;
-        private TcpListener listener;
-
-        private Func<TcpClient, string> _responderMethod;
-
-        public HttpWebServerB(int port, Func<TcpClient, string> method)
-        {
-            try
-            {
-                this.port = port;
-                this._responderMethod = method;
-
-                listener = new TcpListener(new IPEndPoint(IPAddress.Any, port));
-                listener.Server.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
-                listener.Start();
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-
-            Utils.SaveLog("WebserverB running...");
-            AsyncCallback callback = null;
-            listener.BeginAcceptTcpClient(callback = ((ares) =>
-            {
-                try
-                {
-                    if (listener != null)
-                    {
-                        TcpClient tcpClient = listener.EndAcceptTcpClient(ares);
-                        listener.BeginAcceptTcpClient(callback, null);
-
-                        if (tcpClient != null && _responderMethod != null)
-                        {
-                            string pac = _responderMethod(tcpClient);
-
-                            NetworkStream netStream = tcpClient.GetStream();
-                            if (netStream.CanRead)
-                            {
-                                // Reads NetworkStream into a byte buffer.
-                                byte[] bytes = new byte[tcpClient.ReceiveBufferSize];
-
-                                // Read can return anything from 0 to numBytesToRead. 
-                                // This method blocks until at least one byte is read.
-                                netStream.Read(bytes, 0, (int)tcpClient.ReceiveBufferSize);
-
-                                // Returns the data received from the host to the console.
-                                string returndata = Encoding.UTF8.GetString(bytes);
-                                if (!Utils.IsNullOrEmpty(returndata)
-                                    && returndata.IndexOf("/pac/") >= 0
-                                    && netStream.CanWrite)
-                                {
-                                    BinaryWriter writer = new BinaryWriter(netStream);
-                                    //writeSuccess(writer, pac);
-
-                                    Byte[] sendBytes = Encoding.UTF8.GetBytes(writeSuccess(pac));
-                                    writer.Write(sendBytes, 0, sendBytes.Length);
-                                    writer.Flush();
-
-                                    writer.Close();
-                                }
-                            }
-
-                            netStream.Close();
-                            tcpClient.Close();
-                        }
-                    }
-                }
-                catch (Exception ex)
-                {
-                    Utils.SaveLog(ex.Message, ex);
-                }
-                //Console.WriteLine("Client connected completed");
-
-            }), null);
-        }
-
-
-        public void Stop()
-        {
-            if (listener != null)
-            {
-                listener.Stop();
-                listener = null;
-            }
-        }
-        
-
-        //private static void writeSuccess(BinaryWriter writer, string pac)
-        //{
-        //    writer.Write("HTTP/1.0 200 OK");
-        //    writer.Write(Environment.NewLine);
-        //    writer.Write("Content-Type:application/x-ns-proxy-autoconfig; charset=UTF-8");
-        //    writer.Write(Environment.NewLine);
-        //    writer.Write("Content-Length: " + pac.Length);
-        //    writer.Write(Environment.NewLine);
-        //    writer.Write(Environment.NewLine);
-        //    writer.Write(pac);
-        //    writer.Flush();
-
-        //}
-
-        private static string writeSuccess(string pac)
-        {
-            StringBuilder sb = new StringBuilder();
-            string content_type = "application/x-ns-proxy-autoconfig";
-
-            sb.Append("HTTP/1.0 200 OK");
-            sb.AppendLine();
-            sb.Append(String.Format("Content-Type:{0};charset=utf-8", content_type));
-            sb.AppendLine();
-            //sb.Append("Connection: close");
-            //sb.AppendLine();
-            sb.Append(pac);
-            sb.AppendLine();
-
-            return sb.ToString();
-        }
-
-    }
-}
@@ -1,45 +0,0 @@
-using System.IO;
-using System.Windows.Forms;
-using v2rayN.Mode;
-
-namespace v2rayN.HttpProxyHandler
-{
-    /// <summary>
-    /// 提供PAC功能支持
-    /// </summary>
-    class PACFileWatcherHandle
-    {
-        private static FileSystemWatcher fileSystemWatcher;
-
-        private static long fileSize;
-
-        public static void StartWatch(Config config)
-        {
-            if (fileSystemWatcher == null)
-            {
-                fileSystemWatcher = new FileSystemWatcher(Utils.StartupPath());
-                fileSystemWatcher.Filter = "pac.txt";
-                fileSystemWatcher.NotifyFilter = NotifyFilters.Size;
-                fileSystemWatcher.Changed += (sender, args) =>
-                {
-                    var fileInfo = new FileInfo(args.FullPath);
-                    if (fileSize != fileInfo.Length)
-                    {
-                        fileSize = fileInfo.Length;
-                        HttpProxyHandle.ReSetPACProxy(config);
-                    }
-                    
-                };
-            }
-            fileSystemWatcher.EnableRaisingEvents = true;
-        }
-
-        public static void StopWatch()
-        {
-            if (fileSystemWatcher != null)
-            {
-                fileSystemWatcher.EnableRaisingEvents = false;
-            }
-        }
-    }
-}
@@ -4,6 +4,7 @@ using System.IO;
 using System.Net;
 using System.Text;
 using Newtonsoft.Json;
+using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Properties;

@@ -46,7 +47,7 @@ namespace v2rayN.HttpProxyHandler
            //{
            //    throw new Exception("未发现HTTP代理，无法设置代理更新");
            //}
-            WebClient http = new WebClient();
+            var http = new WebClientEx();
            //http.Headers.Add("Connection", "Close");
            //http.Proxy = new WebProxy(IPAddress.Loopback.ToString(), httpProxy.localPort);
            http.DownloadStringCompleted += http_DownloadStringCompleted;
@@ -75,7 +76,7 @@ namespace v2rayN.HttpProxyHandler
        public static List<string> ParseResult(string response)
        {
            byte[] bytes = Convert.FromBase64String(response);
-            string content = Encoding.ASCII.GetString(bytes);
+            string content = Encoding.UTF8.GetString(bytes);
            List<string> valid_lines = new List<string>();
            using (var sr = new StringReader(content))
            {
@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Net;
-using System.Net.Sockets;
 using System.Text;
 using v2rayN.Mode;
 using v2rayN.Properties;
 using v2rayN.Tool;
+using v2rayN.Base;

 namespace v2rayN.HttpProxyHandler
 {
@@ -19,19 +18,36 @@ namespace v2rayN.HttpProxyHandler
        private static HttpWebServer server;
        private static HttpWebServerB serverB;

-        public static void Init(Config config)
+        public static bool IsRunning
        {
-            if (Utils.IsAdministrator())
+            get
            {
-                InitServer("127.0.0.1");
-            }
-            else
-            {
-                InitServerB("127.0.0.1");
+                return (pacPort > 0);
            }
        }

-        public static void InitServer(string address)
+        public static void Init(Config config)
+        {
+            //if (InitServer("*"))
+            //{
+            //    pacPort = Global.pacPort;
+            //}
+            if (InitServer(Global.Loopback))
+            {
+                pacPort = Global.pacPort;
+            }
+            else if (InitServerB(Global.Loopback))
+            {
+                pacPort = Global.pacPort;
+            }
+            else
+            {
+                Utils.SaveLog("Webserver init failed ");
+                pacPort = 0;
+            }
+        }
+
+        private static bool InitServer(string address)
        {
            try
            {
@@ -45,13 +61,12 @@ namespace v2rayN.HttpProxyHandler

                    if (server == null)
                    {
-                        string prefixes = string.Format("http://{0}:{1}/pac/", "+", Global.pacPort);
+                        string prefixes = string.Format("http://{0}:{1}/pac/", address, Global.pacPort);
                        Utils.SaveLog("Webserver prefixes " + prefixes);

-                        HttpWebServer ws = new HttpWebServer(SendResponse, prefixes);
-                        ws.Run();
+                        server = new HttpWebServer(SendResponse, prefixes);
+                        server.Run();

-                        pacPort = Global.pacPort;
                    }
                }
                Utils.SaveLog("Webserver at " + address);
@@ -59,11 +74,12 @@ namespace v2rayN.HttpProxyHandler
            catch (Exception ex)
            {
                Utils.SaveLog("Webserver InitServer " + ex.Message);
+                return false;
            }
+            return true;
        }

-
-        public static void InitServerB(string address)
+        public static bool InitServerB(string address)
        {
            try
            {
@@ -78,22 +94,22 @@ namespace v2rayN.HttpProxyHandler
                    if (serverB == null)
                    {
                        serverB = new HttpWebServerB(Global.pacPort, SendResponse);
-                        pacPort = Global.pacPort;
                    }
                }
-                Utils.SaveLog("Webserver at " + address);
+                Utils.SaveLog("WebserverB at " + address);
            }
            catch (Exception ex)
            {
-                Utils.SaveLog("Webserver InitServer " + ex.Message);
+                Utils.SaveLog("WebserverB InitServer " + ex.Message);
+                return false;
            }
+            return true;
        }

-        public static string SendResponse(HttpListenerRequest request)
+        public static string SendResponse(string address)
        {
            try
            {
-                string address = request.LocalEndPoint.Address.ToString();
                var pac = GetPacList(address);
                return pac;
            }
@@ -103,27 +119,6 @@ namespace v2rayN.HttpProxyHandler
                return ex.Message;
            }
        }
-        
-
-        public static string SendResponse(TcpClient tcpClient)
-        {
-            try
-            {
-                var address = ((IPEndPoint)tcpClient.Client.LocalEndPoint).Address.ToString();
-                var pac = GetPacList(address);
-
-                Console.WriteLine("SendResponse addr " + address);
-                //Utils.SaveLog("SendResponse addr " + address);
-                
-                return pac;
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog(ex.Message, ex);
-            }
-            return "";
-        }
-

        public static void Stop()
        {
@@ -159,9 +154,10 @@ namespace v2rayN.HttpProxyHandler
            //}
        }

+
        private static string GetPacList(string address)
        {
-            var port = Global.sysAgentPort;
+            var port = Global.httpPort;
            if (port <= 0)
            {
                return "No port";
@@ -182,8 +178,10 @@ namespace v2rayN.HttpProxyHandler
                return pac;
            }
            catch
-            { }
+            {
+            }
            return "No pac content";
        }
+
    }
 }
@@ -24,8 +24,6 @@ namespace v2rayN.HttpProxyHandler
        private static string _uniqueConfigFile;
        private static Job _privoxyJob;
        private Process _process;
-        private int _runningPort;
-        private bool _isRunning;

        static PrivoxyHandler()
        {
@@ -66,18 +64,7 @@ namespace v2rayN.HttpProxyHandler

        public int RunningPort
        {
-            get
-            {
-                return _runningPort;
-            }
-        }
-
-        public bool IsRunning
-        {
-            get
-            {
-                return _isRunning;
-            }
+            get; set;
        }

        public void Start(int localPort, Config config)
@@ -90,16 +77,16 @@ namespace v2rayN.HttpProxyHandler
                    KillProcess(p);
                }
                string privoxyConfig = Resources.privoxy_conf;
-                _runningPort = GetFreePort(localPort);
+                RunningPort = config.GetLocalPort(Global.InboundHttp);
                privoxyConfig = privoxyConfig.Replace("__SOCKS_PORT__", localPort.ToString());
-                privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_PORT__", _runningPort.ToString());
+                privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_PORT__", RunningPort.ToString());
                if (config.allowLANConn)
                {
                    privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_IP__", "0.0.0.0");
                }
                else
                {
-                    privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_IP__", "127.0.0.1");
+                    privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_IP__", Global.Loopback);
                }
                FileManager.ByteArrayToFile(Utils.GetTempPath(_uniqueConfigFile), Encoding.UTF8.GetBytes(privoxyConfig));

@@ -123,7 +110,7 @@ namespace v2rayN.HttpProxyHandler
                 * when ss exit unexpectedly, this process will be forced killed by system.
                 */
                _privoxyJob.AddProcess(_process.Handle);
-                _isRunning = true;
+
            }
        }

@@ -134,7 +121,7 @@ namespace v2rayN.HttpProxyHandler
                KillProcess(_process);
                _process.Dispose();
                _process = null;
-                _isRunning = false;
+                RunningPort = 0;
            }
        }

@@ -191,25 +178,5 @@ namespace v2rayN.HttpProxyHandler
            }
        }

-        private int GetFreePort(int localPort)
-        {
-            int defaultPort = 8123;
-            try
-            {
-                //// TCP stack please do me a favor
-                //TcpListener l = new TcpListener(IPAddress.Loopback, 0);
-                //l.Start();
-                //var port = ((IPEndPoint)l.LocalEndpoint).Port;
-                //l.Stop();
-                //return port;
-                return localPort + 1;
-            }
-            catch (Exception ex)
-            {
-                // in case access denied
-                Utils.SaveLog(ex.Message, ex);
-                return defaultPort;
-            }
-        }
    }
 }
@@ -1,8 +1,9 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
-using Newtonsoft.Json;
+using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Properties;
 using v2rayN.Tool;
@@ -49,14 +50,14 @@ namespace v2rayN.HttpProxyHandler

        public static void SetIEProxy(bool enable, bool global, string proxyServer, string pacURL)
        {
-            Read();
+            //Read();

-            if (!_userSettings.UserSettingsRecorded)
-            {
-                // record user settings
-                ExecSysproxy("query");
-                ParseQueryStr(_queryStr);
-            }
+            //if (!_userSettings.UserSettingsRecorded)
+            //{
+            //    // record user settings
+            //    ExecSysproxy("query");
+            //    ParseQueryStr(_queryStr);
+            //}

            string arguments;
            if (enable)
@@ -71,17 +72,19 @@ namespace v2rayN.HttpProxyHandler
            else
            {
                // restore user settings
-                var flags = _userSettings.Flags;
-                var proxy_server = _userSettings.ProxyServer ?? "-";
-                var bypass_list = _userSettings.BypassList ?? "-";
-                var pac_url = _userSettings.PacUrl ?? "-";
-                arguments = string.Format("set {0} {1} {2} {3}", flags, proxy_server, bypass_list, pac_url);
+                //var flags = _userSettings.Flags;
+                //var proxy_server = _userSettings.ProxyServer ?? "-";
+                //var bypass_list = _userSettings.BypassList ?? "-";
+                //var pac_url = _userSettings.PacUrl ?? "-";
+                ////arguments = string.Format("set {0} {1} {2} {3}", flags, proxy_server, bypass_list, pac_url);
+                //set null settings
+                arguments = string.Format("set {0} {1} {2} {3}", 1, "-", "<local>", @"http://127.0.0.1");

                // have to get new settings
-                _userSettings.UserSettingsRecorded = false;
+                //_userSettings.UserSettingsRecorded = false;
            }

-            Save();
+            //Save();
            ExecSysproxy(arguments);
        }

@@ -1,22 +0,0 @@
-using System;
-using System.Net;
-
-namespace v2rayN.HttpProxyHandler
-{
-    class WebClientEx : WebClient
-    {
-        public int Timeout { get; set; }
-        public WebClientEx(int timeout = 3000)
-        {
-            Timeout = timeout;
-        }
-
-
-        protected override WebRequest GetWebRequest(Uri address)
-        {
-            var request = base.GetWebRequest(address);
-            request.Timeout = Timeout;
-            return request;
-        }
-    }
-}
@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
+using v2rayN.Base;

 namespace v2rayN.Mode
 {
@@ -13,93 +13,147 @@ namespace v2rayN.Mode
        /// <summary>
        /// 本地监听
        /// </summary>
-        public List<InItem> inbound { get; set; }
+        public List<InItem> inbound
+        {
+            get; set;
+        }

        /// <summary>
        /// 允许日志
        /// </summary>
-        public bool logEnabled { get; set; }
+        public bool logEnabled
+        {
+            get; set;
+        }

        /// <summary>
        /// 日志等级
        /// </summary>
-        public string loglevel { get; set; }
+        public string loglevel
+        {
+            get; set;
+        }

        /// <summary>
        /// 活动配置序号
        /// </summary>
-        public int index { get; set; }
+        public int index
+        {
+            get; set;
+        }

        /// <summary>
        /// vmess服务器信息
        /// </summary>
-        public List<VmessItem> vmess { get; set; }
+        public List<VmessItem> vmess
+        {
+            get; set;
+        }

        /// <summary>
        /// 允许Mux多路复用
        /// </summary>
-        public bool muxEnabled { get; set; }
+        public bool muxEnabled
+        {
+            get; set;
+        }

        /// <summary>
        /// 域名解析策略
        /// </summary>
-        public string domainStrategy { get; set; }
+        public string domainStrategy
+        {
+            get; set;
+        }

        /// <summary>
        /// 路由模式
        /// </summary>
-        public string routingMode { get; set; }
+        public string routingMode
+        {
+            get; set;
+        }

        /// <summary>
        /// 用户自定义需代理的网址或ip
        /// </summary>
-        public List<string> useragent { get; set; }
+        public List<string> useragent
+        {
+            get; set;
+        }

        /// <summary>
        /// 用户自定义直连的网址或ip
        /// </summary>
-        public List<string> userdirect { get; set; }
+        public List<string> userdirect
+        {
+            get; set;
+        }

        /// <summary>
        /// 用户自定义阻止的网址或ip
        /// </summary>
-        public List<string> userblock { get; set; }
+        public List<string> userblock
+        {
+            get; set;
+        }

        /// <summary>
        /// KcpItem
        /// </summary>
-        public KcpItem kcpItem { get; set; }
+        public KcpItem kcpItem
+        {
+            get; set;
+        }


        /// <summary>
        /// 启用Http代理
        /// </summary>
-        public bool sysAgentEnabled { get; set; }
+        public bool sysAgentEnabled
+        {
+            get; set;
+        }

        /// <summary>
        /// 监听状态 0-不改变 1-全局 2-PAC
        /// </summary>
-        public int listenerType { get; set; }
+        public int listenerType
+        {
+            get; set;
+        }

        /// <summary>
        /// 自定义GFWList url
        /// </summary>
-        public string urlGFWList { get; set; }
+        public string urlGFWList
+        {
+            get; set;
+        }

        /// <summary>
        /// 允许来自局域网的连接
        /// </summary>
-        public bool allowLANConn { get; set; }
+        public bool allowLANConn
+        {
+            get; set;
+        }

        /// <summary>
        /// 启用实时网速和流量统计
        /// </summary>
-        public bool enableStatistics { get; set; }
+        public bool enableStatistics
+        {
+            get; set;
+        }

        /// <summary>
        /// 视图刷新率
        /// </summary>
-        public int statisticsFreshRate { get; set; }
+        public int statisticsFreshRate
+        {
+            get; set;
+        }

        /// <summary>
        /// 统计数据缓存天数 [0, 30]
@@ -107,9 +161,13 @@ namespace v2rayN.Mode
        ///     * 无论如何不会关闭总流量的缓存
        /// </summary>
        private uint cacheDays;
-        public uint CacheDays {
-            get { return cacheDays; }
-            set 
+        public uint CacheDays
+        {
+            get
+            {
+                return cacheDays;
+            }
+            set
            {
                if (value < 0) cacheDays = 0;
                else if (value > 30) cacheDays = 30;
@@ -120,15 +178,24 @@ namespace v2rayN.Mode
        /// <summary>
        /// 自定义远程DNS
        /// </summary>
-        public string remoteDNS { get; set; }
+        public string remoteDNS
+        {
+            get; set;
+        }
        /// <summary>
        /// 订阅
        /// </summary>
-        public List<SubItem> subItem { get; set; }
+        public List<SubItem> subItem
+        {
+            get; set;
+        }
        /// <summary>
        /// UI
        /// </summary>
-        public UIItem uiItem { get; set; }
+        public UIItem uiItem
+        {
+            get; set;
+        }

        #region 函数

@@ -236,6 +303,19 @@ namespace v2rayN.Mode

        public int GetLocalPort(string protocol)
        {
+            if (protocol == Global.InboundHttp)
+            {
+                return GetLocalPort(Global.InboundSocks) + 1;
+            }
+            else if (protocol == "pac")
+            {
+                return GetLocalPort(Global.InboundSocks) + 2;
+            }
+            else if (protocol == "speedtest")
+            {
+                return GetLocalPort(Global.InboundSocks) + 103;
+            }
+
            int localPort = 0;
            foreach (InItem inItem in inbound)
            {
@@ -352,77 +432,125 @@ namespace v2rayN.Mode
        /// <summary>
        /// 版本(现在=2)
        /// </summary>
-        public int configVersion { get; set; }
+        public int configVersion
+        {
+            get; set;
+        }

        /// <summary>
        /// 远程服务器地址
        /// </summary>
-        public string address { get; set; }
+        public string address
+        {
+            get; set;
+        }
        /// <summary>
        /// 远程服务器端口
        /// </summary>
-        public int port { get; set; }
+        public int port
+        {
+            get; set;
+        }
        /// <summary>
        /// 远程服务器ID
        /// </summary>
-        public string id { get; set; }
+        public string id
+        {
+            get; set;
+        }
        /// <summary>
        /// 远程服务器额外ID
        /// </summary>
-        public int alterId { get; set; }
+        public int alterId
+        {
+            get; set;
+        }
        /// <summary>
        /// 本地安全策略
        /// </summary>
-        public string security { get; set; }
+        public string security
+        {
+            get; set;
+        }
        /// <summary>
        /// tcp,kcp,ws
        /// </summary>
-        public string network { get; set; }
+        public string network
+        {
+            get; set;
+        }
        /// <summary>
        /// 备注或别名
        /// </summary>
-        public string remarks { get; set; }
+        public string remarks
+        {
+            get; set;
+        }

        /// <summary>
        /// 伪装类型
        /// </summary>
-        public string headerType { get; set; }
+        public string headerType
+        {
+            get; set;
+        }

        /// <summary>
        /// 伪装的域名
        /// </summary>
-        public string requestHost { get; set; }
+        public string requestHost
+        {
+            get; set;
+        }

        /// <summary>
        /// ws h2 path
        /// </summary>
-        public string path { get; set; }
+        public string path
+        {
+            get; set;
+        }

        /// <summary>
        /// 底层传输安全
        /// </summary>
-        public string streamSecurity { get; set; }
+        public string streamSecurity
+        {
+            get; set;
+        }

        /// <summary>
        /// 是否允许不安全连接（用于客户端）
        /// </summary>
-        public string allowInsecure { get; set; }
+        public string allowInsecure
+        {
+            get; set;
+        }


        /// <summary>
        /// config type(1=normal,2=custom)
        /// </summary>
-        public int configType { get; set; }
+        public int configType
+        {
+            get; set;
+        }

        /// <summary>
        /// 
        /// </summary>
-        public string testResult { get; set; }
+        public string testResult
+        {
+            get; set;
+        }

        /// <summary>
        /// SubItem id
        /// </summary>
-        public string subid { get; set; }
+        public string subid
+        {
+            get; set;
+        }
    }

    [Serializable]
@@ -431,17 +559,26 @@ namespace v2rayN.Mode
        /// <summary>
        /// 本地监听端口
        /// </summary>
-        public int localPort { get; set; }
+        public int localPort
+        {
+            get; set;
+        }

        /// <summary>
        /// 协议，默认为socks
        /// </summary>
-        public string protocol { get; set; }
+        public string protocol
+        {
+            get; set;
+        }

        /// <summary>
        /// 允许udp
        /// </summary>
-        public bool udpEnabled { get; set; }
+        public bool udpEnabled
+        {
+            get; set;
+        }

        /// <summary>
        /// 开启流量探测
@@ -455,31 +592,52 @@ namespace v2rayN.Mode
        /// <summary>
        /// 
        /// </summary>
-        public int mtu { get; set; }
+        public int mtu
+        {
+            get; set;
+        }
        /// <summary>
        /// 
        /// </summary>
-        public int tti { get; set; }
+        public int tti
+        {
+            get; set;
+        }
        /// <summary>
        /// 
        /// </summary>
-        public int uplinkCapacity { get; set; }
+        public int uplinkCapacity
+        {
+            get; set;
+        }
        /// <summary>
        /// 
        /// </summary>
-        public int downlinkCapacity { get; set; }
+        public int downlinkCapacity
+        {
+            get; set;
+        }
        /// <summary>
        /// 
        /// </summary>
-        public bool congestion { get; set; }
+        public bool congestion
+        {
+            get; set;
+        }
        /// <summary>
        /// 
        /// </summary>
-        public int readBufferSize { get; set; }
+        public int readBufferSize
+        {
+            get; set;
+        }
        /// <summary>
        /// 
        /// </summary>
-        public int writeBufferSize { get; set; }
+        public int writeBufferSize
+        {
+            get; set;
+        }
    }


@@ -489,17 +647,26 @@ namespace v2rayN.Mode
        /// <summary>
        /// 
        /// </summary>
-        public string id { get; set; }
+        public string id
+        {
+            get; set;
+        }

        /// <summary>
        /// 备注
        /// </summary>
-        public string remarks { get; set; }
+        public string remarks
+        {
+            get; set;
+        }

        /// <summary>
        /// url
        /// </summary>
-        public string url { get; set; }
+        public string url
+        {
+            get; set;
+        }

        /// <summary>
        /// enable
@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("2.38")]
+[assembly: AssemblyFileVersion("2.46")]
@@ -19,7 +19,7 @@ namespace v2rayN.Properties {
    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
    // (以 /str 作为命令选项)，或重新生成 VS 项目。
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class Resources {
@@ -120,6 +120,16 @@ namespace v2rayN.Properties {
            }
        }
        
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap notify {
+            get {
+                object obj = ResourceManager.GetObject("notify", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
@@ -136,6 +136,9 @@
  <data name="minimize" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\minimize.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="notify" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\notify.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
  <data name="option" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\option.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -4,4 +4,5 @@ logfile v2ray_privoxy.log
 show-on-task-bar 0
 activity-animation 0
 forward-socks5 / 127.0.0.1:__SOCKS_PORT__ .
+max-client-connections 2048
 hide-console
@@ -1,10 +1,10 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
+//     此代码由工具生成。
+//     运行时版本:4.0.30319.42000
 //
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
+//     对此文件的更改可能会导致不正确的行为，并且如果
+//     重新生成代码，这些更改将会丢失。
 // </auto-generated>
 //------------------------------------------------------------------------------

@@ -13,13 +13,13 @@ namespace v2rayN.Resx {
    
    
    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    ///   一个强类型的资源类，用于查找本地化的字符串等。
    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
+    // 此类是由 StronglyTypedResourceBuilder
+    // 类通过类似于 ResGen 或 Visual Studio 的工具自动生成的。
+    // 若要添加或移除成员，请编辑 .ResX 文件，然后重新运行 ResGen
+    // (以 /str 作为命令选项)，或重新生成 VS 项目。
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
    internal class ResUI {
@@ -33,7 +33,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
+        ///   返回此类使用的缓存的 ResourceManager 实例。
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Resources.ResourceManager ResourceManager {
@@ -47,8 +47,8 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
+        ///   重写当前线程的 CurrentUICulture 属性
+        ///   重写当前线程的 CurrentUICulture 属性。
        /// </summary>
        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
        internal static global::System.Globalization.CultureInfo Culture {
@@ -61,7 +61,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Batch export subscription to clipboard successfully.
+        ///   查找类似 Batch export subscription to clipboard successfully 的本地化字符串。
        /// </summary>
        internal static string BatchExportSubscriptionSuccessfully {
            get {
@@ -70,7 +70,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Batch export share URL to clipboard successfully.
+        ///   查找类似 Batch export share URL to clipboard successfully 的本地化字符串。
        /// </summary>
        internal static string BatchExportURLSuccessfully {
            get {
@@ -79,7 +79,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Please check the server settings first.
+        ///   查找类似 Please check the server settings first 的本地化字符串。
        /// </summary>
        internal static string CheckServerSettings {
            get {
@@ -88,7 +88,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to  configuration format is incorrect.
+        ///   查找类似  configuration format is incorrect 的本地化字符串。
        /// </summary>
        internal static string ConfigurationFormatIncorrect {
            get {
@@ -97,7 +97,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Note that custom configuration relies entirely on your own configuration and does not work with all settings. The system agent is available when the socks port is equal to the port in the settings in the custom configuration inbound..
+        ///   查找类似 Note that custom configuration relies entirely on your own configuration and does not work with all settings. The system agent is available when the socks port is equal to the port in the settings in the custom configuration inbound. 的本地化字符串。
        /// </summary>
        internal static string CustomServerTips {
            get {
@@ -106,7 +106,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to DOWN.
+        ///   查找类似 DOWN 的本地化字符串。
        /// </summary>
        internal static string downloadSpeed {
            get {
@@ -115,7 +115,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Whether to download? {0}.
+        ///   查找类似 Whether to download? {0} 的本地化字符串。
        /// </summary>
        internal static string DownloadYesNo {
            get {
@@ -124,7 +124,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Failed to convert configuration file.
+        ///   查找类似 Failed to convert configuration file 的本地化字符串。
        /// </summary>
        internal static string FailedConversionConfiguration {
            get {
@@ -133,7 +133,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Failed to generate default configuration file.
+        ///   查找类似 Failed to generate default configuration file 的本地化字符串。
        /// </summary>
        internal static string FailedGenDefaultConfiguration {
            get {
@@ -142,7 +142,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to  Failed to get the default configuration.
+        ///   查找类似  Failed to get the default configuration 的本地化字符串。
        /// </summary>
        internal static string FailedGetDefaultConfiguration {
            get {
@@ -151,7 +151,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Failed to import custom configuration server.
+        ///   查找类似 Failed to import custom configuration server 的本地化字符串。
        /// </summary>
        internal static string FailedImportedCustomServer {
            get {
@@ -160,7 +160,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Failed to read configuration file.
+        ///   查找类似 Failed to read configuration file 的本地化字符串。
        /// </summary>
        internal static string FailedReadConfiguration {
            get {
@@ -169,7 +169,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Please fill in the correct format extra ID.
+        ///   查找类似 Please fill in the correct format extra ID 的本地化字符串。
        /// </summary>
        internal static string FillCorrectAlterId {
            get {
@@ -178,7 +178,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Please fill in the correct format server port.
+        ///   查找类似 Please fill in the correct format server port 的本地化字符串。
        /// </summary>
        internal static string FillCorrectServerPort {
            get {
@@ -187,7 +187,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Please fill in the KCP parameters correctly.
+        ///   查找类似 Please fill in the KCP parameters correctly 的本地化字符串。
        /// </summary>
        internal static string FillKcpParameters {
            get {
@@ -196,7 +196,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Please fill in the local listening port.
+        ///   查找类似 Please fill in the local listening port 的本地化字符串。
        /// </summary>
        internal static string FillLocalListeningPort {
            get {
@@ -205,7 +205,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Please fill in the password.
+        ///   查找类似 Please fill in the password 的本地化字符串。
        /// </summary>
        internal static string FillPassword {
            get {
@@ -214,7 +214,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Please fill in the server address.
+        ///   查找类似 Please fill in the server address 的本地化字符串。
        /// </summary>
        internal static string FillServerAddress {
            get {
@@ -223,7 +223,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Please fill in the user ID.
+        ///   查找类似 Please fill in the user ID 的本地化字符串。
        /// </summary>
        internal static string FillUUID {
            get {
@@ -232,7 +232,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to  is not the correct client configuration file, please check.
+        ///   查找类似  is not the correct client configuration file, please check 的本地化字符串。
        /// </summary>
        internal static string IncorrectClientConfiguration {
            get {
@@ -241,7 +241,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to  is not the correct configuration, please check.
+        ///   查找类似  is not the correct configuration, please check 的本地化字符串。
        /// </summary>
        internal static string Incorrectconfiguration {
            get {
@@ -250,7 +250,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to  is not the correct server configuration file, please check.
+        ///   查找类似  is not the correct server configuration file, please check 的本地化字符串。
        /// </summary>
        internal static string IncorrectServerConfiguration {
            get {
@@ -259,7 +259,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Initial Configuration.
+        ///   查找类似 Initial Configuration 的本地化字符串。
        /// </summary>
        internal static string InitialConfiguration {
            get {
@@ -268,7 +268,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Address.
+        ///   查找类似 Address 的本地化字符串。
        /// </summary>
        internal static string LvAddress {
            get {
@@ -277,7 +277,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Alias.
+        ///   查找类似 Alias 的本地化字符串。
        /// </summary>
        internal static string LvAlias {
            get {
@@ -286,7 +286,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Security.
+        ///   查找类似 Security 的本地化字符串。
        /// </summary>
        internal static string LvEncryptionMethod {
            get {
@@ -295,7 +295,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Port.
+        ///   查找类似 Port 的本地化字符串。
        /// </summary>
        internal static string LvPort {
            get {
@@ -304,7 +304,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Type.
+        ///   查找类似 Type 的本地化字符串。
        /// </summary>
        internal static string LvServiceType {
            get {
@@ -313,7 +313,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Subs.
+        ///   查找类似 Subs 的本地化字符串。
        /// </summary>
        internal static string LvSubscription {
            get {
@@ -322,7 +322,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Test Results.
+        ///   查找类似 Test Results 的本地化字符串。
        /// </summary>
        internal static string LvTestResults {
            get {
@@ -331,7 +331,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Today download traffic.
+        ///   查找类似 Today download traffic 的本地化字符串。
        /// </summary>
        internal static string LvTodayDownloadDataAmount {
            get {
@@ -340,7 +340,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Today upload traffic.
+        ///   查找类似 Today upload traffic 的本地化字符串。
        /// </summary>
        internal static string LvTodayUploadDataAmount {
            get {
@@ -349,7 +349,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Total download traffic.
+        ///   查找类似 Total download traffic 的本地化字符串。
        /// </summary>
        internal static string LvTotalDownloadDataAmount {
            get {
@@ -358,7 +358,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Total upload traffic.
+        ///   查找类似 Total upload traffic 的本地化字符串。
        /// </summary>
        internal static string LvTotalUploadDataAmount {
            get {
@@ -367,7 +367,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Transport.
+        ///   查找类似 Transport 的本地化字符串。
        /// </summary>
        internal static string LvTransportProtocol {
            get {
@@ -376,7 +376,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to MediumFresh.
+        ///   查找类似 MediumFresh 的本地化字符串。
        /// </summary>
        internal static string MediumFresh {
            get {
@@ -385,7 +385,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Clear original subscription content.
+        ///   查找类似 Clear original subscription content 的本地化字符串。
        /// </summary>
        internal static string MsgClearSubscription {
            get {
@@ -394,7 +394,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Download V2rayCore successfully.
+        ///   查找类似 Download V2rayCore successfully 的本地化字符串。
        /// </summary>
        internal static string MsgDownloadV2rayCoreSuccessfully {
            get {
@@ -403,7 +403,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Failed to import subscription content.
+        ///   查找类似 Failed to import subscription content 的本地化字符串。
        /// </summary>
        internal static string MsgFailedImportSubscription {
            get {
@@ -412,7 +412,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Get the subscription content successfully.
+        ///   查找类似 Get the subscription content successfully 的本地化字符串。
        /// </summary>
        internal static string MsgGetSubscriptionSuccessfully {
            get {
@@ -421,7 +421,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to No valid subscriptions set.
+        ///   查找类似 No valid subscriptions set 的本地化字符串。
        /// </summary>
        internal static string MsgNoValidSubscription {
            get {
@@ -430,7 +430,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to PAC update failed.
+        ///   查找类似 PAC update failed 的本地化字符串。
        /// </summary>
        internal static string MsgPACUpdateFailed {
            get {
@@ -439,7 +439,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to PAC update succeeded.
+        ///   查找类似 PAC update succeeded 的本地化字符串。
        /// </summary>
        internal static string MsgPACUpdateSuccessfully {
            get {
@@ -448,7 +448,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Resolve V2rayCore successfully.
+        ///   查找类似 Resolve V2rayCore successfully 的本地化字符串。
        /// </summary>
        internal static string MsgParsingV2rayCoreSuccessfully {
            get {
@@ -457,7 +457,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Simplify PAC Success.
+        ///   查找类似 Simplify PAC Success 的本地化字符串。
        /// </summary>
        internal static string MsgSimplifyPAC {
            get {
@@ -466,7 +466,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Start getting subscriptions.
+        ///   查找类似 Start getting subscriptions 的本地化字符串。
        /// </summary>
        internal static string MsgStartGettingSubscriptions {
            get {
@@ -475,7 +475,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Start updating PAC....
+        ///   查找类似 Start updating PAC... 的本地化字符串。
        /// </summary>
        internal static string MsgStartUpdatingPAC {
            get {
@@ -484,7 +484,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Start updating V2rayCore....
+        ///   查找类似 Start updating V2rayCore... 的本地化字符串。
        /// </summary>
        internal static string MsgStartUpdatingV2rayCore {
            get {
@@ -493,7 +493,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Subscription content decoding failed (non-BASE64 code).
+        ///   查找类似 Subscription content decoding failed (non-BASE64 code) 的本地化字符串。
        /// </summary>
        internal static string MsgSubscriptionDecodingFailed {
            get {
@@ -502,7 +502,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to is unpacking....
+        ///   查找类似 is unpacking... 的本地化字符串。
        /// </summary>
        internal static string MsgUnpacking {
            get {
@@ -511,7 +511,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Update subscription end.
+        ///   查找类似 Update subscription end 的本地化字符串。
        /// </summary>
        internal static string MsgUpdateSubscriptionEnd {
            get {
@@ -520,7 +520,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Update subscription starts.
+        ///   查找类似 Update subscription starts 的本地化字符串。
        /// </summary>
        internal static string MsgUpdateSubscriptionStart {
            get {
@@ -529,7 +529,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Update V2rayCore successfully.
+        ///   查找类似 Update V2rayCore successfully 的本地化字符串。
        /// </summary>
        internal static string MsgUpdateV2rayCoreSuccessfully {
            get {
@@ -538,7 +538,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Update V2rayCore successfully! Restarting service....
+        ///   查找类似 Update V2rayCore successfully! Restarting service... 的本地化字符串。
        /// </summary>
        internal static string MsgUpdateV2rayCoreSuccessfullyMore {
            get {
@@ -547,7 +547,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to  This feature relies on the Http global proxy, please set it correctly first..
+        ///   查找类似  This feature relies on the Http global proxy, please set it correctly first. 的本地化字符串。
        /// </summary>
        internal static string NeedHttpGlobalProxy {
            get {
@@ -556,7 +556,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Non-vmess or ss protocol.
+        ///   查找类似 Non-vmess or ss protocol 的本地化字符串。
        /// </summary>
        internal static string NonvmessOrssProtocol {
            get {
@@ -565,7 +565,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to  non-Vmess service, this feature is invalid.
+        ///   查找类似  non-Vmess service, this feature is invalid 的本地化字符串。
        /// </summary>
        internal static string NonVmessService {
            get {
@@ -574,7 +574,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to V2ray-core not found, download address: {0}.
+        ///   查找类似 V2ray-core not found, download address: {0} 的本地化字符串。
        /// </summary>
        internal static string NotFoundCore {
            get {
@@ -583,7 +583,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Scan completed, no valid QR code found.
+        ///   查找类似 Scan completed, no valid QR code found 的本地化字符串。
        /// </summary>
        internal static string NoValidQRcodeFound {
            get {
@@ -592,7 +592,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to  operation failed, please check retry.
+        ///   查找类似  operation failed, please check retry 的本地化字符串。
        /// </summary>
        internal static string OperationFailed {
            get {
@@ -601,7 +601,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Please Fill Remarks.
+        ///   查找类似 Please Fill Remarks 的本地化字符串。
        /// </summary>
        internal static string PleaseFillRemarks {
            get {
@@ -610,7 +610,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Please select the encryption method.
+        ///   查找类似 Please select the encryption method 的本地化字符串。
        /// </summary>
        internal static string PleaseSelectEncryption {
            get {
@@ -619,7 +619,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Please select an agreement.
+        ///   查找类似 Please select an agreement 的本地化字符串。
        /// </summary>
        internal static string PleaseSelectProtocol {
            get {
@@ -628,7 +628,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Please select the server first.
+        ///   查找类似 Please select the server first 的本地化字符串。
        /// </summary>
        internal static string PleaseSelectServer {
            get {
@@ -637,7 +637,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to QuickFresh.
+        ///   查找类似 QuickFresh 的本地化字符串。
        /// </summary>
        internal static string QuickFresh {
            get {
@@ -646,7 +646,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Are you sure to remove the server?.
+        ///   查找类似 Are you sure to remove the server? 的本地化字符串。
        /// </summary>
        internal static string RemoveServer {
            get {
@@ -655,7 +655,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to The client configuration file is saved at: {0}.
+        ///   查找类似 The client configuration file is saved at: {0} 的本地化字符串。
        /// </summary>
        internal static string SaveClientConfigurationIn {
            get {
@@ -664,7 +664,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to The server configuration file is saved at: {0}.
+        ///   查找类似 The server configuration file is saved at: {0} 的本地化字符串。
        /// </summary>
        internal static string SaveServerConfigurationIn {
            get {
@@ -673,7 +673,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to SlowFresh.
+        ///   查找类似 SlowFresh 的本地化字符串。
        /// </summary>
        internal static string SlowFresh {
            get {
@@ -682,7 +682,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Note: After this function relies on the Http global proxy test, please manually adjust the Http global proxy and active node!.
+        ///   查找类似 Note: After this function relies on the Http global proxy test, please manually adjust the Http global proxy and active node! 的本地化字符串。
        /// </summary>
        internal static string SpeedServerTips {
            get {
@@ -691,7 +691,16 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Start service ({0}).......
+        ///   查找类似 PAC failed to start. Pls with an administrator. 的本地化字符串。
+        /// </summary>
+        internal static string StartPacFailed {
+            get {
+                return ResourceManager.GetString("StartPacFailed", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   查找类似 Start service ({0})...... 的本地化字符串。
        /// </summary>
        internal static string StartService {
            get {
@@ -700,8 +709,8 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Successful configuration
-        ///{0}.
+        ///   查找类似 Successful configuration
+        ///{0} 的本地化字符串。
        /// </summary>
        internal static string SuccessfulConfiguration {
            get {
@@ -710,7 +719,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Successfully imported custom configuration server.
+        ///   查找类似 Successfully imported custom configuration server 的本地化字符串。
        /// </summary>
        internal static string SuccessfullyImportedCustomServer {
            get {
@@ -719,7 +728,7 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Imported bulk URL from clipboard successfully.
+        ///   查找类似 Imported bulk URL from clipboard successfully 的本地化字符串。
        /// </summary>
        internal static string SuccessfullyImportedServerViaClipboard {
            get {
@@ -728,21 +737,12 @@ namespace v2rayN.Resx {
        }
        
        /// <summary>
-        ///   Looks up a localized string similar to Scan import URL successfully.
+        ///   查找类似 Scan import URL successfully 的本地化字符串。
        /// </summary>
        internal static string SuccessfullyImportedServerViaScan {
            get {
                return ResourceManager.GetString("SuccessfullyImportedServerViaScan", resourceCulture);
            }
        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to UP.
-        /// </summary>
-        internal static string uploadSpeed {
-            get {
-                return ResourceManager.GetString("uploadSpeed", resourceCulture);
-            }
-        }
    }
 }
@@ -343,7 +343,7 @@
  <data name="LvTotalUploadDataAmount" xml:space="preserve">
    <value>Total upload traffic</value>
  </data>
-  <data name="uploadSpeed" xml:space="preserve">
-    <value>UP</value>
+  <data name="StartPacFailed" xml:space="preserve">
+    <value>PAC failed to start. Pls with an administrator.</value>
  </data>
 </root>
@@ -343,7 +343,7 @@
  <data name="LvTotalUploadDataAmount" xml:space="preserve">
    <value>总上传</value>
  </data>
-  <data name="uploadSpeed" xml:space="preserve">
-    <value>上传</value>
+  <data name="StartPacFailed" xml:space="preserve">
+    <value>PAC服务启动失败,请用管理员启动</value>
  </data>
 </root>
@@ -18,6 +18,7 @@ using ZXing;
 using ZXing.Common;
 using ZXing.QrCode;
 using System.Security.Principal;
+using v2rayN.Base;

 namespace v2rayN
 {
@@ -316,7 +317,7 @@ namespace v2rayN
            double result;
            string unit;
            ToHumanReadable(amount, out result, out unit);
-            return $"{string.Format("{0:f2}", result)}{unit}";
+            return $"{string.Format("{0:f1}", result)}{unit}";
        }

        public static void DedupServerList(List<Mode.VmessItem> source, out List<Mode.VmessItem> result)
@@ -114,6 +114,7 @@
      <HintPath>LIB\System.Memory.dll</HintPath>
      <Private>False</Private>
    </Reference>
+    <Reference Include="System.Messaging" />
    <Reference Include="System.Net" />
    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
      <SpecificVersion>False</SpecificVersion>
@@ -140,7 +141,7 @@
    <Compile Include="Forms\AddServer4Form.Designer.cs">
      <DependentUpon>AddServer4Form.cs</DependentUpon>
    </Compile>
-    <Compile Include="Forms\ListViewFlickerFree.cs">
+    <Compile Include="Base\ListViewFlickerFree.cs">
      <SubType>Component</SubType>
    </Compile>
    <Compile Include="Forms\MainForm.cs">
@@ -179,18 +180,18 @@
    <Compile Include="Forms\SubSettingControl.Designer.cs">
      <DependentUpon>SubSettingControl.cs</DependentUpon>
    </Compile>
+    <Compile Include="Handler\SpeedtestHandler.cs" />
    <Compile Include="Handler\StatisticsHandler.cs" />
-    <Compile Include="Handler\V2rayUpdateHandle.cs" />
-    <Compile Include="HttpProxyHandler\HttpWebServer.cs" />
-    <Compile Include="HttpProxyHandler\HttpWebServerB.cs" />
-    <Compile Include="HttpProxyHandler\PACFileWatcherHandle.cs" />
+    <Compile Include="Handler\DownloadHandle.cs" />
+    <Compile Include="Base\HttpWebServer.cs" />
+    <Compile Include="Base\HttpWebServerB.cs" />
    <Compile Include="HttpProxyHandler\PrivoxyHandler.cs" />
    <Compile Include="HttpProxyHandler\PACListHandle.cs" />
    <Compile Include="HttpProxyHandler\PACServerHandle.cs" />
    <Compile Include="HttpProxyHandler\ProxySetting.cs" />
    <Compile Include="HttpProxyHandler\SysProxyHandle.cs" />
    <Compile Include="HttpProxyHandler\HttpProxyHandle.cs" />
-    <Compile Include="HttpProxyHandler\WebClientEx.cs">
+    <Compile Include="Base\WebClientEx.cs">
      <SubType>Component</SubType>
    </Compile>
    <Compile Include="Mode\EMove.cs" />
@@ -207,7 +208,7 @@
      <DesignTime>True</DesignTime>
      <DependentUpon>ResUI.resx</DependentUpon>
    </Compile>
-    <Compile Include="StringEx.cs">
+    <Compile Include="Base\StringEx.cs">
      <SubType>Code</SubType>
    </Compile>
    <Compile Include="Forms\AddServerForm.cs">
@@ -425,7 +426,9 @@
    <Content Include="grpc_csharp_ext.x86.dll">
      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
    </Content>
+    <EmbeddedResource Include="LIB\netstandard.dll" />
    <Content Include="Resources\help.png" />
+    <None Include="Resources\notify.png" />
    <Content Include="Resources\privoxy_conf.txt" />
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
Author	SHA1	Message	Date
2dust	53494341fc	Update AssemblyInfo.cs	2019-10-21 10:38:15 +08:00
2dust	5aee97320b	up speedtest	2019-10-21 10:35:54 +08:00
2dust	d5c69c7838	Clean code	2019-10-18 14:49:42 +08:00
2dust	9224ea9819	up webproxy	2019-10-17 13:29:58 +08:00
2dust	a922d3c46d	Update SysProxyHandle.cs	2019-10-17 11:00:36 +08:00
2dust	b94d10d808	up speedtest	2019-10-17 09:41:46 +08:00
2dust	fe0bd5938b	Update OptionSettingForm.cs	2019-10-12 09:06:57 +08:00
2dust	0091a58796	Update OptionSettingForm.resx	2019-10-12 09:06:54 +08:00
2dust	8bbb50ceb2	mge	2019-10-11 14:15:20 +08:00