Update OptionSettingForm.cs

v2rayN/v2rayN/Forms/MainForm.Designer.cs

@@ -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;
@@ -782,7 +791,6 @@
         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;
     }
 }
 

v2rayN/v2rayN/Forms/MainForm.cs

@@ -16,7 +16,6 @@ namespace v2rayN.Forms
         private V2rayHandler v2rayHandler;
         private PACListHandle pacListHandle;
         private V2rayUpdateHandle v2rayUpdateHandle;
-        private V2rayUpdateHandle v2rayUpdateHandle2;
         private List<int> lvSelecteds = new List<int>();
         private StatisticsHandler statistics = null;
 
@@ -42,64 +41,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;
@@ -412,11 +360,10 @@ namespace v2rayN.Forms
                 var index = config.sysAgentEnabled ? config.listenerType : 0;
                 if (index > 0)
                 {
-                    color = (new Color[] { Color.Red, Color.Orange, Color.DarkGreen, Color.Purple })[index - 1];
+                    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;
 
@@ -542,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)
@@ -643,7 +596,28 @@ 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 menuRealPingServer_Click(object sender, EventArgs e)
+        {
+            if (!config.sysAgentEnabled || config.listenerType != 1)
+            {
+                UI.Show(UIRes.I18N("NeedHttpGlobalProxy"));
+                return;
+            }
+
+            UI.Show(UIRes.I18N("SpeedServerTips"));
+
+            GetLvSelectedIndex();
+            ClearTestResult();
+            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "realping", UpdateSpeedtestHandler);
         }
 
         private void menuSpeedServer_Click(object sender, EventArgs e)
@@ -657,7 +631,7 @@ namespace v2rayN.Forms
             UI.Show(UIRes.I18N("SpeedServerTips"));
 
             GetLvSelectedIndex();
-            ServerSpeedTest();
+            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "speedtest", UpdateSpeedtestHandler);
         }
 
         private void menuExport2ClientConfig_Click(object sender, EventArgs e)
@@ -1071,40 +1045,7 @@ namespace v2rayN.Forms
         #endregion
 
         #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;
@@ -1117,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 移动服务器
@@ -1602,6 +1536,7 @@ namespace v2rayN.Forms
 
 
         #endregion
-              
+
+       
     }
 }

v2rayN/v2rayN/Forms/MainForm.resx

@@ -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>
@@ -494,9 +506,6 @@
   <data name="notifyMain.Visible" type="System.Boolean, mscorlib">
     <value>True</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>
   <metadata name="bgwScan.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>498, 17</value>
   </metadata>
@@ -561,7 +570,7 @@
     <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>
@@ -1049,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>
@@ -1169,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>

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

@@ -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,12 +288,27 @@
         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>
   <data name="menuSysAgentEnabled.Size" type="System.Drawing.Size, System.Drawing">
     <value>195, 22</value>
   </data>
   <data name="menuSysAgentEnabled.Text" xml:space="preserve">
     <value>启用Http代理</value>
   </data>
+  <data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>195, 22</value>
+  </data>
+  <data name="menuSysAgentMode.Text" xml:space="preserve">
+    <value>Http代理模式</value>
+  </data>
   <data name="menuGlobal.Size" type="System.Drawing.Size, System.Drawing">
     <value>340, 22</value>
   </data>
@@ -312,12 +333,6 @@
   <data name="menuKeepPAC.Text" xml:space="preserve">
     <value>仅开启PAC,不自动配置PAC</value>
   </data>
-  <data name="menuSysAgentMode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>195, 22</value>
-  </data>
-  <data name="menuSysAgentMode.Text" xml:space="preserve">
-    <value>Http代理模式</value>
-  </data>
   <data name="menuServers.Size" type="System.Drawing.Size, System.Drawing">
     <value>195, 22</value>
   </data>
@@ -351,17 +366,20 @@
   <data name="menuExit.Text" xml:space="preserve">
     <value>退出</value>
   </data>
-  <data name="cmsMain.Size" type="System.Drawing.Size, System.Drawing">
-    <value>196, 164</value>
-  </data>
   <data name="groupBox1.Text" xml:space="preserve">
     <value>服务器列表</value>
   </data>
+  <data name="groupBox2.Text" xml:space="preserve">
+    <value>信息</value>
+  </data>
   <data name="toolSslServerSpeed.Text" xml:space="preserve">
     <value>网速显示未启用</value>
   </data>
-  <data name="groupBox2.Text" xml:space="preserve">
-    <value>信息</value>
+  <data name="tsbSub.Size" type="System.Drawing.Size, System.Drawing">
+    <value>61, 53</value>
+  </data>
+  <data name="tsbSub.Text" xml:space="preserve">
+    <value>  订阅  </value>
   </data>
   <data name="tsbSubSetting.Size" type="System.Drawing.Size, System.Drawing">
     <value>124, 22</value>
@@ -375,12 +393,6 @@
   <data name="tsbSubUpdate.Text" xml:space="preserve">
     <value>更新订阅</value>
   </data>
-  <data name="tsbSub.Size" type="System.Drawing.Size, System.Drawing">
-    <value>61, 53</value>
-  </data>
-  <data name="tsbSub.Text" xml:space="preserve">
-    <value>  订阅  </value>
-  </data>
   <data name="tsbOptionSetting.Size" type="System.Drawing.Size, System.Drawing">
     <value>76, 53</value>
   </data>
@@ -404,6 +416,12 @@
   <data name="tsbReload.Text" xml:space="preserve">
     <value>  重启服务  </value>
   </data>
+  <data name="tsbCheckUpdate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>85, 53</value>
+  </data>
+  <data name="tsbCheckUpdate.Text" xml:space="preserve">
+    <value>  检查更新  </value>
+  </data>
   <data name="tsbCheckUpdateN.Size" type="System.Drawing.Size, System.Drawing">
     <value>232, 22</value>
   </data>
@@ -428,21 +446,15 @@
   <data name="tsbCheckClearPACList.Text" xml:space="preserve">
     <value>简化PAC (请设置Core路由)</value>
   </data>
-  <data name="tsbCheckUpdate.Size" type="System.Drawing.Size, System.Drawing">
-    <value>85, 53</value>
-  </data>
-  <data name="tsbCheckUpdate.Text" xml:space="preserve">
-    <value>  检查更新  </value>
-  </data>
-  <data name="tsbAbout.Text" xml:space="preserve">
-    <value>关于</value>
-  </data>
   <data name="tsbHelp.Size" type="System.Drawing.Size, System.Drawing">
     <value>69, 53</value>
   </data>
   <data name="tsbHelp.Text" xml:space="preserve">
     <value>   帮助   </value>
   </data>
+  <data name="tsbAbout.Text" xml:space="preserve">
+    <value>关于</value>
+  </data>
   <data name="tsbPromotion.Size" type="System.Drawing.Size, System.Drawing">
     <value>68, 53</value>
   </data>

v2rayN/v2rayN/Forms/OptionSettingForm.cs

@@ -42,6 +42,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 = "http";
+
                 if (config.inbound.Count > 1)
                 {
                     txtlocalPort2.Text = config.inbound[1].localPort.ToString();

v2rayN/v2rayN/Forms/OptionSettingForm.resx

@@ -357,9 +357,6 @@
   <data name="cmbprotocol2.TabIndex" type="System.Int32, mscorlib">
     <value>17</value>
   </data>
-  <data name="cmbprotocol2.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
   <data name="&gt;&gt;cmbprotocol2.Name" xml:space="preserve">
     <value>cmbprotocol2</value>
   </data>
@@ -387,9 +384,6 @@
   <data name="label3.Text" xml:space="preserve">
     <value>protocol</value>
   </data>
-  <data name="label3.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
   <data name="&gt;&gt;label3.Name" xml:space="preserve">
     <value>label3</value>
   </data>
@@ -411,9 +405,6 @@
   <data name="txtlocalPort2.TabIndex" type="System.Int32, mscorlib">
     <value>14</value>
   </data>
-  <data name="txtlocalPort2.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
   <data name="&gt;&gt;txtlocalPort2.Name" xml:space="preserve">
     <value>txtlocalPort2</value>
   </data>

v2rayN/v2rayN/Global.cs

@@ -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

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -0,0 +1,305 @@
+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 V2rayUpdateHandle v2rayUpdateHandle2;
+        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(1);
+
+            }
+            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(1);
+
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        public void RunRealPing()
+        {
+            try
+            {
+                for (int k = 0; k < _selecteds.Count; k++)
+                {
+                    int index = _selecteds[k];
+                    if (_config.vmess[index].configType == (int)EConfigType.Custom)
+                    {
+                        continue;
+                    }
+                    try
+                    {
+                        if (ConfigHandler.SetDefaultServer(ref _config, index) == 0)
+                        {
+                            _v2rayHandler.LoadV2ray(_config);
+                        }
+                        else
+                        {
+                            return;
+                        }
+                        Thread.Sleep(1000 * 5);
+
+                        int responseTime = -1;
+                        var status = GetRealPingTime(Global.SpeedPingTestUrl, 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(1);
+
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+            }
+        }
+
+        private void RunSpeedTest()
+        {
+            if (_config.vmess.Count <= 0)
+            {
+                return;
+            }
+
+            string url = Global.SpeedTestUrl;
+            testCounter = 0;
+            if (v2rayUpdateHandle2 == null)
+            {
+                v2rayUpdateHandle2 = new V2rayUpdateHandle();
+                v2rayUpdateHandle2.UpdateCompleted += (sender2, args) =>
+                {
+                    if (args.Success)
+                    {
+                        _updateFunc(ItemIndex, args.Msg);
+                        if (ServerSpeedTestSub(testCounter, url) != 0)
+                        {
+                            return;
+                        }
+                    }
+                    else
+                    {
+                        _updateFunc(ItemIndex, args.Msg);
+                    }
+                };
+                v2rayUpdateHandle2.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)
+            {
+                return -1;
+            }
+
+            if (ConfigHandler.SetDefaultServer(ref _config, _selecteds[index]) == 0)
+            {
+                _v2rayHandler.LoadV2ray(_config);
+
+                testCounter++;
+
+                v2rayUpdateHandle2.DownloadFileAsync(_config, url);
+
+                return 0;
+            }
+            else
+            {
+                return -1;
+            }
+        }
+
+        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, out int responseTime)
+        {
+            string msg = string.Empty;
+            responseTime = -1;
+
+            try
+            {
+                HttpWebRequest myHttpWebRequest = (HttpWebRequest)WebRequest.Create(url);
+                myHttpWebRequest.Timeout = 5000;
+
+                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;
+
+        }
+
+
+    }
+}

v2rayN/v2rayN/Handler/V2rayUpdateHandle.cs

@@ -7,6 +7,7 @@ using Newtonsoft.Json;
 using v2rayN.Mode;
 using v2rayN.Properties;
 using v2rayN.HttpProxyHandler;
+using System.Diagnostics;
 
 namespace v2rayN.Handler
 {
@@ -23,7 +24,10 @@ namespace v2rayN.Handler
 
         public string DownloadFileName
         {
-            get { return "v2ray-windows.zip"; }
+            get
+            {
+                return "v2ray-windows.zip";
+            }
         }
 
         public class ResultEventArgs : EventArgs
@@ -45,15 +49,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
             {
@@ -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));
             }
         }
+
+        
     }
 }

v2rayN/v2rayN/Resources/privoxy_conf.txt

@@ -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

v2rayN/v2rayN/v2rayN.csproj

@@ -179,6 +179,7 @@
     <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" />