up pac

v2rayN/v2rayN/Base/HttpWebServer.cs

@@ -61,6 +61,7 @@ namespace v2rayN.Base
                             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

@@ -62,6 +62,7 @@ namespace v2rayN.Base
                         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/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.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/HttpProxyHandler/PACServerHandle.cs

@@ -28,14 +28,14 @@ namespace v2rayN.HttpProxyHandler
 
         public static void Init(Config config)
         {
-            //if (InitServer("*"))
+            if (InitServer("*"))
-            //{
-            //    pacPort = Global.pacPort;
-            //}
-            if (InitServer(Global.Loopback))
             {
                 pacPort = Global.pacPort;
             }
+            //else if (InitServer(Global.Loopback))
+            //{
+            //    pacPort = Global.pacPort;
+            //}
             else if (InitServerB(Global.Loopback))
             {
                 pacPort = Global.pacPort;