fix pac

v2rayN/v2rayN/Base/HttpWebServer.cs

@@ -3,7 +3,7 @@ using System.Net;
 using System.Text;
 using System.Threading;
 
-namespace v2rayN.HttpProxyHandler
+namespace v2rayN.Base
 {
     public class HttpWebServer
     {
@@ -61,6 +61,7 @@ namespace v2rayN.HttpProxyHandler
                             try
                             {
                                 string address = ctx.Request.LocalEndPoint.Address.ToString();
+                                Utils.SaveLog("Webserver Request " + address);
                                 string rstr = _responderMethod(address);
                                 byte[] buf = Encoding.UTF8.GetBytes(rstr);
                                 ctx.Response.StatusCode = 200;

v2rayN/v2rayN/Base/HttpWebServerB.cs

@@ -1,12 +1,10 @@
 using System;
-using System.Collections;
 using System.IO;
 using System.Net;
 using System.Net.Sockets;
-using System.Text;
 using System.Threading;
 
-namespace v2rayN.HttpProxyHandler
+namespace v2rayN.Base
 {
     public class HttpWebServerB
     {
@@ -41,8 +39,14 @@ namespace v2rayN.HttpProxyHandler
 
             while (true)
             {
+                if (!listener.Pending())
+                {
+                    continue;
+                }
+
                 TcpClient socket = listener.AcceptTcpClient();
                 Thread thread = new Thread(new ParameterizedThreadStart(ProcessThread));
+                thread.IsBackground = true;
                 thread.Start(socket);
                 Thread.Sleep(1);
             }
@@ -64,6 +68,7 @@ namespace v2rayN.HttpProxyHandler
                         if (_responderMethod != null)
                         {
                             var address = ((IPEndPoint)socket.Client.LocalEndPoint).Address.ToString();
+                            Utils.SaveLog("WebserverB Request " + address);
                             string pac = _responderMethod(address);
 
                             if (inputStream.CanWrite)

v2rayN/v2rayN/Base/ListViewFlickerFree.cs

@@ -1,7 +1,7 @@
 using System.Drawing;
 using System.Windows.Forms;
 
-namespace v2rayN.Forms
+namespace v2rayN.Base
 {
     class ListViewFlickerFree : ListView
     {

v2rayN/v2rayN/Base/StringEx.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Linq;
 
-namespace v2rayN
+namespace v2rayN.Base
 {
     static class StringEx
     {

v2rayN/v2rayN/Base/WebClientEx.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Net;
 
-namespace v2rayN.HttpProxyHandler
+namespace v2rayN.Base
 {
     class WebClientEx : WebClient
     {

v2rayN/v2rayN/Forms/MainForm.Designer.cs

@@ -31,7 +31,7 @@
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm));
             this.splitContainer1 = new System.Windows.Forms.SplitContainer();
-            this.lvServers = new v2rayN.Forms.ListViewFlickerFree();
+            this.lvServers = new v2rayN.Base.ListViewFlickerFree();
             this.cmsLv = new System.Windows.Forms.ContextMenuStrip(this.components);
             this.menuAddVmessServer = new System.Windows.Forms.ToolStripMenuItem();
             this.menuAddShadowsocksServer = new System.Windows.Forms.ToolStripMenuItem();
@@ -784,7 +784,7 @@
         private System.Windows.Forms.GroupBox groupBox1;
         private System.Windows.Forms.GroupBox groupBox2;
         private System.Windows.Forms.TextBox txtMsgBox;
-        private v2rayN.Forms.ListViewFlickerFree lvServers;
+        private v2rayN.Base.ListViewFlickerFree lvServers;
         private System.Windows.Forms.NotifyIcon notifyMain;
         private System.Windows.Forms.ContextMenuStrip cmsMain;
         private System.Windows.Forms.ToolStripMenuItem menuExit;

v2rayN/v2rayN/Forms/MainForm.cs

@@ -8,6 +8,7 @@ using System.Windows.Forms;
 using v2rayN.Handler;
 using v2rayN.HttpProxyHandler;
 using v2rayN.Mode;
+using v2rayN.Base;
 
 namespace v2rayN.Forms
 {
@@ -15,7 +16,7 @@ namespace v2rayN.Forms
     {
         private V2rayHandler v2rayHandler;
         private PACListHandle pacListHandle;
-        private V2rayUpdateHandle v2rayUpdateHandle;
+        private DownloadHandle downloadHandle;
         private List<int> lvSelecteds = new List<int>();
         private StatisticsHandler statistics = null;
 
@@ -32,6 +33,13 @@ namespace v2rayN.Forms
             Application.ApplicationExit += (sender, args) =>
             {
                 Utils.ClearTempPath();
+
+                v2rayHandler.V2rayStop();
+                HttpProxyHandle.CloseHttpAgent(config);
+                PACServerHandle.Stop();
+
+                ConfigHandler.SaveConfig(ref config);
+                statistics?.SaveToFile();
                 statistics?.Close();
             };
         }
@@ -78,18 +86,9 @@ namespace v2rayN.Forms
             if (e.CloseReason == CloseReason.UserClosing)
             {
                 e.Cancel = true;
-
-                statistics?.SaveToFile();
-
                 HideForm();
                 return;
-            }
-            if (e.CloseReason == CloseReason.ApplicationExitCall)
-            {
-                ConfigHandler.SaveConfig(ref config);
-                statistics?.SaveToFile();
-                statistics?.Close();
-            }
+            } 
         }
 
         private void MainForm_Resize(object sender, EventArgs e)
@@ -116,7 +115,7 @@ namespace v2rayN.Forms
             {
                 case WM_QUERYENDSESSION:
                     Utils.SaveLog("Windows shutdown UnsetProxy");
-                    //CloseV2ray();
+                 
                     ConfigHandler.ToJsonFile(config);
                     statistics?.SaveToFile();
                     ProxySetting.UnsetProxy();
@@ -327,7 +326,7 @@ namespace v2rayN.Forms
 
             if (config.sysAgentEnabled)
             {
-                toolSslHttpPort.Text = $"{Global.Loopback}:{Global.sysAgentPort}";
+                toolSslHttpPort.Text = $"{Global.Loopback}:{Global.httpPort}";
                 if (config.listenerType == 2 || config.listenerType == 4)
                 {
                     if (PACServerHandle.IsRunning)
@@ -362,7 +361,7 @@ namespace v2rayN.Forms
                     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;
 
@@ -1005,16 +1004,11 @@ namespace v2rayN.Forms
         }
 
         private void menuExit_Click(object sender, EventArgs e)
-        {
-            CloseV2ray();
+        {        
 
             this.Visible = false;
-            this.Close();
-
-            statistics?.Close();
-
-            //this.Dispose();
-            //System.Environment.Exit(System.Environment.ExitCode);
+            this.Close();            
+             
             Application.Exit();
         }
 
@@ -1044,7 +1038,7 @@ namespace v2rayN.Forms
         #endregion
 
         #region 后台测速
-        
+
         private void SetTestResult(int k, string txt)
         {
             config.vmess[k].testResult = txt;
@@ -1251,7 +1245,7 @@ namespace v2rayN.Forms
         {
             if (isChecked)
             {
-                if (HttpProxyHandle.RestartHttpAgent(config, true))
+                if (HttpProxyHandle.RestartHttpAgent(config, false))
                 {
                     ChangePACButtonStatus(config.listenerType);
                 }
@@ -1279,10 +1273,10 @@ namespace v2rayN.Forms
 
         private void tsbCheckUpdateCore_Click(object sender, EventArgs e)
         {
-            if (v2rayUpdateHandle == null)
+            if (downloadHandle == null)
             {
-                v2rayUpdateHandle = new V2rayUpdateHandle();
-                v2rayUpdateHandle.AbsoluteCompleted += (sender2, args) =>
+                downloadHandle = new DownloadHandle();
+                downloadHandle.AbsoluteCompleted += (sender2, args) =>
                 {
                     if (args.Success)
                     {
@@ -1298,7 +1292,7 @@ namespace v2rayN.Forms
                             }
                             else
                             {
-                                v2rayUpdateHandle.DownloadFileAsync(config, url);
+                                downloadHandle.DownloadFileAsync(config, url, null);
                             }
                         }));
                     }
@@ -1307,7 +1301,7 @@ namespace v2rayN.Forms
                         AppendText(false, args.Msg);
                     }
                 };
-                v2rayUpdateHandle.UpdateCompleted += (sender2, args) =>
+                downloadHandle.UpdateCompleted += (sender2, args) =>
                 {
                     if (args.Success)
                     {
@@ -1318,7 +1312,7 @@ namespace v2rayN.Forms
                         {
                             CloseV2ray();
 
-                            string fileName = v2rayUpdateHandle.DownloadFileName;
+                            string fileName = downloadHandle.DownloadFileName;
                             fileName = Utils.GetPath(fileName);
                             using (ZipArchive archive = ZipFile.OpenRead(fileName))
                             {
@@ -1346,14 +1340,14 @@ namespace v2rayN.Forms
                         AppendText(false, args.Msg);
                     }
                 };
-                v2rayUpdateHandle.Error += (sender2, args) =>
+                downloadHandle.Error += (sender2, args) =>
                 {
                     AppendText(true, args.GetException().Message);
                 };
             }
 
             AppendText(false, UIRes.I18N("MsgStartUpdatingV2rayCore"));
-            v2rayUpdateHandle.AbsoluteV2rayCore(config);
+            downloadHandle.AbsoluteV2rayCore(config);
         }
 
         private void tsbCheckUpdatePACList_Click(object sender, EventArgs e)
@@ -1473,8 +1467,8 @@ namespace v2rayN.Forms
                     continue;
                 }
 
-                V2rayUpdateHandle v2rayUpdateHandle3 = new V2rayUpdateHandle();
-                v2rayUpdateHandle3.UpdateCompleted += (sender2, args) =>
+                DownloadHandle downloadHandle3 = new DownloadHandle();
+                downloadHandle3.UpdateCompleted += (sender2, args) =>
                 {
                     if (args.Success)
                     {
@@ -1503,12 +1497,12 @@ namespace v2rayN.Forms
                         AppendText(false, args.Msg);
                     }
                 };
-                v2rayUpdateHandle3.Error += (sender2, args) =>
+                downloadHandle3.Error += (sender2, args) =>
                 {
                     AppendText(true, args.GetException().Message);
                 };
 
-                v2rayUpdateHandle3.WebDownloadString(url);
+                downloadHandle3.WebDownloadString(url);
                 AppendText(false, $"{hashCode}{UIRes.I18N("MsgStartGettingSubscriptions")}");
             }
 
@@ -1536,6 +1530,6 @@ namespace v2rayN.Forms
 
         #endregion
 
-       
+
     }
 }

v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs

@@ -28,7 +28,6 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(OptionSettingForm));
             this.btnClose = new System.Windows.Forms.Button();
             this.tabControl1 = new System.Windows.Forms.TabControl();
@@ -63,8 +62,9 @@
             this.txtUserblock = new System.Windows.Forms.TextBox();
             this.panel3 = new System.Windows.Forms.Panel();
             this.btnSetDefRountingRule = new System.Windows.Forms.Button();
-            this.cmbdomainStrategy = new System.Windows.Forms.ComboBox();
             this.labRoutingTips = new System.Windows.Forms.Label();
+            this.label4 = new System.Windows.Forms.Label();
+            this.cmbdomainStrategy = new System.Windows.Forms.ComboBox();
             this.label15 = new System.Windows.Forms.Label();
             this.label12 = new System.Windows.Forms.Label();
             this.cmbroutingMode = new System.Windows.Forms.ComboBox();
@@ -95,7 +95,6 @@
             this.panel2 = new System.Windows.Forms.Panel();
             this.btnOK = new System.Windows.Forms.Button();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.configBindingSource = new System.Windows.Forms.BindingSource(this.components);
             this.tabControl1.SuspendLayout();
             this.tabPage1.SuspendLayout();
             this.groupBox1.SuspendLayout();
@@ -109,36 +108,36 @@
             this.tabPage6.SuspendLayout();
             this.tabPage7.SuspendLayout();
             this.panel2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.configBindingSource)).BeginInit();
             this.SuspendLayout();
             // 
             // btnClose
             // 
-            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             resources.ApplyResources(this.btnClose, "btnClose");
+            this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
             this.btnClose.Name = "btnClose";
             this.btnClose.UseVisualStyleBackColor = true;
             this.btnClose.Click += new System.EventHandler(this.btnClose_Click);
             // 
             // tabControl1
             // 
+            resources.ApplyResources(this.tabControl1, "tabControl1");
             this.tabControl1.Controls.Add(this.tabPage1);
             this.tabControl1.Controls.Add(this.tabPage2);
             this.tabControl1.Controls.Add(this.tabPage6);
             this.tabControl1.Controls.Add(this.tabPage7);
-            resources.ApplyResources(this.tabControl1, "tabControl1");
             this.tabControl1.Name = "tabControl1";
             this.tabControl1.SelectedIndex = 0;
             // 
             // tabPage1
             // 
-            this.tabPage1.Controls.Add(this.groupBox1);
             resources.ApplyResources(this.tabPage1, "tabPage1");
+            this.tabPage1.Controls.Add(this.groupBox1);
             this.tabPage1.Name = "tabPage1";
             this.tabPage1.UseVisualStyleBackColor = true;
             // 
             // groupBox1
             // 
+            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Controls.Add(this.chksniffingEnabled2);
             this.groupBox1.Controls.Add(this.chksniffingEnabled);
             this.groupBox1.Controls.Add(this.txtremoteDNS);
@@ -157,7 +156,6 @@
             this.groupBox1.Controls.Add(this.label5);
             this.groupBox1.Controls.Add(this.txtlocalPort);
             this.groupBox1.Controls.Add(this.label2);
-            resources.ApplyResources(this.groupBox1, "groupBox1");
             this.groupBox1.Name = "groupBox1";
             this.groupBox1.TabStop = false;
             // 
@@ -204,12 +202,12 @@
             // 
             // cmbprotocol2
             // 
+            resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
             this.cmbprotocol2.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbprotocol2.FormattingEnabled = true;
             this.cmbprotocol2.Items.AddRange(new object[] {
             resources.GetString("cmbprotocol2.Items"),
             resources.GetString("cmbprotocol2.Items1")});
-            resources.ApplyResources(this.cmbprotocol2, "cmbprotocol2");
             this.cmbprotocol2.Name = "cmbprotocol2";
             // 
             // label3
@@ -224,8 +222,8 @@
             // 
             // cmbprotocol
             // 
-            this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             resources.ApplyResources(this.cmbprotocol, "cmbprotocol");
+            this.cmbprotocol.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbprotocol.FormattingEnabled = true;
             this.cmbprotocol.Items.AddRange(new object[] {
             resources.GetString("cmbprotocol.Items"),
@@ -251,6 +249,7 @@
             // 
             // cmbloglevel
             // 
+            resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
             this.cmbloglevel.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbloglevel.FormattingEnabled = true;
             this.cmbloglevel.Items.AddRange(new object[] {
@@ -259,7 +258,6 @@
             resources.GetString("cmbloglevel.Items2"),
             resources.GetString("cmbloglevel.Items3"),
             resources.GetString("cmbloglevel.Items4")});
-            resources.ApplyResources(this.cmbloglevel, "cmbloglevel");
             this.cmbloglevel.Name = "cmbloglevel";
             // 
             // label5
@@ -279,32 +277,32 @@
             // 
             // tabPage2
             // 
-            this.tabPage2.Controls.Add(this.groupBox2);
             resources.ApplyResources(this.tabPage2, "tabPage2");
+            this.tabPage2.Controls.Add(this.groupBox2);
             this.tabPage2.Name = "tabPage2";
             this.tabPage2.UseVisualStyleBackColor = true;
             // 
             // groupBox2
             // 
+            resources.ApplyResources(this.groupBox2, "groupBox2");
             this.groupBox2.Controls.Add(this.tabControl2);
             this.groupBox2.Controls.Add(this.panel3);
-            resources.ApplyResources(this.groupBox2, "groupBox2");
             this.groupBox2.Name = "groupBox2";
             this.groupBox2.TabStop = false;
             // 
             // tabControl2
             // 
+            resources.ApplyResources(this.tabControl2, "tabControl2");
             this.tabControl2.Controls.Add(this.tabPage3);
             this.tabControl2.Controls.Add(this.tabPage4);
             this.tabControl2.Controls.Add(this.tabPage5);
-            resources.ApplyResources(this.tabControl2, "tabControl2");
             this.tabControl2.Name = "tabControl2";
             this.tabControl2.SelectedIndex = 0;
             // 
             // tabPage3
             // 
-            this.tabPage3.Controls.Add(this.txtUseragent);
             resources.ApplyResources(this.tabPage3, "tabPage3");
+            this.tabPage3.Controls.Add(this.txtUseragent);
             this.tabPage3.Name = "tabPage3";
             this.tabPage3.UseVisualStyleBackColor = true;
             // 
@@ -315,8 +313,8 @@
             // 
             // tabPage4
             // 
-            this.tabPage4.Controls.Add(this.txtUserdirect);
             resources.ApplyResources(this.tabPage4, "tabPage4");
+            this.tabPage4.Controls.Add(this.txtUserdirect);
             this.tabPage4.Name = "tabPage4";
             this.tabPage4.UseVisualStyleBackColor = true;
             // 
@@ -327,8 +325,8 @@
             // 
             // tabPage5
             // 
-            this.tabPage5.Controls.Add(this.txtUserblock);
             resources.ApplyResources(this.tabPage5, "tabPage5");
+            this.tabPage5.Controls.Add(this.txtUserblock);
             this.tabPage5.Name = "tabPage5";
             this.tabPage5.UseVisualStyleBackColor = true;
             // 
@@ -339,13 +337,14 @@
             // 
             // panel3
             // 
+            resources.ApplyResources(this.panel3, "panel3");
             this.panel3.Controls.Add(this.btnSetDefRountingRule);
-            this.panel3.Controls.Add(this.cmbdomainStrategy);
             this.panel3.Controls.Add(this.labRoutingTips);
+            this.panel3.Controls.Add(this.label4);
+            this.panel3.Controls.Add(this.cmbdomainStrategy);
             this.panel3.Controls.Add(this.label15);
             this.panel3.Controls.Add(this.label12);
             this.panel3.Controls.Add(this.cmbroutingMode);
-            resources.ApplyResources(this.panel3, "panel3");
             this.panel3.Name = "panel3";
             // 
             // btnSetDefRountingRule
@@ -355,23 +354,29 @@
             this.btnSetDefRountingRule.UseVisualStyleBackColor = true;
             this.btnSetDefRountingRule.Click += new System.EventHandler(this.btnSetDefRountingRule_Click);
             // 
+            // labRoutingTips
+            // 
+            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
+            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
+            this.labRoutingTips.Name = "labRoutingTips";
+            // 
+            // label4
+            // 
+            resources.ApplyResources(this.label4, "label4");
+            this.label4.ForeColor = System.Drawing.Color.Brown;
+            this.label4.Name = "label4";
+            // 
             // cmbdomainStrategy
             // 
+            resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy");
             this.cmbdomainStrategy.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbdomainStrategy.FormattingEnabled = true;
             this.cmbdomainStrategy.Items.AddRange(new object[] {
             resources.GetString("cmbdomainStrategy.Items"),
             resources.GetString("cmbdomainStrategy.Items1"),
             resources.GetString("cmbdomainStrategy.Items2")});
-            resources.ApplyResources(this.cmbdomainStrategy, "cmbdomainStrategy");
             this.cmbdomainStrategy.Name = "cmbdomainStrategy";
             // 
-            // labRoutingTips
-            // 
-            this.labRoutingTips.ForeColor = System.Drawing.Color.Brown;
-            resources.ApplyResources(this.labRoutingTips, "labRoutingTips");
-            this.labRoutingTips.Name = "labRoutingTips";
-            // 
             // label15
             // 
             resources.ApplyResources(this.label15, "label15");
@@ -384,6 +389,7 @@
             // 
             // cmbroutingMode
             // 
+            resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode");
             this.cmbroutingMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cmbroutingMode.FormattingEnabled = true;
             this.cmbroutingMode.Items.AddRange(new object[] {
@@ -391,11 +397,11 @@
             resources.GetString("cmbroutingMode.Items1"),
             resources.GetString("cmbroutingMode.Items2"),
             resources.GetString("cmbroutingMode.Items3")});
-            resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode");
             this.cmbroutingMode.Name = "cmbroutingMode";
             // 
             // tabPage6
             // 
+            resources.ApplyResources(this.tabPage6, "tabPage6");
             this.tabPage6.Controls.Add(this.chkKcpcongestion);
             this.tabPage6.Controls.Add(this.txtKcpwriteBufferSize);
             this.tabPage6.Controls.Add(this.label10);
@@ -409,7 +415,6 @@
             this.tabPage6.Controls.Add(this.label7);
             this.tabPage6.Controls.Add(this.txtKcpmtu);
             this.tabPage6.Controls.Add(this.label6);
-            resources.ApplyResources(this.tabPage6, "tabPage6");
             this.tabPage6.Name = "tabPage6";
             this.tabPage6.UseVisualStyleBackColor = true;
             // 
@@ -481,6 +486,7 @@
             // 
             // tabPage7
             // 
+            resources.ApplyResources(this.tabPage7, "tabPage7");
             this.tabPage7.Controls.Add(this.cbFreshrate);
             this.tabPage7.Controls.Add(this.tbCacheDays);
             this.tabPage7.Controls.Add(this.lbFreshrate);
@@ -490,15 +496,14 @@
             this.tabPage7.Controls.Add(this.txturlGFWList);
             this.tabPage7.Controls.Add(this.label13);
             this.tabPage7.Controls.Add(this.chkAutoRun);
-            resources.ApplyResources(this.tabPage7, "tabPage7");
             this.tabPage7.Name = "tabPage7";
             this.tabPage7.UseVisualStyleBackColor = true;
             // 
             // cbFreshrate
             // 
+            resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
             this.cbFreshrate.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cbFreshrate.FormattingEnabled = true;
-            resources.ApplyResources(this.cbFreshrate, "cbFreshrate");
             this.cbFreshrate.Name = "cbFreshrate";
             // 
             // tbCacheDays
@@ -546,9 +551,9 @@
             // 
             // panel2
             // 
+            resources.ApplyResources(this.panel2, "panel2");
             this.panel2.Controls.Add(this.btnClose);
             this.panel2.Controls.Add(this.btnOK);
-            resources.ApplyResources(this.panel2, "panel2");
             this.panel2.Name = "panel2";
             // 
             // btnOK
@@ -563,10 +568,6 @@
             resources.ApplyResources(this.panel1, "panel1");
             this.panel1.Name = "panel1";
             // 
-            // configBindingSource
-            // 
-            this.configBindingSource.DataSource = typeof(v2rayN.Mode.Config);
-            // 
             // OptionSettingForm
             // 
             resources.ApplyResources(this, "$this");
@@ -598,7 +599,6 @@
             this.tabPage7.ResumeLayout(false);
             this.tabPage7.PerformLayout();
             this.panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.configBindingSource)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -670,6 +670,6 @@
         private System.Windows.Forms.Label lbCacheDays;
         private System.Windows.Forms.ComboBox cbFreshrate;
         private System.Windows.Forms.Label lbFreshrate;
-        private System.Windows.Forms.BindingSource configBindingSource;
+        private System.Windows.Forms.Label label4;
     }
 }

v2rayN/v2rayN/Forms/OptionSettingForm.cs

@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Windows.Forms;
 using v2rayN.Handler;
+using v2rayN.Base;
 
 namespace v2rayN.Forms
 {
@@ -44,7 +45,7 @@ namespace v2rayN.Forms
                 chksniffingEnabled.Checked = config.inbound[0].sniffingEnabled;
 
                 txtlocalPort2.Text = "socks + 1";
-                cmbprotocol2.Text = "http";
+                cmbprotocol2.Text = Global.InboundHttp;
 
                 if (config.inbound.Count > 1)
                 {
@@ -381,8 +382,8 @@ namespace v2rayN.Forms
             for (int k = 0; k < lstUrl.Count; k++)
             {
                 var txt = lstTxt[k];
-                V2rayUpdateHandle v2rayUpdateHandle3 = new V2rayUpdateHandle();
-                v2rayUpdateHandle3.UpdateCompleted += (sender2, args) =>
+                DownloadHandle downloadHandle = new DownloadHandle();
+                downloadHandle.UpdateCompleted += (sender2, args) =>
                 {
                     if (args.Success)
                     {
@@ -398,12 +399,12 @@ namespace v2rayN.Forms
                         AppendText(false, args.Msg);
                     }
                 };
-                v2rayUpdateHandle3.Error += (sender2, args) =>
+                downloadHandle.Error += (sender2, args) =>
                 {
                     AppendText(true, args.GetException().Message);
                 };
 
-                v2rayUpdateHandle3.WebDownloadString(lstUrl[k]);
+                downloadHandle.WebDownloadString(lstUrl[k]);
             }
         }
         void AppendText(bool notify, string text)

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

@@ -196,9 +196,21 @@
   <data name="tabPage3.Text" xml:space="preserve">
     <value>  代理的Domain或IP  </value>
   </data>
+  <data name="txtUserdirect.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 404</value>
+  </data>
+  <data name="tabPage4.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 410</value>
+  </data>
   <data name="tabPage4.Text" xml:space="preserve">
     <value>  直连的Domain或IP  </value>
   </data>
+  <data name="txtUserblock.Size" type="System.Drawing.Size, System.Drawing">
+    <value>628, 404</value>
+  </data>
+  <data name="tabPage5.Size" type="System.Drawing.Size, System.Drawing">
+    <value>634, 410</value>
+  </data>
   <data name="tabPage5.Text" xml:space="preserve">
     <value>  阻止的Domain或IP  </value>
   </data>
@@ -207,7 +219,7 @@
     <value>NoControl</value>
   </data>
   <data name="btnSetDefRountingRule.Location" type="System.Drawing.Point, System.Drawing">
-    <value>381, 43</value>
+    <value>7, 60</value>
   </data>
   <data name="btnSetDefRountingRule.Size" type="System.Drawing.Size, System.Drawing">
     <value>201, 23</value>
@@ -215,25 +227,37 @@
   <data name="btnSetDefRountingRule.Text" xml:space="preserve">
     <value>一键设置默认自定义路由规则</value>
   </data>
-  <data name="cmbdomainStrategy.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 20</value>
-  </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="labRoutingTips.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
+  <data name="labRoutingTips.Location" type="System.Drawing.Point, System.Drawing">
+    <value>5, 96</value>
+  </data>
   <data name="labRoutingTips.Size" type="System.Drawing.Size, System.Drawing">
     <value>383, 12</value>
   </data>
   <data name="labRoutingTips.Text" xml:space="preserve">
     <value>*设置的规则，用逗号(,)隔开;支持Domain(纯字符串/正则/子域名)和IP</value>
   </data>
+  <data name="label4.Text" xml:space="preserve">
+    <value>规则加载次序:自定义的代理/直连/阻止,选择的路由模式</value>
+  </data>
+  <data name="cmbdomainStrategy.Location" type="System.Drawing.Point, System.Drawing">
+    <value>81, 30</value>
+  </data>
+  <data name="cmbdomainStrategy.Size" type="System.Drawing.Size, System.Drawing">
+    <value>186, 20</value>
+  </data>
   <data name="label15.Size" type="System.Drawing.Size, System.Drawing">
     <value>53, 12</value>
   </data>
   <data name="label15.Text" xml:space="preserve">
     <value>域名策略</value>
   </data>
+  <data name="label12.Location" type="System.Drawing.Point, System.Drawing">
+    <value>295, 34</value>
+  </data>
   <data name="label12.Size" type="System.Drawing.Size, System.Drawing">
     <value>53, 12</value>
   </data>
@@ -252,8 +276,11 @@
   <data name="cmbroutingMode.Items3" xml:space="preserve">
     <value>绕过局域网及大陆地址</value>
   </data>
+  <data name="cmbroutingMode.Location" type="System.Drawing.Point, System.Drawing">
+    <value>372, 30</value>
+  </data>
   <data name="cmbroutingMode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>232, 20</value>
+    <value>244, 20</value>
   </data>
   <data name="tabPage2.Text" xml:space="preserve">
     <value>  Core:路由设置  </value>
@@ -261,6 +288,24 @@
   <data name="tabPage6.Text" xml:space="preserve">
     <value>  Core:KCP设置  </value>
   </data>
+  <data name="lbFreshrate.Size" type="System.Drawing.Size, System.Drawing">
+    <value>77, 12</value>
+  </data>
+  <data name="lbFreshrate.Text" xml:space="preserve">
+    <value>统计刷新频率</value>
+  </data>
+  <data name="lbCacheDays.Size" type="System.Drawing.Size, System.Drawing">
+    <value>305, 12</value>
+  </data>
+  <data name="lbCacheDays.Text" xml:space="preserve">
+    <value>缓存天数（0-30， 0关闭缓存单独每天的数据使用情况）</value>
+  </data>
+  <data name="chkEnableStatistics.Size" type="System.Drawing.Size, System.Drawing">
+    <value>384, 16</value>
+  </data>
+  <data name="chkEnableStatistics.Text" xml:space="preserve">
+    <value>启用统计（实时网速显示和使用流量显示，需要重启v2rayN客户端）</value>
+  </data>
   <data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing">
     <value>144, 16</value>
   </data>
@@ -288,13 +333,4 @@
   <data name="$this.Text" xml:space="preserve">
     <value>参数设置</value>
   </data>
-  <data name="chkEnableStatistics.Text" xml:space="preserve">
-    <value>启用统计（实时网速显示和使用流量显示，需要重启v2rayN客户端）</value>
-  </data>
-  <data name="lbCacheDays.Text" xml:space="preserve">
-    <value>缓存天数（0-30， 0关闭缓存单独每天的数据使用情况）</value>
-  </data>
-  <data name="lbFreshrate.Text" xml:space="preserve">
-    <value>统计刷新频率</value>
-  </data>
 </root>

v2rayN/v2rayN/Forms/SubSettingControl.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Windows.Forms;
+using v2rayN.Base;
 using v2rayN.Mode;
 
 namespace v2rayN.Forms

v2rayN/v2rayN/Global.cs

@@ -102,6 +102,13 @@ namespace v2rayN
         /// </summary>
         public const string StreamSecurity = "tls";
 
+        public const string InboundSocks = "socks";
+        public const string InboundHttp = "http";
+        public const string Loopback = "127.0.0.1";
+        public const string InboundAPITagName = "api";
+        public const string InboundAPIProtocal = "dokodemo-door";
+
+
         /// <summary>
         /// vmess
         /// </summary>
@@ -147,12 +154,6 @@ namespace v2rayN
         /// </summary>
         public const string CustomIconName = "v2rayN.ico";
 
-        public const string Loopback = "127.0.0.1";
-
-        public const string InboundAPITagName = "api";
-        public const string InboundProxyTagName = "proxy";  
-        public const string InboundAPIProtocal = "dokodemo-door";
-     
         public enum StatisticsFreshRate
         {
             quick = 1000,
@@ -177,17 +178,17 @@ namespace v2rayN
         public static bool sysAgent { get; set; }
 
         /// <summary>
-        /// socks端口号
+        /// socks端口
         /// </summary>
         public static int socksPort { get; set; }
 
         /// <summary>
-        /// 全局代理端口(http)
+        /// http端口
         /// </summary>
-        public static int sysAgentPort { get; set; }
+        public static int httpPort { get; set; }
 
         /// <summary>
-        /// PAC监听端口号
+        /// PAC端口
         /// </summary>
         public static int pacPort { get; set; }
 

v2rayN/v2rayN/Handler/ConfigHandler.cs

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

v2rayN/v2rayN/Handler/DownloadHandle.cs

@@ -1,20 +1,15 @@
 using System;
-using System.Collections.Generic;
 using System.IO;
 using System.Net;
-using System.Text;
-using Newtonsoft.Json;
+using v2rayN.Base;
 using v2rayN.Mode;
-using v2rayN.Properties;
-using v2rayN.HttpProxyHandler;
-using System.Diagnostics;
 
 namespace v2rayN.Handler
 {
     /// <summary>
-    ///Update V2ray Core 
+    ///Download
     /// </summary>
-    class V2rayUpdateHandle
+    class DownloadHandle
     {
         public event EventHandler<ResultEventArgs> AbsoluteCompleted;
 
@@ -92,7 +87,7 @@ namespace v2rayN.Handler
         }
 
 
-        public void DownloadFileAsync(Config config, string url)
+        public void DownloadFileAsync(Config config, string url, WebProxy webProxy)
         {
             try
             {
@@ -106,7 +101,10 @@ namespace v2rayN.Handler
                 progressPercentage = -1;
 
                 WebClientEx ws = new WebClientEx();
-                ws.Proxy = new WebProxy(Global.Loopback, Global.sysAgentPort);
+                if (webProxy != null)
+                {
+                    ws.Proxy = webProxy;// new WebProxy(Global.Loopback, Global.httpPort);
+                }
 
                 ws.DownloadFileCompleted += ws_DownloadFileCompleted;
                 ws.DownloadProgressChanged += ws_DownloadProgressChanged;

v2rayN/v2rayN/Handler/SpeedtestHandler.cs

@@ -11,7 +11,7 @@ namespace v2rayN.Handler
 {
     class SpeedtestHandler
     {
-        private V2rayUpdateHandle v2rayUpdateHandle2;
+        private DownloadHandle downloadHandle2;
         private Config _config;
         private V2rayHandler _v2rayHandler;
         private List<int> _selecteds;
@@ -37,16 +37,19 @@ namespace v2rayN.Handler
             if (actionType == "ping")
             {
                 _workThread = new Thread(new ThreadStart(RunPing));
+                _workThread.IsBackground = true;
                 _workThread.Start();
             }
             if (actionType == "tcping")
             {
                 _workThread = new Thread(new ThreadStart(RunTcping));
+                _workThread.IsBackground = true;
                 _workThread.Start();
             }
             else if (actionType == "realping")
             {
                 _workThread = new Thread(new ThreadStart(RunRealPing));
+                _workThread.IsBackground = true;
                 _workThread.Start();
             }
             else if (actionType == "speedtest")
@@ -88,7 +91,7 @@ namespace v2rayN.Handler
                     }
                 }
 
-                Thread.Sleep(1);
+                Thread.Sleep(100);
 
             }
             catch (Exception ex)
@@ -119,7 +122,7 @@ namespace v2rayN.Handler
                     }
                 }
 
-                Thread.Sleep(1);
+                Thread.Sleep(100);
 
             }
             catch (Exception ex)
@@ -132,6 +135,12 @@ namespace v2rayN.Handler
         {
             try
             {
+                string msg = string.Empty;
+
+                Global.reloadV2ray = true;
+                _v2rayHandler.LoadV2ray(_config, _selecteds);
+
+                var httpPort = _config.GetLocalPort("speedtest");
                 for (int k = 0; k < _selecteds.Count; k++)
                 {
                     int index = _selecteds[k];
@@ -139,20 +148,12 @@ namespace v2rayN.Handler
                     {
                         continue;
                     }
+
                     try
                     {
-                        if (ConfigHandler.SetDefaultServer(ref _config, index) == 0)
-                        {
-                            _v2rayHandler.LoadV2ray(_config);
-                        }
-                        else
-                        {
-                            return;
-                        }
-                        Thread.Sleep(1000 * 5);
-
+                        var webProxy = new WebProxy(Global.Loopback, httpPort + index);
                         int responseTime = -1;
-                        var status = GetRealPingTime(Global.SpeedPingTestUrl, out responseTime);
+                        var status = GetRealPingTime(Global.SpeedPingTestUrl, webProxy, out responseTime);
                         if (!Utils.IsNullOrEmpty(status))
                         {
                             _updateFunc(index, string.Format("{0}", status));
@@ -166,9 +167,12 @@ namespace v2rayN.Handler
                     {
                         Utils.SaveLog(ex.Message, ex);
                     }
+                    Thread.Sleep(100);
                 }
 
-                Thread.Sleep(1);
+                Global.reloadV2ray = true;
+                _v2rayHandler.LoadV2ray(_config);
+                Thread.Sleep(100);
 
             }
             catch (Exception ex)
@@ -184,12 +188,15 @@ namespace v2rayN.Handler
                 return;
             }
 
+            Global.reloadV2ray = true;
+            _v2rayHandler.LoadV2ray(_config, _selecteds);
+
             string url = Global.SpeedTestUrl;
             testCounter = 0;
-            if (v2rayUpdateHandle2 == null)
+            if (downloadHandle2 == null)
             {
-                v2rayUpdateHandle2 = new V2rayUpdateHandle();
-                v2rayUpdateHandle2.UpdateCompleted += (sender2, args) =>
+                downloadHandle2 = new DownloadHandle();
+                downloadHandle2.UpdateCompleted += (sender2, args) =>
                 {
                     if (args.Success)
                     {
@@ -204,7 +211,7 @@ namespace v2rayN.Handler
                         _updateFunc(ItemIndex, args.Msg);
                     }
                 };
-                v2rayUpdateHandle2.Error += (sender2, args) =>
+                downloadHandle2.Error += (sender2, args) =>
                 {
                     _updateFunc(ItemIndex, args.GetException().Message);
                     if (ServerSpeedTestSub(testCounter, url) != 0)
@@ -213,6 +220,7 @@ namespace v2rayN.Handler
                     }
                 };
             }
+
             if (ServerSpeedTestSub(testCounter, url) != 0)
             {
                 return;
@@ -223,23 +231,19 @@ namespace v2rayN.Handler
         {
             if (index >= _selecteds.Count)
             {
-                return -1;
-            }
-
-            if (ConfigHandler.SetDefaultServer(ref _config, _selecteds[index]) == 0)
-            {
+                Global.reloadV2ray = true;
                 _v2rayHandler.LoadV2ray(_config);
-
-                testCounter++;
-
-                v2rayUpdateHandle2.DownloadFileAsync(_config, url);
-
-                return 0;
-            }
-            else
-            {
                 return -1;
             }
+
+            var httpPort = _config.GetLocalPort("speedtest");
+            index = _selecteds[index];
+            
+            testCounter++;
+            var webProxy = new WebProxy(Global.Loopback, httpPort + index);
+            downloadHandle2.DownloadFileAsync(_config, url, webProxy);
+
+            return 0;
         }
 
         private int GetTcpingTime(string url, int port)
@@ -267,7 +271,7 @@ namespace v2rayN.Handler
             return responseTime;
         }
 
-        private string GetRealPingTime(string url, out int responseTime)
+        private string GetRealPingTime(string url, WebProxy webProxy, out int responseTime)
         {
             string msg = string.Empty;
             responseTime = -1;
@@ -276,7 +280,7 @@ namespace v2rayN.Handler
             {
                 HttpWebRequest myHttpWebRequest = (HttpWebRequest)WebRequest.Create(url);
                 myHttpWebRequest.Timeout = 5000;
-                myHttpWebRequest.Proxy = new WebProxy(Global.Loopback, Global.sysAgentPort);
+                myHttpWebRequest.Proxy = webProxy;//new WebProxy(Global.Loopback, Global.httpPort);
 
                 var timer = new Stopwatch();
                 timer.Start();

v2rayN/v2rayN/Handler/StatisticsHandler.cs

@@ -6,7 +6,9 @@ using System.Net;
 using System.Net.Sockets;
 using System.Threading;
 using v2rayN.Mode;
+using v2rayN.Properties;
 using v2rayN.Protos.Statistics;
+using v2rayN.Tool;
 
 namespace v2rayN.Handler
 {
@@ -66,6 +68,23 @@ namespace v2rayN.Handler
 
         public StatisticsHandler(Mode.Config config, Action<ulong, ulong, ulong, ulong, List<Mode.ServerStatistics>> update)
         {
+            try
+            {
+                if (Environment.Is64BitOperatingSystem)
+                {
+                    FileManager.UncompressFile(Utils.GetPath("grpc_csharp_ext.x64.dll"), Resources.grpc_csharp_ext_x64_dll);
+                }
+                else
+                {
+                    FileManager.UncompressFile(Utils.GetPath("grpc_csharp_ext.x86.dll"), Resources.grpc_csharp_ext_x86_dll);
+                }
+            }
+            catch (IOException ex)
+            {
+                Utils.SaveLog(ex.Message, ex);
+
+            }
+
             config_ = config;
             enabled_ = config.enableStatistics;
             UpdateUI = false;
@@ -86,6 +105,7 @@ namespace v2rayN.Handler
             GrpcInit();
 
             workThread_ = new Thread(new ThreadStart(Run));
+            workThread_.IsBackground = true;
             workThread_.Start();
         }
 
@@ -192,7 +212,7 @@ namespace v2rayN.Handler
                     name = nStr[1];
                     type = nStr[3];
 
-                    if (name == Global.InboundProxyTagName)
+                    if (name == Global.agentTag)
                     {
                         if (type == "uplink")
                         {

v2rayN/v2rayN/Handler/V2rayConfigHandler.cs

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

v2rayN/v2rayN/Handler/V2rayHandler.cs

@@ -52,6 +52,27 @@ namespace v2rayN.Handler
             }
         }
 
+        /// <summary>
+        /// 载入V2ray
+        /// </summary>
+        public void LoadV2ray(Config config, List<int> _selecteds)
+        {
+            if (Global.reloadV2ray)
+            {
+                string msg = string.Empty;
+                string fileName = Utils.GetPath(v2rayConfigRes);
+                if (V2rayConfigHandler.GenerateClientSpeedtestConfig(config, _selecteds, fileName, out msg) != 0)
+                {
+                    ShowMsg(false, msg);
+                }
+                else
+                {
+                    ShowMsg(true, msg);
+                    V2rayRestart();
+                }
+            }
+        }
+
         /// <summary>
         /// V2ray重启
         /// </summary>
@@ -118,7 +139,7 @@ namespace v2rayN.Handler
                     }
                 }
                 if (Utils.IsNullOrEmpty(fileName))
-                {       
+                {
                     string msg = string.Format(UIRes.I18N("NotFoundCore"), @"https://github.com/v2ray/v2ray-core/releases");
                     ShowMsg(true, msg);
                     return;

v2rayN/v2rayN/HttpProxyHandler/HttpProxyHandle.cs

@@ -10,21 +10,6 @@ namespace v2rayN.HttpProxyHandler
     /// </summary>
     class HttpProxyHandle
     {
-        private static string GetTimestamp(DateTime value)
-        {
-            return value.ToString("MMddHHmmssfff");
-        }
-
-        public static void ReSetPACProxy(Config config)
-        {
-            if (config.listenerType == 2)
-            {
-                //SysProxyHandle.SetIEProxy(false, false, null, null);
-                //PACServerHandle.Stop();
-            }
-            Update(config, false);
-        }
-
         public static bool Update(Config config, bool forceDisable)
         {
             int type = config.listenerType;
@@ -38,45 +23,40 @@ namespace v2rayN.HttpProxyHandler
             {
                 if (type != 0)
                 {
-                    var port = Global.sysAgentPort;
+                    var port = Global.httpPort;
                     if (port <= 0)
                     {
                         return false;
                     }
                     if (type == 1)
                     {
-                        PACServerHandle.Stop();
-                        PACFileWatcherHandle.StopWatch();
+                        //PACServerHandle.Stop();
                         SysProxyHandle.SetIEProxy(true, true, $"{Global.Loopback}:{port}", null);
                     }
                     else if (type == 2)
                     {
                         string pacUrl = GetPacUrl();
                         SysProxyHandle.SetIEProxy(true, false, null, pacUrl);
-                        PACServerHandle.Stop();
+                        //PACServerHandle.Stop();
                         PACServerHandle.Init(config);
-                        PACFileWatcherHandle.StartWatch(config);
                     }
                     else if (type == 3)
                     {
-                        PACServerHandle.Stop();
-                        PACFileWatcherHandle.StopWatch();
+                        //PACServerHandle.Stop();
                         SysProxyHandle.SetIEProxy(false, false, null, null);
                     }
                     else if (type == 4)
                     {
                         string pacUrl = GetPacUrl();
                         SysProxyHandle.SetIEProxy(false, false, null, null);
-                        PACServerHandle.Stop();
+                        //PACServerHandle.Stop();
                         PACServerHandle.Init(config);
-                        PACFileWatcherHandle.StartWatch(config);
                     }
                 }
                 else
                 {
                     SysProxyHandle.SetIEProxy(false, false, null, null);
-                    PACServerHandle.Stop();
-                    PACFileWatcherHandle.StopWatch();
+                    //PACServerHandle.Stop();
                 }
             }
             catch (Exception ex)
@@ -94,7 +74,7 @@ namespace v2rayN.HttpProxyHandler
         {
             try
             {
-                int localPort = config.GetLocalPort("socks");
+                int localPort = config.GetLocalPort(Global.InboundSocks);
                 if (localPort > 0)
                 {
                     PrivoxyHandler.Instance.Start(localPort, config);
@@ -102,8 +82,8 @@ namespace v2rayN.HttpProxyHandler
                     {
                         Global.sysAgent = true;
                         Global.socksPort = localPort;
-                        Global.sysAgentPort = PrivoxyHandler.Instance.RunningPort;
-                        Global.pacPort = Global.sysAgentPort + 1;
+                        Global.httpPort = PrivoxyHandler.Instance.RunningPort;
+                        Global.pacPort = config.GetLocalPort("pac");
                     }
                 }
             }
@@ -120,16 +100,11 @@ namespace v2rayN.HttpProxyHandler
         {
             try
             {
-                ////开启全局代理则关闭
-                //if (Global.sysAgent)
-                //{
                 PrivoxyHandler.Instance.Stop();
 
                 Global.sysAgent = false;
                 Global.socksPort = 0;
-                Global.sysAgentPort = 0;
-                Global.pacPort = 0;
-                //}
+                Global.httpPort = 0; 
             }
             catch
             {
@@ -151,7 +126,7 @@ namespace v2rayN.HttpProxyHandler
             }
             else
             {
-                int localPort = config.GetLocalPort("socks");
+                int localPort = config.GetLocalPort(Global.InboundSocks);
                 if (localPort != Global.socksPort)
                 {
                     isRestart = true;
@@ -168,9 +143,7 @@ namespace v2rayN.HttpProxyHandler
 
         public static string GetPacUrl()
         {
-            string pacUrl = $"http://{Global.Loopback}:{Global.pacPort}/pac/?t={GetTimestamp(DateTime.Now)}";
-
-
+            string pacUrl = $"http://{Global.Loopback}:{Global.pacPort}/pac/?t={ DateTime.Now.ToString("HHmmss")}";
             return pacUrl;
         }
     }

v2rayN/v2rayN/HttpProxyHandler/PACFileWatcherHandle.cs

@@ -1,45 +0,0 @@
-using System.IO;
-using System.Windows.Forms;
-using v2rayN.Mode;
-
-namespace v2rayN.HttpProxyHandler
-{
-    /// <summary>
-    /// 提供PAC功能支持
-    /// </summary>
-    class PACFileWatcherHandle
-    {
-        private static FileSystemWatcher fileSystemWatcher;
-
-        private static long fileSize;
-
-        public static void StartWatch(Config config)
-        {
-            if (fileSystemWatcher == null)
-            {
-                fileSystemWatcher = new FileSystemWatcher(Utils.StartupPath());
-                fileSystemWatcher.Filter = "pac.txt";
-                fileSystemWatcher.NotifyFilter = NotifyFilters.Size;
-                fileSystemWatcher.Changed += (sender, args) =>
-                {
-                    var fileInfo = new FileInfo(args.FullPath);
-                    if (fileSize != fileInfo.Length)
-                    {
-                        fileSize = fileInfo.Length;
-                        HttpProxyHandle.ReSetPACProxy(config);
-                    }
-                    
-                };
-            }
-            fileSystemWatcher.EnableRaisingEvents = true;
-        }
-
-        public static void StopWatch()
-        {
-            if (fileSystemWatcher != null)
-            {
-                fileSystemWatcher.EnableRaisingEvents = false;
-            }
-        }
-    }
-}

v2rayN/v2rayN/HttpProxyHandler/PACListHandle.cs

@@ -4,6 +4,7 @@ using System.IO;
 using System.Net;
 using System.Text;
 using Newtonsoft.Json;
+using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Properties;
 

v2rayN/v2rayN/HttpProxyHandler/PACServerHandle.cs

@@ -5,6 +5,7 @@ using System.Text;
 using v2rayN.Mode;
 using v2rayN.Properties;
 using v2rayN.Tool;
+using v2rayN.Base;
 
 namespace v2rayN.HttpProxyHandler
 {
@@ -27,14 +28,16 @@ namespace v2rayN.HttpProxyHandler
 
         public static void Init(Config config)
         {
-            //if (InitServer("*"))
-            //{
-            //    pacPort = Global.pacPort;
-            //}
-            if (InitServer(Global.Loopback))
+            Global.pacPort = config.GetLocalPort("pac");
+
+            if (InitServer("*"))
             {
                 pacPort = Global.pacPort;
             }
+            //else if (InitServer(Global.Loopback))
+            //{
+            //    pacPort = Global.pacPort;
+            //}
             else if (InitServerB(Global.Loopback))
             {
                 pacPort = Global.pacPort;
@@ -66,7 +69,6 @@ namespace v2rayN.HttpProxyHandler
                         server = new HttpWebServer(SendResponse, prefixes);
                         server.Run();
 
-                        //pacPort = Global.pacPort;
                     }
                 }
                 Utils.SaveLog("Webserver at " + address);
@@ -94,7 +96,6 @@ namespace v2rayN.HttpProxyHandler
                     if (serverB == null)
                     {
                         serverB = new HttpWebServerB(Global.pacPort, SendResponse);
-                        //pacPort = Global.pacPort;
                     }
                 }
                 Utils.SaveLog("WebserverB at " + address);
@@ -123,18 +124,23 @@ namespace v2rayN.HttpProxyHandler
 
         public static void Stop()
         {
-            //try
-            //{
-            //    if (server != null)
-            //    {
-            //        server.Stop();
-            //        server = null;
-            //    }
-            //}
-            //catch (Exception ex)
-            //{
-            //    Utils.SaveLog("Webserver Stop " + ex.Message);
-            //}
+            try
+            {
+                if (server != null)
+                {
+                    server.Stop();
+                    server = null;
+                }
+                if (serverB != null)
+                {
+                    serverB.Stop();
+                    serverB = null;
+                }
+            }
+            catch (Exception ex)
+            {
+                Utils.SaveLog("Webserver Stop " + ex.Message);
+            }
 
             //try
             //{
@@ -158,7 +164,7 @@ namespace v2rayN.HttpProxyHandler
 
         private static string GetPacList(string address)
         {
-            var port = Global.sysAgentPort;
+            var port = Global.httpPort;
             if (port <= 0)
             {
                 return "No port";

v2rayN/v2rayN/HttpProxyHandler/PrivoxyHandler.cs

@@ -24,8 +24,6 @@ namespace v2rayN.HttpProxyHandler
         private static string _uniqueConfigFile;
         private static Job _privoxyJob;
         private Process _process;
-        private int _runningPort;
-        private bool _isRunning;
 
         static PrivoxyHandler()
         {
@@ -36,7 +34,6 @@ namespace v2rayN.HttpProxyHandler
                 _privoxyJob = new Job();
 
                 FileManager.UncompressFile(Utils.GetTempPath("v2ray_privoxy.exe"), Resources.privoxy_exe);
-                FileManager.UncompressFile(Utils.GetTempPath("mgwz.dll"), Resources.mgwz_dll);
             }
             catch (IOException ex)
             {
@@ -66,18 +63,7 @@ namespace v2rayN.HttpProxyHandler
 
         public int RunningPort
         {
-            get
-            {
-                return _runningPort;
-            }
-        }
-
-        public bool IsRunning
-        {
-            get
-            {
-                return _isRunning;
-            }
+            get; set;
         }
 
         public void Start(int localPort, Config config)
@@ -90,9 +76,9 @@ namespace v2rayN.HttpProxyHandler
                     KillProcess(p);
                 }
                 string privoxyConfig = Resources.privoxy_conf;
-                _runningPort = GetFreePort(localPort);
+                RunningPort = config.GetLocalPort(Global.InboundHttp);
                 privoxyConfig = privoxyConfig.Replace("__SOCKS_PORT__", localPort.ToString());
-                privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_PORT__", _runningPort.ToString());
+                privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_PORT__", RunningPort.ToString());
                 if (config.allowLANConn)
                 {
                     privoxyConfig = privoxyConfig.Replace("__PRIVOXY_BIND_IP__", "0.0.0.0");
@@ -123,7 +109,7 @@ namespace v2rayN.HttpProxyHandler
                  * when ss exit unexpectedly, this process will be forced killed by system.
                  */
                 _privoxyJob.AddProcess(_process.Handle);
-                _isRunning = true;
+
             }
         }
 
@@ -134,7 +120,7 @@ namespace v2rayN.HttpProxyHandler
                 KillProcess(_process);
                 _process.Dispose();
                 _process = null;
-                _isRunning = false;
+                RunningPort = 0;
             }
         }
 
@@ -191,25 +177,5 @@ namespace v2rayN.HttpProxyHandler
             }
         }
 
-        private int GetFreePort(int localPort)
-        {
-            int defaultPort = 8123;
-            try
-            {
-                //// TCP stack please do me a favor
-                //TcpListener l = new TcpListener(IPAddress.Loopback, 0);
-                //l.Start();
-                //var port = ((IPEndPoint)l.LocalEndpoint).Port;
-                //l.Stop();
-                //return port;
-                return localPort + 1;
-            }
-            catch (Exception ex)
-            {
-                // in case access denied
-                Utils.SaveLog(ex.Message, ex);
-                return defaultPort;
-            }
-        }
     }
 }

v2rayN/v2rayN/HttpProxyHandler/SysProxyHandle.cs

@@ -1,8 +1,9 @@
-using System;
+using Newtonsoft.Json;
+using System;
 using System.Diagnostics;
 using System.IO;
 using System.Text;
-using Newtonsoft.Json;
+using v2rayN.Base;
 using v2rayN.Mode;
 using v2rayN.Properties;
 using v2rayN.Tool;

v2rayN/v2rayN/Mode/Config.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Text.RegularExpressions;
+using v2rayN.Base;
 
 namespace v2rayN.Mode
 {
@@ -13,93 +13,147 @@ namespace v2rayN.Mode
         /// <summary>
         /// 本地监听
         /// </summary>
-        public List<InItem> inbound { get; set; }
+        public List<InItem> inbound
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 允许日志
         /// </summary>
-        public bool logEnabled { get; set; }
+        public bool logEnabled
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 日志等级
         /// </summary>
-        public string loglevel { get; set; }
+        public string loglevel
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 活动配置序号
         /// </summary>
-        public int index { get; set; }
+        public int index
+        {
+            get; set;
+        }
 
         /// <summary>
         /// vmess服务器信息
         /// </summary>
-        public List<VmessItem> vmess { get; set; }
+        public List<VmessItem> vmess
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 允许Mux多路复用
         /// </summary>
-        public bool muxEnabled { get; set; }
+        public bool muxEnabled
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 域名解析策略
         /// </summary>
-        public string domainStrategy { get; set; }
+        public string domainStrategy
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 路由模式
         /// </summary>
-        public string routingMode { get; set; }
+        public string routingMode
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 用户自定义需代理的网址或ip
         /// </summary>
-        public List<string> useragent { get; set; }
+        public List<string> useragent
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 用户自定义直连的网址或ip
         /// </summary>
-        public List<string> userdirect { get; set; }
+        public List<string> userdirect
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 用户自定义阻止的网址或ip
         /// </summary>
-        public List<string> userblock { get; set; }
+        public List<string> userblock
+        {
+            get; set;
+        }
 
         /// <summary>
         /// KcpItem
         /// </summary>
-        public KcpItem kcpItem { get; set; }
+        public KcpItem kcpItem
+        {
+            get; set;
+        }
 
 
         /// <summary>
         /// 启用Http代理
         /// </summary>
-        public bool sysAgentEnabled { get; set; }
+        public bool sysAgentEnabled
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 监听状态 0-不改变 1-全局 2-PAC
         /// </summary>
-        public int listenerType { get; set; }
+        public int listenerType
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 自定义GFWList url
         /// </summary>
-        public string urlGFWList { get; set; }
+        public string urlGFWList
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 允许来自局域网的连接
         /// </summary>
-        public bool allowLANConn { get; set; }
+        public bool allowLANConn
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 启用实时网速和流量统计
         /// </summary>
-        public bool enableStatistics { get; set; }
+        public bool enableStatistics
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 视图刷新率
         /// </summary>
-        public int statisticsFreshRate { get; set; }
+        public int statisticsFreshRate
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 统计数据缓存天数 [0, 30]
@@ -107,9 +161,13 @@ namespace v2rayN.Mode
         ///     * 无论如何不会关闭总流量的缓存
         /// </summary>
         private uint cacheDays;
-        public uint CacheDays {
-            get { return cacheDays; }
-            set 
+        public uint CacheDays
+        {
+            get
+            {
+                return cacheDays;
+            }
+            set
             {
                 if (value < 0) cacheDays = 0;
                 else if (value > 30) cacheDays = 30;
@@ -120,15 +178,24 @@ namespace v2rayN.Mode
         /// <summary>
         /// 自定义远程DNS
         /// </summary>
-        public string remoteDNS { get; set; }
+        public string remoteDNS
+        {
+            get; set;
+        }
         /// <summary>
         /// 订阅
         /// </summary>
-        public List<SubItem> subItem { get; set; }
+        public List<SubItem> subItem
+        {
+            get; set;
+        }
         /// <summary>
         /// UI
         /// </summary>
-        public UIItem uiItem { get; set; }
+        public UIItem uiItem
+        {
+            get; set;
+        }
 
         #region 函数
 
@@ -236,6 +303,19 @@ namespace v2rayN.Mode
 
         public int GetLocalPort(string protocol)
         {
+            if (protocol == Global.InboundHttp)
+            {
+                return GetLocalPort(Global.InboundSocks) + 1;
+            }
+            else if (protocol == "pac")
+            {
+                return GetLocalPort(Global.InboundSocks) + 2;
+            }
+            else if (protocol == "speedtest")
+            {
+                return GetLocalPort(Global.InboundSocks) + 103;
+            }
+
             int localPort = 0;
             foreach (InItem inItem in inbound)
             {
@@ -352,77 +432,125 @@ namespace v2rayN.Mode
         /// <summary>
         /// 版本(现在=2)
         /// </summary>
-        public int configVersion { get; set; }
+        public int configVersion
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 远程服务器地址
         /// </summary>
-        public string address { get; set; }
+        public string address
+        {
+            get; set;
+        }
         /// <summary>
         /// 远程服务器端口
         /// </summary>
-        public int port { get; set; }
+        public int port
+        {
+            get; set;
+        }
         /// <summary>
         /// 远程服务器ID
         /// </summary>
-        public string id { get; set; }
+        public string id
+        {
+            get; set;
+        }
         /// <summary>
         /// 远程服务器额外ID
         /// </summary>
-        public int alterId { get; set; }
+        public int alterId
+        {
+            get; set;
+        }
         /// <summary>
         /// 本地安全策略
         /// </summary>
-        public string security { get; set; }
+        public string security
+        {
+            get; set;
+        }
         /// <summary>
         /// tcp,kcp,ws
         /// </summary>
-        public string network { get; set; }
+        public string network
+        {
+            get; set;
+        }
         /// <summary>
         /// 备注或别名
         /// </summary>
-        public string remarks { get; set; }
+        public string remarks
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 伪装类型
         /// </summary>
-        public string headerType { get; set; }
+        public string headerType
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 伪装的域名
         /// </summary>
-        public string requestHost { get; set; }
+        public string requestHost
+        {
+            get; set;
+        }
 
         /// <summary>
         /// ws h2 path
         /// </summary>
-        public string path { get; set; }
+        public string path
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 底层传输安全
         /// </summary>
-        public string streamSecurity { get; set; }
+        public string streamSecurity
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 是否允许不安全连接（用于客户端）
         /// </summary>
-        public string allowInsecure { get; set; }
+        public string allowInsecure
+        {
+            get; set;
+        }
 
 
         /// <summary>
         /// config type(1=normal,2=custom)
         /// </summary>
-        public int configType { get; set; }
+        public int configType
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 
         /// </summary>
-        public string testResult { get; set; }
+        public string testResult
+        {
+            get; set;
+        }
 
         /// <summary>
         /// SubItem id
         /// </summary>
-        public string subid { get; set; }
+        public string subid
+        {
+            get; set;
+        }
     }
 
     [Serializable]
@@ -431,17 +559,26 @@ namespace v2rayN.Mode
         /// <summary>
         /// 本地监听端口
         /// </summary>
-        public int localPort { get; set; }
+        public int localPort
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 协议，默认为socks
         /// </summary>
-        public string protocol { get; set; }
+        public string protocol
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 允许udp
         /// </summary>
-        public bool udpEnabled { get; set; }
+        public bool udpEnabled
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 开启流量探测
@@ -455,31 +592,52 @@ namespace v2rayN.Mode
         /// <summary>
         /// 
         /// </summary>
-        public int mtu { get; set; }
+        public int mtu
+        {
+            get; set;
+        }
         /// <summary>
         /// 
         /// </summary>
-        public int tti { get; set; }
+        public int tti
+        {
+            get; set;
+        }
         /// <summary>
         /// 
         /// </summary>
-        public int uplinkCapacity { get; set; }
+        public int uplinkCapacity
+        {
+            get; set;
+        }
         /// <summary>
         /// 
         /// </summary>
-        public int downlinkCapacity { get; set; }
+        public int downlinkCapacity
+        {
+            get; set;
+        }
         /// <summary>
         /// 
         /// </summary>
-        public bool congestion { get; set; }
+        public bool congestion
+        {
+            get; set;
+        }
         /// <summary>
         /// 
         /// </summary>
-        public int readBufferSize { get; set; }
+        public int readBufferSize
+        {
+            get; set;
+        }
         /// <summary>
         /// 
         /// </summary>
-        public int writeBufferSize { get; set; }
+        public int writeBufferSize
+        {
+            get; set;
+        }
     }
 
 
@@ -489,17 +647,26 @@ namespace v2rayN.Mode
         /// <summary>
         /// 
         /// </summary>
-        public string id { get; set; }
+        public string id
+        {
+            get; set;
+        }
 
         /// <summary>
         /// 备注
         /// </summary>
-        public string remarks { get; set; }
+        public string remarks
+        {
+            get; set;
+        }
 
         /// <summary>
         /// url
         /// </summary>
-        public string url { get; set; }
+        public string url
+        {
+            get; set;
+        }
 
         /// <summary>
         /// enable

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

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 {
@@ -91,25 +91,35 @@ namespace v2rayN.Properties {
         }
         
         /// <summary>
-        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
-        internal static System.Drawing.Bitmap help {
+        internal static byte[] grpc_csharp_ext_x64_dll {
             get {
-                object obj = ResourceManager.GetObject("help", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
+                object obj = ResourceManager.GetObject("grpc_csharp_ext_x64_dll", resourceCulture);
+                return ((byte[])(obj));
             }
         }
         
         /// <summary>
         ///   查找 System.Byte[] 类型的本地化资源。
         /// </summary>
-        internal static byte[] mgwz_dll {
+        internal static byte[] grpc_csharp_ext_x86_dll {
             get {
-                object obj = ResourceManager.GetObject("mgwz_dll", resourceCulture);
+                object obj = ResourceManager.GetObject("grpc_csharp_ext_x86_dll", resourceCulture);
                 return ((byte[])(obj));
             }
         }
         
+        /// <summary>
+        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
+        /// </summary>
+        internal static System.Drawing.Bitmap help {
+            get {
+                object obj = ResourceManager.GetObject("help", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
         /// <summary>
         ///   查找 System.Drawing.Bitmap 类型的本地化资源。
         /// </summary>
@@ -157,6 +167,7 @@ namespace v2rayN.Properties {
         ///show-on-task-bar 0
         ///activity-animation 0
         ///forward-socks5 / 127.0.0.1:__SOCKS_PORT__ .
+        ///max-client-connections 2048
         ///hide-console
         /// 的本地化字符串。
         /// </summary>

v2rayN/v2rayN/Properties/Resources.resx

@@ -127,12 +127,15 @@
   <data name="checkupdate" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\checkupdate.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="grpc_csharp_ext_x64_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\grpc_csharp_ext.x64.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="grpc_csharp_ext_x86_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\grpc_csharp_ext.x86.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
   <data name="help" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\resources\help.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="mgwz_dll" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\resources\mgwz.dll.gz;System.Byte[], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
   <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>

v2rayN/v2rayN/Tool/Utils.cs

@@ -18,6 +18,7 @@ using ZXing;
 using ZXing.Common;
 using ZXing.QrCode;
 using System.Security.Principal;
+using v2rayN.Base;
 
 namespace v2rayN
 {

v2rayN/v2rayN/v2rayN.csproj

@@ -114,6 +114,7 @@
       <HintPath>LIB\System.Memory.dll</HintPath>
       <Private>False</Private>
     </Reference>
+    <Reference Include="System.Messaging" />
     <Reference Include="System.Net" />
     <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=4.0.4.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -140,7 +141,7 @@
     <Compile Include="Forms\AddServer4Form.Designer.cs">
       <DependentUpon>AddServer4Form.cs</DependentUpon>
     </Compile>
-    <Compile Include="Forms\ListViewFlickerFree.cs">
+    <Compile Include="Base\ListViewFlickerFree.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Forms\MainForm.cs">
@@ -181,23 +182,27 @@
     </Compile>
     <Compile Include="Handler\SpeedtestHandler.cs" />
     <Compile Include="Handler\StatisticsHandler.cs" />
-    <Compile Include="Handler\V2rayUpdateHandle.cs" />
-    <Compile Include="HttpProxyHandler\HttpWebServer.cs" />
-    <Compile Include="HttpProxyHandler\HttpWebServerB.cs" />
-    <Compile Include="HttpProxyHandler\PACFileWatcherHandle.cs" />
+    <Compile Include="Handler\DownloadHandle.cs" />
+    <Compile Include="Base\HttpWebServer.cs" />
+    <Compile Include="Base\HttpWebServerB.cs" />
     <Compile Include="HttpProxyHandler\PrivoxyHandler.cs" />
     <Compile Include="HttpProxyHandler\PACListHandle.cs" />
     <Compile Include="HttpProxyHandler\PACServerHandle.cs" />
     <Compile Include="HttpProxyHandler\ProxySetting.cs" />
     <Compile Include="HttpProxyHandler\SysProxyHandle.cs" />
     <Compile Include="HttpProxyHandler\HttpProxyHandle.cs" />
-    <Compile Include="HttpProxyHandler\WebClientEx.cs">
+    <Compile Include="Base\WebClientEx.cs">
       <SubType>Component</SubType>
     </Compile>
     <Compile Include="Mode\EMove.cs" />
     <Compile Include="Mode\ServerStatistics.cs" />
     <Compile Include="Mode\SysproxyConfig.cs" />
     <Compile Include="Mode\EConfigType.cs" />
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
     <Compile Include="Resx\ResUI.zh-Hans.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>
@@ -208,7 +213,7 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>ResUI.resx</DependentUpon>
     </Compile>
-    <Compile Include="StringEx.cs">
+    <Compile Include="Base\StringEx.cs">
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="Forms\AddServerForm.cs">
@@ -319,14 +324,9 @@
     </EmbeddedResource>
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
       <SubType>Designer</SubType>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
     </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
     <EmbeddedResource Include="app.config">
       <SubType>Designer</SubType>
     </EmbeddedResource>
@@ -342,6 +342,8 @@
     </Compile>
     <Protobuf Include="Protos\Statistics.proto" />
     <None Include="Resources\abp.js.gz" />
+    <None Include="Resources\grpc_csharp_ext.x64.dll.gz" />
+    <None Include="Resources\grpc_csharp_ext.x86.dll.gz" />
     <None Include="Resources\pac.txt.gz" />
     <None Include="Resources\sysproxy.exe.gz" />
     <None Include="Resources\sysproxy64.exe.gz" />
@@ -392,7 +394,6 @@
     <EmbeddedResource Include="Sample\SampleServerConfig.txt" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\mgwz.dll.gz" />
     <None Include="Resources\privoxy.exe.gz" />
     <None Include="Resources\restart.png" />
   </ItemGroup>
@@ -420,12 +421,6 @@
     <EmbeddedResource Include="LIB\System.Runtime.CompilerServices.Unsafe.dll" />
     <EmbeddedResource Include="LIB\zxing.dll" />
     <EmbeddedResource Include="LIB\zxing.presentation.dll" />
-    <Content Include="grpc_csharp_ext.x64.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="grpc_csharp_ext.x86.dll">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <EmbeddedResource Include="LIB\netstandard.dll" />
     <Content Include="Resources\help.png" />
     <None Include="Resources\notify.png" />