Update AssemblyInfo.cs

fix PAC

v2rayN/v2rayN/Forms/BaseForm.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Drawing;
 using System.Windows.Forms;
 using v2rayN.Mode;
 
@@ -36,5 +37,51 @@ namespace v2rayN.Forms
             }
         }
 
+        protected Icon GetNotifyIcon()
+        {
+            try
+            {
+                var index = config.sysAgentEnabled ? config.listenerType : 0;
+                if (index <= 0)
+                {
+                    return this.Icon;
+                }
+                var color = (new Color[] { Color.Red, Color.Orange, Color.Yellow, Color.Green })[index - 1];
+                var text = index.ToString();
+
+                var width = 128;
+                var height = 128;
+                //Create bitmap, kind of canvas
+                Bitmap bitmap = new Bitmap(width, height);
+
+                //var drawFont = new Font(FontFamily.Families[0], 64f, FontStyle.Bold);
+                //var drawBrush = new SolidBrush(color);
+                var pen = new Pen(color, 24);
+
+                var graphics = Graphics.FromImage(bitmap);
+                //graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.SingleBitPerPixel;
+                graphics.DrawIcon(this.Icon, 0, 0);
+                graphics.DrawEllipse(pen, new Rectangle(0, 0, width, height));
+                //graphics.DrawString(text, drawFont, drawBrush, width / 4, height / 8);
+
+                //To Save icon to disk
+                bitmap.Save(Utils.GetPath("temp_icon.ico"), System.Drawing.Imaging.ImageFormat.Icon);
+
+                Icon createdIcon = Icon.FromHandle(bitmap.GetHicon());
+
+                //drawFont.Dispose();
+                //drawBrush.Dispose();
+                pen.Dispose();
+                graphics.Dispose();
+                bitmap.Dispose();
+
+                return createdIcon;
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+                return this.Icon;
+            }
+        }
     }
 }

v2rayN/v2rayN/Forms/MainForm.Designer.cs

@@ -52,16 +52,14 @@
             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.qrCodeControl = new v2rayN.Forms.QRCodeControl();
             this.tsbServer = new System.Windows.Forms.ToolStripDropDownButton();
+            this.qrCodeControl = new v2rayN.Forms.QRCodeControl();
             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();
@@ -76,6 +74,7 @@
             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();
@@ -137,17 +136,19 @@
             // 
             // splitContainer1.Panel1
             // 
+            resources.ApplyResources(this.splitContainer1.Panel1, "splitContainer1.Panel1");
             this.splitContainer1.Panel1.Controls.Add(this.lvServers);
             // 
             // splitContainer1.Panel2
             // 
+            resources.ApplyResources(this.splitContainer1.Panel2, "splitContainer1.Panel2");
             this.splitContainer1.Panel2.Controls.Add(this.qrCodeControl);
             this.splitContainer1.SplitterMoved += new System.Windows.Forms.SplitterEventHandler(this.splitContainer1_SplitterMoved);
             // 
             // lvServers
             // 
-            this.lvServers.ContextMenuStrip = this.cmsLv;
             resources.ApplyResources(this.lvServers, "lvServers");
+            this.lvServers.ContextMenuStrip = this.cmsLv;
             this.lvServers.FullRowSelect = true;
             this.lvServers.GridLines = true;
             this.lvServers.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;
@@ -164,6 +165,7 @@
             // 
             // cmsLv
             // 
+            resources.ApplyResources(this.cmsLv, "cmsLv");
             this.cmsLv.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.cmsLv.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuAddVmessServer,
@@ -185,8 +187,6 @@
             this.menuSelectAll,
             this.toolStripSeparator9,
             this.menuPingServer,
-            this.menuTcpingServer,
-            this.menuRealPingServer,
             this.menuSpeedServer,
             this.toolStripSeparator6,
             this.menuExport2ClientConfig,
@@ -195,188 +195,175 @@
             this.menuExport2SubContent});
             this.cmsLv.Name = "cmsLv";
             this.cmsLv.OwnerItem = this.tsbServer;
-            resources.ApplyResources(this.cmsLv, "cmsLv");
             // 
             // menuAddVmessServer
             // 
-            this.menuAddVmessServer.Name = "menuAddVmessServer";
             resources.ApplyResources(this.menuAddVmessServer, "menuAddVmessServer");
+            this.menuAddVmessServer.Name = "menuAddVmessServer";
             this.menuAddVmessServer.Click += new System.EventHandler(this.menuAddVmessServer_Click);
             // 
             // menuAddShadowsocksServer
             // 
-            this.menuAddShadowsocksServer.Name = "menuAddShadowsocksServer";
             resources.ApplyResources(this.menuAddShadowsocksServer, "menuAddShadowsocksServer");
+            this.menuAddShadowsocksServer.Name = "menuAddShadowsocksServer";
             this.menuAddShadowsocksServer.Click += new System.EventHandler(this.menuAddShadowsocksServer_Click);
             // 
             // menuAddSocksServer
             // 
-            this.menuAddSocksServer.Name = "menuAddSocksServer";
             resources.ApplyResources(this.menuAddSocksServer, "menuAddSocksServer");
+            this.menuAddSocksServer.Name = "menuAddSocksServer";
             this.menuAddSocksServer.Click += new System.EventHandler(this.menuAddSocksServer_Click);
             // 
             // menuAddCustomServer
             // 
-            this.menuAddCustomServer.Name = "menuAddCustomServer";
             resources.ApplyResources(this.menuAddCustomServer, "menuAddCustomServer");
+            this.menuAddCustomServer.Name = "menuAddCustomServer";
             this.menuAddCustomServer.Click += new System.EventHandler(this.menuAddCustomServer_Click);
             // 
             // menuAddServers
             // 
-            this.menuAddServers.Name = "menuAddServers";
             resources.ApplyResources(this.menuAddServers, "menuAddServers");
+            this.menuAddServers.Name = "menuAddServers";
             this.menuAddServers.Click += new System.EventHandler(this.menuAddServers_Click);
             // 
             // menuScanScreen
             // 
-            this.menuScanScreen.Name = "menuScanScreen";
             resources.ApplyResources(this.menuScanScreen, "menuScanScreen");
+            this.menuScanScreen.Name = "menuScanScreen";
             this.menuScanScreen.Click += new System.EventHandler(this.menuScanScreen_Click);
             // 
             // toolStripSeparator1
             // 
-            this.toolStripSeparator1.Name = "toolStripSeparator1";
             resources.ApplyResources(this.toolStripSeparator1, "toolStripSeparator1");
+            this.toolStripSeparator1.Name = "toolStripSeparator1";
             // 
             // menuRemoveServer
             // 
-            this.menuRemoveServer.Name = "menuRemoveServer";
             resources.ApplyResources(this.menuRemoveServer, "menuRemoveServer");
+            this.menuRemoveServer.Name = "menuRemoveServer";
             this.menuRemoveServer.Click += new System.EventHandler(this.menuRemoveServer_Click);
             // 
             // menuRemoveDuplicateServer
             // 
-            this.menuRemoveDuplicateServer.Name = "menuRemoveDuplicateServer";
             resources.ApplyResources(this.menuRemoveDuplicateServer, "menuRemoveDuplicateServer");
+            this.menuRemoveDuplicateServer.Name = "menuRemoveDuplicateServer";
             this.menuRemoveDuplicateServer.Click += new System.EventHandler(this.menuRemoveDuplicateServer_Click);
             // 
             // menuCopyServer
             // 
-            this.menuCopyServer.Name = "menuCopyServer";
             resources.ApplyResources(this.menuCopyServer, "menuCopyServer");
+            this.menuCopyServer.Name = "menuCopyServer";
             this.menuCopyServer.Click += new System.EventHandler(this.menuCopyServer_Click);
             // 
             // menuSetDefaultServer
             // 
-            this.menuSetDefaultServer.Name = "menuSetDefaultServer";
             resources.ApplyResources(this.menuSetDefaultServer, "menuSetDefaultServer");
+            this.menuSetDefaultServer.Name = "menuSetDefaultServer";
             this.menuSetDefaultServer.Click += new System.EventHandler(this.menuSetDefaultServer_Click);
             // 
             // toolStripSeparator3
             // 
-            this.toolStripSeparator3.Name = "toolStripSeparator3";
             resources.ApplyResources(this.toolStripSeparator3, "toolStripSeparator3");
+            this.toolStripSeparator3.Name = "toolStripSeparator3";
             // 
             // menuMoveTop
             // 
-            this.menuMoveTop.Name = "menuMoveTop";
             resources.ApplyResources(this.menuMoveTop, "menuMoveTop");
+            this.menuMoveTop.Name = "menuMoveTop";
             this.menuMoveTop.Click += new System.EventHandler(this.menuMoveTop_Click);
             // 
             // menuMoveUp
             // 
-            this.menuMoveUp.Name = "menuMoveUp";
             resources.ApplyResources(this.menuMoveUp, "menuMoveUp");
+            this.menuMoveUp.Name = "menuMoveUp";
             this.menuMoveUp.Click += new System.EventHandler(this.menuMoveUp_Click);
             // 
             // menuMoveDown
             // 
-            this.menuMoveDown.Name = "menuMoveDown";
             resources.ApplyResources(this.menuMoveDown, "menuMoveDown");
+            this.menuMoveDown.Name = "menuMoveDown";
             this.menuMoveDown.Click += new System.EventHandler(this.menuMoveDown_Click);
             // 
             // menuMoveBottom
             // 
-            this.menuMoveBottom.Name = "menuMoveBottom";
             resources.ApplyResources(this.menuMoveBottom, "menuMoveBottom");
+            this.menuMoveBottom.Name = "menuMoveBottom";
             this.menuMoveBottom.Click += new System.EventHandler(this.menuMoveBottom_Click);
             // 
             // menuSelectAll
             // 
-            this.menuSelectAll.Name = "menuSelectAll";
             resources.ApplyResources(this.menuSelectAll, "menuSelectAll");
+            this.menuSelectAll.Name = "menuSelectAll";
             this.menuSelectAll.Click += new System.EventHandler(this.menuSelectAll_Click);
             // 
             // toolStripSeparator9
             // 
-            this.toolStripSeparator9.Name = "toolStripSeparator9";
             resources.ApplyResources(this.toolStripSeparator9, "toolStripSeparator9");
+            this.toolStripSeparator9.Name = "toolStripSeparator9";
             // 
             // menuPingServer
             // 
-            this.menuPingServer.Name = "menuPingServer";
             resources.ApplyResources(this.menuPingServer, "menuPingServer");
+            this.menuPingServer.Name = "menuPingServer";
             this.menuPingServer.Click += new System.EventHandler(this.menuPingServer_Click);
             // 
-            // menuTcpingServer
-            // 
-            this.menuTcpingServer.Name = "menuTcpingServer";
-            resources.ApplyResources(this.menuTcpingServer, "menuTcpingServer");
-            this.menuTcpingServer.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";
             resources.ApplyResources(this.menuSpeedServer, "menuSpeedServer");
+            this.menuSpeedServer.Name = "menuSpeedServer";
             this.menuSpeedServer.Click += new System.EventHandler(this.menuSpeedServer_Click);
             // 
             // toolStripSeparator6
             // 
-            this.toolStripSeparator6.Name = "toolStripSeparator6";
             resources.ApplyResources(this.toolStripSeparator6, "toolStripSeparator6");
+            this.toolStripSeparator6.Name = "toolStripSeparator6";
             // 
             // menuExport2ClientConfig
             // 
-            this.menuExport2ClientConfig.Name = "menuExport2ClientConfig";
             resources.ApplyResources(this.menuExport2ClientConfig, "menuExport2ClientConfig");
+            this.menuExport2ClientConfig.Name = "menuExport2ClientConfig";
             this.menuExport2ClientConfig.Click += new System.EventHandler(this.menuExport2ClientConfig_Click);
             // 
             // menuExport2ServerConfig
             // 
-            this.menuExport2ServerConfig.Name = "menuExport2ServerConfig";
             resources.ApplyResources(this.menuExport2ServerConfig, "menuExport2ServerConfig");
+            this.menuExport2ServerConfig.Name = "menuExport2ServerConfig";
             this.menuExport2ServerConfig.Click += new System.EventHandler(this.menuExport2ServerConfig_Click);
             // 
             // menuExport2ShareUrl
             // 
-            this.menuExport2ShareUrl.Name = "menuExport2ShareUrl";
             resources.ApplyResources(this.menuExport2ShareUrl, "menuExport2ShareUrl");
+            this.menuExport2ShareUrl.Name = "menuExport2ShareUrl";
             this.menuExport2ShareUrl.Click += new System.EventHandler(this.menuExport2ShareUrl_Click);
             // 
             // menuExport2SubContent
             // 
-            this.menuExport2SubContent.Name = "menuExport2SubContent";
             resources.ApplyResources(this.menuExport2SubContent, "menuExport2SubContent");
+            this.menuExport2SubContent.Name = "menuExport2SubContent";
             this.menuExport2SubContent.Click += new System.EventHandler(this.menuExport2SubContent_Click);
             // 
+            // tsbServer
+            // 
+            resources.ApplyResources(this.tsbServer, "tsbServer");
+            this.tsbServer.DropDown = this.cmsLv;
+            this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
+            this.tsbServer.Name = "tsbServer";
+            // 
             // qrCodeControl
             // 
             resources.ApplyResources(this.qrCodeControl, "qrCodeControl");
             this.qrCodeControl.Name = "qrCodeControl";
             // 
-            // tsbServer
-            // 
-            this.tsbServer.DropDown = this.cmsLv;
-            this.tsbServer.Image = global::v2rayN.Properties.Resources.server;
-            resources.ApplyResources(this.tsbServer, "tsbServer");
-            this.tsbServer.Name = "tsbServer";
-            // 
             // notifyMain
             // 
-            this.notifyMain.ContextMenuStrip = this.cmsMain;
             resources.ApplyResources(this.notifyMain, "notifyMain");
+            this.notifyMain.ContextMenuStrip = this.cmsMain;
             this.notifyMain.MouseClick += new System.Windows.Forms.MouseEventHandler(this.notifyMain_MouseClick);
             // 
             // cmsMain
             // 
-            this.cmsMain.ImageScalingSize = new System.Drawing.Size(20, 20);
             resources.ApplyResources(this.cmsMain, "cmsMain");
+            this.cmsMain.ImageScalingSize = new System.Drawing.Size(20, 20);
             this.cmsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuSysAgentEnabled,
             this.menuSysAgentMode,
@@ -393,78 +380,84 @@
             // 
             // menuSysAgentEnabled
             // 
-            this.menuSysAgentEnabled.Name = "menuSysAgentEnabled";
             resources.ApplyResources(this.menuSysAgentEnabled, "menuSysAgentEnabled");
+            this.menuSysAgentEnabled.Name = "menuSysAgentEnabled";
             this.menuSysAgentEnabled.Click += new System.EventHandler(this.menuSysAgentEnabled_Click);
             // 
             // menuSysAgentMode
             // 
+            resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode");
             this.menuSysAgentMode.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.menuGlobal,
             this.menuGlobalPAC,
             this.menuKeep,
             this.menuKeepPAC});
             this.menuSysAgentMode.Name = "menuSysAgentMode";
-            resources.ApplyResources(this.menuSysAgentMode, "menuSysAgentMode");
             // 
             // menuGlobal
             // 
-            this.menuGlobal.Name = "menuGlobal";
             resources.ApplyResources(this.menuGlobal, "menuGlobal");
+            this.menuGlobal.Name = "menuGlobal";
             this.menuGlobal.Click += new System.EventHandler(this.menuGlobal_Click);
             // 
             // menuGlobalPAC
             // 
-            this.menuGlobalPAC.Name = "menuGlobalPAC";
             resources.ApplyResources(this.menuGlobalPAC, "menuGlobalPAC");
+            this.menuGlobalPAC.Name = "menuGlobalPAC";
             this.menuGlobalPAC.Click += new System.EventHandler(this.menuGlobalPAC_Click);
             // 
             // menuKeep
             // 
-            this.menuKeep.Name = "menuKeep";
             resources.ApplyResources(this.menuKeep, "menuKeep");
+            this.menuKeep.Name = "menuKeep";
             this.menuKeep.Click += new System.EventHandler(this.menuKeep_Click);
             // 
             // menuKeepPAC
             // 
-            this.menuKeepPAC.Name = "menuKeepPAC";
             resources.ApplyResources(this.menuKeepPAC, "menuKeepPAC");
+            this.menuKeepPAC.Name = "menuKeepPAC";
             this.menuKeepPAC.Click += new System.EventHandler(this.menuKeepPAC_Click);
             // 
             // menuServers
             // 
-            this.menuServers.Name = "menuServers";
             resources.ApplyResources(this.menuServers, "menuServers");
+            this.menuServers.Name = "menuServers";
             // 
             // menuAddServers2
             // 
-            this.menuAddServers2.Name = "menuAddServers2";
             resources.ApplyResources(this.menuAddServers2, "menuAddServers2");
+            this.menuAddServers2.Name = "menuAddServers2";
             this.menuAddServers2.Click += new System.EventHandler(this.menuAddServers_Click);
             // 
             // menuScanScreen2
             // 
-            this.menuScanScreen2.Name = "menuScanScreen2";
             resources.ApplyResources(this.menuScanScreen2, "menuScanScreen2");
+            this.menuScanScreen2.Name = "menuScanScreen2";
             this.menuScanScreen2.Click += new System.EventHandler(this.menuScanScreen_Click);
             // 
             // menuCopyPACUrl
             // 
-            this.menuCopyPACUrl.Name = "menuCopyPACUrl";
             resources.ApplyResources(this.menuCopyPACUrl, "menuCopyPACUrl");
+            this.menuCopyPACUrl.Name = "menuCopyPACUrl";
             this.menuCopyPACUrl.Click += new System.EventHandler(this.menuCopyPACUrl_Click);
             // 
             // toolStripSeparator2
             // 
-            this.toolStripSeparator2.Name = "toolStripSeparator2";
             resources.ApplyResources(this.toolStripSeparator2, "toolStripSeparator2");
+            this.toolStripSeparator2.Name = "toolStripSeparator2";
             // 
             // menuExit
             // 
-            this.menuExit.Name = "menuExit";
             resources.ApplyResources(this.menuExit, "menuExit");
+            this.menuExit.Name = "menuExit";
             this.menuExit.Click += new System.EventHandler(this.menuExit_Click);
             // 
+            // 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;
@@ -473,30 +466,31 @@
             // 
             // groupBox1
             // 
-            this.groupBox1.Controls.Add(this.splitContainer1);
             resources.ApplyResources(this.groupBox1, "groupBox1");
+            this.groupBox1.Controls.Add(this.splitContainer1);
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
             // 
             // groupBox2
             // 
+            resources.ApplyResources(this.groupBox2, "groupBox2");
             this.groupBox2.Controls.Add(this.txtMsgBox);
             this.groupBox2.Controls.Add(this.ssMain);
-            resources.ApplyResources(this.groupBox2, "groupBox2");
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.TabStop = false;
             // 
             // txtMsgBox
             // 
+            resources.ApplyResources(this.txtMsgBox, "txtMsgBox");
             this.txtMsgBox.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(41)))), ((int)(((byte)(49)))), ((int)(((byte)(52)))));
             this.txtMsgBox.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            resources.ApplyResources(this.txtMsgBox, "txtMsgBox");
             this.txtMsgBox.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(226)))), ((int)(((byte)(228)))));
             this.txtMsgBox.Name = "txtMsgBox";
             this.txtMsgBox.ReadOnly = true;
             // 
             // ssMain
             // 
+            resources.ApplyResources(this.ssMain, "ssMain");
             this.ssMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.toolSslSocksPortLab,
             this.toolSslSocksPort,
@@ -509,7 +503,6 @@
             this.toolSslBlank3,
             this.toolSslServerSpeed,
             this.toolSslBlank4});
-            resources.ApplyResources(this.ssMain, "ssMain");
             this.ssMain.Name = "ssMain";
             this.ssMain.ItemClicked += new System.Windows.Forms.ToolStripItemClickedEventHandler(this.ssMain_ItemClicked);
             // 
@@ -520,8 +513,8 @@
             // 
             // toolSslSocksPort
             // 
-            this.toolSslSocksPort.Name = "toolSslSocksPort";
             resources.ApplyResources(this.toolSslSocksPort, "toolSslSocksPort");
+            this.toolSslSocksPort.Name = "toolSslSocksPort";
             // 
             // toolSslBlank1
             // 
@@ -536,8 +529,8 @@
             // 
             // toolSslHttpPort
             // 
-            this.toolSslHttpPort.Name = "toolSslHttpPort";
             resources.ApplyResources(this.toolSslHttpPort, "toolSslHttpPort");
+            this.toolSslHttpPort.Name = "toolSslHttpPort";
             // 
             // toolSslBlank2
             // 
@@ -552,8 +545,8 @@
             // 
             // toolSslPacPort
             // 
-            this.toolSslPacPort.Name = "toolSslPacPort";
             resources.ApplyResources(this.toolSslPacPort, "toolSslPacPort");
+            this.toolSslPacPort.Name = "toolSslPacPort";
             // 
             // toolSslBlank3
             // 
@@ -569,8 +562,8 @@
             // 
             // toolSslBlank4
             // 
-            this.toolSslBlank4.Name = "toolSslBlank4";
             resources.ApplyResources(this.toolSslBlank4, "toolSslBlank4");
+            this.toolSslBlank4.Name = "toolSslBlank4";
             // 
             // panel1
             // 
@@ -579,6 +572,7 @@
             // 
             // tsMain
             // 
+            resources.ApplyResources(this.tsMain, "tsMain");
             this.tsMain.ImageScalingSize = new System.Drawing.Size(32, 32);
             this.tsMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbServer,
@@ -595,51 +589,50 @@
             this.tsbPromotion,
             this.toolStripSeparator11,
             this.tsbClose});
-            resources.ApplyResources(this.tsMain, "tsMain");
             this.tsMain.Name = "tsMain";
             // 
             // toolStripSeparator4
             // 
-            this.toolStripSeparator4.Name = "toolStripSeparator4";
             resources.ApplyResources(this.toolStripSeparator4, "toolStripSeparator4");
+            this.toolStripSeparator4.Name = "toolStripSeparator4";
             // 
             // tsbSub
             // 
+            resources.ApplyResources(this.tsbSub, "tsbSub");
             this.tsbSub.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbSubSetting,
             this.tsbSubUpdate});
             this.tsbSub.Image = global::v2rayN.Properties.Resources.sub;
-            resources.ApplyResources(this.tsbSub, "tsbSub");
             this.tsbSub.Name = "tsbSub";
             // 
             // tsbSubSetting
             // 
-            this.tsbSubSetting.Name = "tsbSubSetting";
             resources.ApplyResources(this.tsbSubSetting, "tsbSubSetting");
+            this.tsbSubSetting.Name = "tsbSubSetting";
             this.tsbSubSetting.Click += new System.EventHandler(this.tsbSubSetting_Click);
             // 
             // tsbSubUpdate
             // 
-            this.tsbSubUpdate.Name = "tsbSubUpdate";
             resources.ApplyResources(this.tsbSubUpdate, "tsbSubUpdate");
+            this.tsbSubUpdate.Name = "tsbSubUpdate";
             this.tsbSubUpdate.Click += new System.EventHandler(this.tsbSubUpdate_Click);
             // 
             // toolStripSeparator8
             // 
-            this.toolStripSeparator8.Name = "toolStripSeparator8";
             resources.ApplyResources(this.toolStripSeparator8, "toolStripSeparator8");
+            this.toolStripSeparator8.Name = "toolStripSeparator8";
             // 
             // tsbOptionSetting
             // 
-            this.tsbOptionSetting.Image = global::v2rayN.Properties.Resources.option;
             resources.ApplyResources(this.tsbOptionSetting, "tsbOptionSetting");
+            this.tsbOptionSetting.Image = global::v2rayN.Properties.Resources.option;
             this.tsbOptionSetting.Name = "tsbOptionSetting";
             this.tsbOptionSetting.Click += new System.EventHandler(this.tsbOptionSetting_Click);
             // 
             // toolStripSeparator5
             // 
-            this.toolStripSeparator5.Name = "toolStripSeparator5";
             resources.ApplyResources(this.toolStripSeparator5, "toolStripSeparator5");
+            this.toolStripSeparator5.Name = "toolStripSeparator5";
             // 
             // tsbReload
             // 
@@ -649,95 +642,95 @@
             // 
             // toolStripSeparator7
             // 
-            this.toolStripSeparator7.Name = "toolStripSeparator7";
             resources.ApplyResources(this.toolStripSeparator7, "toolStripSeparator7");
+            this.toolStripSeparator7.Name = "toolStripSeparator7";
             // 
             // tsbCheckUpdate
             // 
+            resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate");
             this.tsbCheckUpdate.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbCheckUpdateN,
             this.tsbCheckUpdateCore,
             this.tsbCheckUpdatePACList,
             this.tsbCheckClearPACList});
             this.tsbCheckUpdate.Image = global::v2rayN.Properties.Resources.checkupdate;
-            resources.ApplyResources(this.tsbCheckUpdate, "tsbCheckUpdate");
             this.tsbCheckUpdate.Name = "tsbCheckUpdate";
             // 
             // tsbCheckUpdateN
             // 
-            this.tsbCheckUpdateN.Name = "tsbCheckUpdateN";
             resources.ApplyResources(this.tsbCheckUpdateN, "tsbCheckUpdateN");
+            this.tsbCheckUpdateN.Name = "tsbCheckUpdateN";
             this.tsbCheckUpdateN.Click += new System.EventHandler(this.tsbCheckUpdateN_Click);
             // 
             // tsbCheckUpdateCore
             // 
-            this.tsbCheckUpdateCore.Name = "tsbCheckUpdateCore";
             resources.ApplyResources(this.tsbCheckUpdateCore, "tsbCheckUpdateCore");
+            this.tsbCheckUpdateCore.Name = "tsbCheckUpdateCore";
             this.tsbCheckUpdateCore.Click += new System.EventHandler(this.tsbCheckUpdateCore_Click);
             // 
             // tsbCheckUpdatePACList
             // 
-            this.tsbCheckUpdatePACList.Name = "tsbCheckUpdatePACList";
             resources.ApplyResources(this.tsbCheckUpdatePACList, "tsbCheckUpdatePACList");
+            this.tsbCheckUpdatePACList.Name = "tsbCheckUpdatePACList";
             this.tsbCheckUpdatePACList.Click += new System.EventHandler(this.tsbCheckUpdatePACList_Click);
             // 
             // tsbCheckClearPACList
             // 
-            this.tsbCheckClearPACList.Name = "tsbCheckClearPACList";
             resources.ApplyResources(this.tsbCheckClearPACList, "tsbCheckClearPACList");
+            this.tsbCheckClearPACList.Name = "tsbCheckClearPACList";
             this.tsbCheckClearPACList.Click += new System.EventHandler(this.tsbCheckClearPACList_Click);
             // 
             // toolStripSeparator10
             // 
-            this.toolStripSeparator10.Name = "toolStripSeparator10";
             resources.ApplyResources(this.toolStripSeparator10, "toolStripSeparator10");
+            this.toolStripSeparator10.Name = "toolStripSeparator10";
             // 
             // tsbHelp
             // 
+            resources.ApplyResources(this.tsbHelp, "tsbHelp");
             this.tsbHelp.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] {
             this.tsbAbout,
             this.toolStripSeparator12,
             this.tsbLanguageDef,
             this.tsbLanguageZhHans});
             this.tsbHelp.Image = global::v2rayN.Properties.Resources.help;
-            resources.ApplyResources(this.tsbHelp, "tsbHelp");
             this.tsbHelp.Name = "tsbHelp";
             // 
             // tsbAbout
             // 
-            this.tsbAbout.Name = "tsbAbout";
             resources.ApplyResources(this.tsbAbout, "tsbAbout");
+            this.tsbAbout.Name = "tsbAbout";
             this.tsbAbout.Click += new System.EventHandler(this.tsbAbout_Click);
             // 
             // toolStripSeparator12
             // 
-            this.toolStripSeparator12.Name = "toolStripSeparator12";
             resources.ApplyResources(this.toolStripSeparator12, "toolStripSeparator12");
+            this.toolStripSeparator12.Name = "toolStripSeparator12";
             // 
             // tsbLanguageDef
             // 
-            this.tsbLanguageDef.Name = "tsbLanguageDef";
             resources.ApplyResources(this.tsbLanguageDef, "tsbLanguageDef");
+            this.tsbLanguageDef.Name = "tsbLanguageDef";
             this.tsbLanguageDef.Click += new System.EventHandler(this.tsbLanguageDef_Click);
             // 
             // tsbLanguageZhHans
             // 
-            this.tsbLanguageZhHans.Name = "tsbLanguageZhHans";
             resources.ApplyResources(this.tsbLanguageZhHans, "tsbLanguageZhHans");
+            this.tsbLanguageZhHans.Name = "tsbLanguageZhHans";
             this.tsbLanguageZhHans.Click += new System.EventHandler(this.tsbLanguageZhHans_Click);
             // 
             // tsbPromotion
             // 
+            resources.ApplyResources(this.tsbPromotion, "tsbPromotion");
             this.tsbPromotion.ForeColor = System.Drawing.Color.Black;
             this.tsbPromotion.Image = global::v2rayN.Properties.Resources.promotion;
-            resources.ApplyResources(this.tsbPromotion, "tsbPromotion");
             this.tsbPromotion.Name = "tsbPromotion";
             this.tsbPromotion.Click += new System.EventHandler(this.tsbPromotion_Click);
             // 
             // toolStripSeparator11
             // 
-            this.toolStripSeparator11.Name = "toolStripSeparator11";
             resources.ApplyResources(this.toolStripSeparator11, "toolStripSeparator11");
+            this.toolStripSeparator11.Name = "toolStripSeparator11";
             // 
             // tsbClose
             // 
@@ -791,6 +784,7 @@
         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;
@@ -866,8 +860,6 @@
         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

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Drawing;
 using System.IO;
 using System.IO.Compression;
 using System.Text;
@@ -16,6 +15,7 @@ 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;
 
@@ -41,13 +41,64 @@ 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;
@@ -351,46 +402,6 @@ 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 操作
@@ -406,7 +417,6 @@ namespace v2rayN.Forms
             }
             v2rayHandler.LoadV2ray(config);
             Global.reloadV2ray = false;
-            ConfigHandler.ToJsonFile(config);
 
             ChangeSysAgent(config.sysAgentEnabled);
             DisplayToolStatus();
@@ -489,18 +499,12 @@ namespace v2rayN.Forms
                     case Keys.A:
                         menuSelectAll_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;
+                    case Keys.P:
+                        menuPingServer_Click(null, null);
+                        break;
                 }
             }
             switch (e.KeyCode)
@@ -565,6 +569,9 @@ namespace v2rayN.Forms
             //刷新
             RefreshServers();
             LoadV2ray();
+
+            // save to config file
+            ConfigHandler.ToJsonFile(config);
         }
 
         private void menuCopyServer_Click(object sender, EventArgs e)
@@ -596,28 +603,7 @@ namespace v2rayN.Forms
         {
             GetLvSelectedIndex();
             ClearTestResult();
-            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);
+            bgwPing.RunWorkerAsync();
         }
 
         private void menuSpeedServer_Click(object sender, EventArgs e)
@@ -631,7 +617,7 @@ namespace v2rayN.Forms
             UI.Show(UIRes.I18N("SpeedServerTips"));
 
             GetLvSelectedIndex();
-            var statistics = new SpeedtestHandler(ref config, ref v2rayHandler, lvSelecteds, "speedtest", UpdateSpeedtestHandler);
+            ServerSpeedTest();
         }
 
         private void menuExport2ClientConfig_Click(object sender, EventArgs e)
@@ -1045,7 +1031,40 @@ 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;
@@ -1058,70 +1077,77 @@ namespace v2rayN.Forms
                 SetTestResult(k, "");
             }
         }
-        private void UpdateSpeedtestHandler(int index, string msg)
+
+        private int testCounter = 0;
+        private int ServerSpeedTestSub(int index, string url)
         {
-            lvServers.Invoke((MethodInvoker)delegate
+            if (index >= lvSelecteds.Count)
             {
-                lvServers.SuspendLayout();
-
-                SetTestResult(index, msg);
-
-                lvServers.ResumeLayout();
-            });
-        }
-
-        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();
-                });
-
+                return -1;
             }
-            catch (Exception ex)
+
+            if (ConfigHandler.SetDefaultServer(ref config, lvSelecteds[index]) == 0)
             {
-                Utils.SaveLog(ex.Message, ex);
+                SetTestResult(lvSelecteds[index], "testing...");
+
+                v2rayHandler.LoadV2ray(config);
+                v2rayUpdateHandle2.DownloadFileAsync(config, url);
+                testCounter++;
+                return 0;
+            }
+            else
+            {
+                return -1;
             }
         }
+        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 移动服务器
@@ -1536,7 +1562,5 @@ namespace v2rayN.Forms
 
 
         #endregion
-
-       
     }
 }

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

@@ -119,157 +119,151 @@
   </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>278, 22</value>
+    <value>252, 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>278, 22</value>
+    <value>252, 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>278, 22</value>
+    <value>252, 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>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuAddCustomServer.Text" xml:space="preserve">
     <value>添加自定义配置服务器</value>
   </data>
   <data name="menuAddServers.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 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>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuScanScreen.Text" xml:space="preserve">
     <value>扫描屏幕上的二维码</value>
   </data>
   <data name="toolStripSeparator1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 6</value>
+    <value>249, 6</value>
   </data>
   <data name="menuRemoveServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 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>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuRemoveDuplicateServer.Text" xml:space="preserve">
     <value>移除重复的服务器</value>
   </data>
   <data name="menuCopyServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuCopyServer.Text" xml:space="preserve">
     <value>复制所选服务器</value>
   </data>
   <data name="menuSetDefaultServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 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>275, 6</value>
+    <value>249, 6</value>
   </data>
   <data name="menuMoveTop.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuMoveTop.Text" xml:space="preserve">
     <value>上移至顶</value>
   </data>
   <data name="menuMoveUp.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 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>278, 22</value>
+    <value>252, 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>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuMoveBottom.Text" xml:space="preserve">
     <value>下移至底</value>
   </data>
   <data name="menuSelectAll.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 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>275, 6</value>
+    <value>249, 6</value>
   </data>
   <data name="menuPingServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuPingServer.Text" xml:space="preserve">
-    <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>
+    <value>测试服务器延迟(多选)(Ctrl+P)</value>
   </data>
   <data name="menuSpeedServer.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 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>275, 6</value>
+    <value>249, 6</value>
   </data>
   <data name="menuExport2ClientConfig.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuExport2ClientConfig.Text" xml:space="preserve">
     <value>导出所选服务器为客户端配置</value>
   </data>
   <data name="menuExport2ServerConfig.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 22</value>
   </data>
   <data name="menuExport2ServerConfig.Text" xml:space="preserve">
     <value>导出所选服务器为服务端配置</value>
   </data>
   <data name="menuExport2ShareUrl.Size" type="System.Drawing.Size, System.Drawing">
-    <value>278, 22</value>
+    <value>252, 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>278, 22</value>
+    <value>252, 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>279, 534</value>
+    <value>253, 490</value>
   </data>
   <data name="lvServers.Items" mimetype="application/x-microsoft.net.object.binary.base64">
     <value>
@@ -288,27 +282,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>
   <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>
@@ -333,6 +312,12 @@
   <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>
@@ -366,20 +351,17 @@
   <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="tsbSub.Size" type="System.Drawing.Size, System.Drawing">
-    <value>61, 53</value>
-  </data>
-  <data name="tsbSub.Text" xml:space="preserve">
-    <value>  订阅  </value>
+  <data name="groupBox2.Text" xml:space="preserve">
+    <value>信息</value>
   </data>
   <data name="tsbSubSetting.Size" type="System.Drawing.Size, System.Drawing">
     <value>124, 22</value>
@@ -393,6 +375,12 @@
   <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>
@@ -416,12 +404,6 @@
   <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>
@@ -446,15 +428,21 @@
   <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,10 +42,6 @@ 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,6 +357,9 @@
   <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>
@@ -384,6 +387,9 @@
   <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>
@@ -405,6 +411,9 @@
   <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,7 +18,6 @@ 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

@@ -1,305 +0,0 @@
-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,7 +7,6 @@ using Newtonsoft.Json;
 using v2rayN.Mode;
 using v2rayN.Properties;
 using v2rayN.HttpProxyHandler;
-using System.Diagnostics;
 
 namespace v2rayN.Handler
 {
@@ -24,10 +23,7 @@ namespace v2rayN.Handler
 
         public string DownloadFileName
         {
-            get
-            {
-                return "v2ray-windows.zip";
-            }
+            get { return "v2ray-windows.zip"; }
         }
 
         public class ResultEventArgs : EventArgs
@@ -49,16 +45,15 @@ 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(OnResponseV2rayCore), request);
+            request.BeginGetResponse(new AsyncCallback(OnResponse), request);
         }
 
-        private void OnResponseV2rayCore(IAsyncResult ar)
+        private void OnResponse(IAsyncResult ar)
         {
             try
             {
@@ -133,7 +128,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));
                 }
             }
@@ -215,7 +210,5 @@ namespace v2rayN.Handler
                     Error(this, new ErrorEventArgs(ex));
             }
         }
-
-        
     }
 }

v2rayN/v2rayN/HttpProxyHandler/HttpWebServer.cs

@@ -62,7 +62,7 @@ namespace v2rayN.HttpProxyHandler
                             {
                                 string address = ctx.Request.LocalEndPoint.Address.ToString();
                                 string rstr = _responderMethod(address);
-                                byte[] buf = Encoding.UTF8.GetBytes(rstr);
+                                byte[] buf = Encoding.ASCII.GetBytes(rstr);
                                 ctx.Response.StatusCode = 200;
                                 ctx.Response.ContentType = "application/x-ns-proxy-autoconfig";
                                 ctx.Response.ContentLength64 = buf.Length;

v2rayN/v2rayN/HttpProxyHandler/HttpWebServerB.cs

@@ -1,124 +0,0 @@
-using System;
-using System.Collections;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-
-namespace v2rayN.HttpProxyHandler
-{
-    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();
-        }
-    }
-}

v2rayN/v2rayN/HttpProxyHandler/PACListHandle.cs

@@ -75,7 +75,7 @@ namespace v2rayN.HttpProxyHandler
         public static List<string> ParseResult(string response)
         {
             byte[] bytes = Convert.FromBase64String(response);
-            string content = Encoding.UTF8.GetString(bytes);
+            string content = Encoding.ASCII.GetString(bytes);
             List<string> valid_lines = new List<string>();
             using (var sr = new StringReader(content))
             {

v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs

@@ -1,6 +1,8 @@
 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;
@@ -15,27 +17,22 @@ namespace v2rayN.HttpProxyHandler
     {
         private static int pacPort = 0;
         private static HttpWebServer server;
-        private static HttpWebServerB serverB;
 
         public static bool IsRunning
         {
             get
             {
-                return (pacPort > 0);
+                return (server != null && pacPort > 0);
             }
         }
 
         public static void Init(Config config)
         {
-            //if (InitServer("*"))
-            //{
-            //    pacPort = Global.pacPort;
-            //}
-            if (InitServer("127.0.0.1"))
+            if (InitServer("*"))
             {
                 pacPort = Global.pacPort;
             }
-            else if (InitServerB("127.0.0.1"))
+            else if (InitServer("127.0.0.1"))
             {
                 pacPort = Global.pacPort;
             }
@@ -79,34 +76,6 @@ namespace v2rayN.HttpProxyHandler
             return true;
         }
 
-        public static bool InitServerB(string address)
-        {
-            try
-            {
-                if (pacPort != Global.pacPort)
-                {
-                    if (serverB != null)
-                    {
-                        serverB.Stop();
-                        serverB = null;
-                    }
-
-                    if (serverB == null)
-                    {
-                        serverB = new HttpWebServerB(Global.pacPort, SendResponse);
-                        //pacPort = Global.pacPort;
-                    }
-                }
-                Utils.SaveLog("WebserverB at " + address);
-            }
-            catch (Exception ex)
-            {
-                Utils.SaveLog("WebserverB InitServer " + ex.Message);
-                return false;
-            }
-            return true;
-        }
-
         public static string SendResponse(string address)
         {
             try

v2rayN/v2rayN/Properties/AssemblyInfo.cs

@@ -33,4 +33,4 @@ using System.Runtime.InteropServices;
 // 方法是按如下所示使用“*”:
 //[assembly: AssemblyVersion("1.0.*")]
 //[assembly: AssemblyVersion("1.0.0")]
-[assembly: AssemblyFileVersion("2.43")]
+[assembly: AssemblyFileVersion("2.42")]

v2rayN/v2rayN/Properties/Resources.Designer.cs

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

v2rayN/v2rayN/Properties/Resources.resx

@@ -136,9 +136,6 @@
   <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>

v2rayN/v2rayN/Resources/privoxy_conf.txt

@@ -4,5 +4,4 @@ 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,11 +179,9 @@
     <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="HttpProxyHandler\PrivoxyHandler.cs" />
     <Compile Include="HttpProxyHandler\PACListHandle.cs" />
@@ -428,7 +426,6 @@
     </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" />