github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

add Outbound Freedom domainStrategy

pull/2500/head
2dust 2022-07-25 20:34:00 +08:00
parent 61b7997ae9
commit 8775c5e1f2
7 changed files with 251 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
v2rayN/v2rayN/Forms/OptionSettingForm.Designer.cs generated
View File

@ -50,6 +50,8 @@
this.txtlocalPort = new System.Windows.Forms.TextBox();
this.label2 = new System.Windows.Forms.Label();
this.tabPage2 = new System.Windows.Forms.TabPage();
this.cmbdomainStrategy4Freedom = new System.Windows.Forms.ComboBox();
this.label19 = new System.Windows.Forms.Label();
this.linkDnsObjectDoc = new System.Windows.Forms.LinkLabel();
this.txtremoteDNS = new System.Windows.Forms.TextBox();
this.label14 = new System.Windows.Forms.Label();
@ -270,12 +272,31 @@
// tabPage2
//
resources.ApplyResources(this.tabPage2, "tabPage2");
this.tabPage2.Controls.Add(this.cmbdomainStrategy4Freedom);
this.tabPage2.Controls.Add(this.label19);
this.tabPage2.Controls.Add(this.linkDnsObjectDoc);
this.tabPage2.Controls.Add(this.txtremoteDNS);
this.tabPage2.Controls.Add(this.label14);
this.tabPage2.Name = "tabPage2";
this.tabPage2.UseVisualStyleBackColor = true;
//
// cmbdomainStrategy4Freedom
//
resources.ApplyResources(this.cmbdomainStrategy4Freedom, "cmbdomainStrategy4Freedom");
this.cmbdomainStrategy4Freedom.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
this.cmbdomainStrategy4Freedom.FormattingEnabled = true;
this.cmbdomainStrategy4Freedom.Items.AddRange(new object[] {
resources.GetString("cmbdomainStrategy4Freedom.Items"),
resources.GetString("cmbdomainStrategy4Freedom.Items1"),
resources.GetString("cmbdomainStrategy4Freedom.Items2"),
resources.GetString("cmbdomainStrategy4Freedom.Items3")});
this.cmbdomainStrategy4Freedom.Name = "cmbdomainStrategy4Freedom";
//
// label19
//
resources.ApplyResources(this.label19, "label19");
this.label19.Name = "label19";
//
// linkDnsObjectDoc
//
resources.ApplyResources(this.linkDnsObjectDoc, "linkDnsObjectDoc");
@ -746,5 +767,7 @@
private System.Windows.Forms.ComboBox cmbSystemProxyAdvancedProtocol;
private System.Windows.Forms.Label label18;
private System.Windows.Forms.NumericUpDown numStatisticsFreshRate;
private System.Windows.Forms.ComboBox cmbdomainStrategy4Freedom;
private System.Windows.Forms.Label label19;
}
}

2
v2rayN/v2rayN/Forms/OptionSettingForm.cs
View File

@ -56,6 +56,7 @@ namespace v2rayN.Forms
//remoteDNS
txtremoteDNS.Text = config.remoteDNS;
cmbdomainStrategy4Freedom.Text = config.domainStrategy4Freedom;
chkdefAllowInsecure.Checked = config.defAllowInsecure;
@ -229,6 +230,7 @@ namespace v2rayN.Forms
//remoteDNS
config.remoteDNS = txtremoteDNS.Text.TrimEx();
config.domainStrategy4Freedom = cmbdomainStrategy4Freedom.Text;
config.defAllowInsecure = chkdefAllowInsecure.Checked;

229
v2rayN/v2rayN/Forms/OptionSettingForm.resx
View File

@ -146,6 +146,9 @@
<data name="&gt;&gt;tabPage7.Name" xml:space="preserve">
<value>tabPage7</value>
</data>
<data name="&gt;&gt;cmbdomainStrategy4Freedom.Parent" xml:space="preserve">
<value>tabPage2</value>
</data>
<data name="&gt;&gt;chkIgnoreGeoUpdateCore.Parent" xml:space="preserve">
<value>tabPage7</value>
</data>
@ -164,8 +167,8 @@
<data name="chkmuxEnabled.Location" type="System.Drawing.Point, System.Drawing">
<value>15, 129</value>
</data>
<data name="label11.Text" xml:space="preserve">
<value>readBufferSize</value>
<data name="&gt;&gt;cmbdomainStrategy4Freedom.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="btnSetLoopback.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
@ -174,8 +177,8 @@
<data name="&gt;&gt;chkudpEnabled.Name" xml:space="preserve">
<value>chkudpEnabled</value>
</data>
<data name="labCoreType5.TabIndex" type="System.Int32, mscorlib">
<value>45</value>
<data name="cmbdomainStrategy4Freedom.Size" type="System.Drawing.Size, System.Drawing">
<value>100, 20</value>
</data>
<data name="&gt;&gt;txtpass.Name" xml:space="preserve">
<value>txtpass</value>
@ -183,15 +186,15 @@
<data name="btnSetLoopback.Size" type="System.Drawing.Size, System.Drawing">
<value>282, 23</value>
</data>
<data name="cmbloglevel.Items1" xml:space="preserve">
<value>info</value>
</data>
<data name="label8.Text" xml:space="preserve">
<value>downlinkCapacity</value>
</data>
<data name="label6.Text" xml:space="preserve">
<value>mtu</value>
</data>
<data name="label19.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 12</value>
</data>
<data name="&gt;&gt;cmbCoreType2.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@ -225,12 +228,18 @@
<data name="&gt;&gt;label12.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="cmbdomainStrategy4Freedom.Location" type="System.Drawing.Point, System.Drawing">
<value>223, 398</value>
</data>
<data name="&gt;&gt;tabPageCoreType.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="label5.Text" xml:space="preserve">
<value>Log level</value>
</data>
<data name="txtautoUpdateInterval.Location" type="System.Drawing.Point, System.Drawing">
<value>351, 157</value>
</data>
<data name="&gt;&gt;label4.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
@ -318,14 +327,14 @@
<data name="&gt;&gt;txtpass.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name="chkKeepOlderDedupl.Text" xml:space="preserve">
<value>Keep older when deduplication</value>
<data name="cmbdomainStrategy4Freedom.Items1" xml:space="preserve">
<value>UseIP</value>
</data>
<data name="&gt;&gt;txtlocalPort.Name" xml:space="preserve">
<value>txtlocalPort</value>
</data>
<data name="chkudpEnabled.Size" type="System.Drawing.Size, System.Drawing">
<value>84, 16</value>
<data name="&gt;&gt;label19.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;groupBox1.Type" xml:space="preserve">
<value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@ -382,7 +391,7 @@
<value>13</value>
</data>
<data name="&gt;&gt;label14.ZOrder" xml:space="preserve">
<value>2</value>
<value>4</value>
</data>
<data name="&gt;&gt;chkKeepOlderDedupl.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@ -396,6 +405,9 @@
<data name="chksniffingEnabled.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;cmbCoreType4.Name" xml:space="preserve">
<value>cmbCoreType4</value>
</data>
<data name="&gt;&gt;chkKeepOlderDedupl.ZOrder" xml:space="preserve">
<value>11</value>
</data>
@ -468,8 +480,8 @@
<data name="label10.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;tabPage2.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
<data name="cmbCoreType2.Location" type="System.Drawing.Point, System.Drawing">
<value>117, 68</value>
</data>
<data name="&gt;&gt;chkEnableSecurityProtocolTls13.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@ -480,21 +492,21 @@
<data name="txtKcpdownlinkCapacity.TabIndex" type="System.Int32, mscorlib">
<value>11</value>
</data>
<data name="chkdefAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
<value>15, 192</value>
</data>
<data name="cmbCoreType6.Location" type="System.Drawing.Point, System.Drawing">
<value>117, 172</value>
</data>
<data name="label13.Text" xml:space="preserve">
<value>Use semicolon (;)</value>
</data>
<data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
<data name="label14.Size" type="System.Drawing.Size, System.Drawing">
<value>281, 12</value>
</data>
<data name="&gt;&gt;tabPage2.Parent" xml:space="preserve">
<value>tabControl1</value>
</data>
<data name="&gt;&gt;label14.Parent" xml:space="preserve">
<value>tabPage2</value>
</data>
<data name="&gt;&gt;cmbloglevel.ZOrder" xml:space="preserve">
<value>12</value>
</data>
@ -582,8 +594,8 @@
<data name="txtKcpreadBufferSize.Size" type="System.Drawing.Size, System.Drawing">
<value>94, 21</value>
</data>
<data name="&gt;&gt;label11.ZOrder" xml:space="preserve">
<value>4</value>
<data name="txtKcpreadBufferSize.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
</data>
<data name="label11.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -624,11 +636,11 @@
<data name="&gt;&gt;labCoreType3.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="&gt;&gt;tabControl1.Parent" xml:space="preserve">
<value>$this</value>
<data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="&gt;&gt;btnSetLoopback.Name" xml:space="preserve">
<value>btnSetLoopback</value>
<data name="&gt;&gt;label14.Parent" xml:space="preserve">
<value>tabPage2</value>
</data>
<data name="&gt;&gt;chkEnableSecurityProtocolTls13.Name" xml:space="preserve">
<value>chkEnableSecurityProtocolTls13</value>
@ -687,6 +699,9 @@
<data name="chksniffingEnabled.Size" type="System.Drawing.Size, System.Drawing">
<value>120, 16</value>
</data>
<data name="&gt;&gt;tabControl1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;chkdefAllowInsecure.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
@ -702,8 +717,8 @@
<data name="numStatisticsFreshRate.Location" type="System.Drawing.Point, System.Drawing">
<value>663, 37</value>
</data>
<data name="&gt;&gt;label17.Name" xml:space="preserve">
<value>label17</value>
<data name="cmbdomainStrategy4Freedom.TabIndex" type="System.Int32, mscorlib">
<value>41</value>
</data>
<data name="txtautoUpdateSubInterval.Size" type="System.Drawing.Size, System.Drawing">
<value>97, 21</value>
@ -732,9 +747,6 @@
<data name="&gt;&gt;tabPageCoreType.Name" xml:space="preserve">
<value>tabPageCoreType</value>
</data>
<data name="label12.Text" xml:space="preserve">
<value>Do not use proxy server for addresses beginning with</value>
</data>
<data name="&gt;&gt;labCoreType5.Parent" xml:space="preserve">
<value>tabPageCoreType</value>
</data>
@ -771,6 +783,9 @@
<data name="&gt;&gt;chkmuxEnabled.Parent" xml:space="preserve">
<value>groupBox1</value>
</data>
<data name="&gt;&gt;label11.ZOrder" xml:space="preserve">
<value>4</value>
</data>
<data name="&gt;&gt;txtremoteDNS.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@ -819,6 +834,9 @@
<data name="&gt;&gt;chkmuxEnabled.Name" xml:space="preserve">
<value>chkmuxEnabled</value>
</data>
<data name="&gt;&gt;labCoreType3.Parent" xml:space="preserve">
<value>tabPageCoreType</value>
</data>
<data name="tabPage1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
@ -829,10 +847,10 @@
<value>label2</value>
</data>
<data name="&gt;&gt;txtremoteDNS.ZOrder" xml:space="preserve">
<value>1</value>
<value>3</value>
</data>
<data name="chkAutoRun.Text" xml:space="preserve">
<value>Automatically start at system startup</value>
<data name="&gt;&gt;labCoreType2.Parent" xml:space="preserve">
<value>tabPageCoreType</value>
</data>
<data name="&gt;&gt;chksniffingEnabled.Parent" xml:space="preserve">
<value>groupBox1</value>
@ -846,9 +864,6 @@
<data name="&gt;&gt;tabPage7.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="txtKcpreadBufferSize.TabIndex" type="System.Int32, mscorlib">
<value>13</value>
</data>
<data name="&gt;&gt;label13.Name" xml:space="preserve">
<value>label13</value>
</data>
@ -882,15 +897,24 @@
<data name="&gt;&gt;txtautoUpdateSubInterval.Type" xml:space="preserve">
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="cmbdomainStrategy4Freedom.Items3" xml:space="preserve">
<value>UseIPv6</value>
</data>
<data name="chkudpEnabled.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="btnClose.TabIndex" type="System.Int32, mscorlib">
<value>7</value>
</data>
<data name="&gt;&gt;label19.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="label3.Text" xml:space="preserve">
<value>Automatic update interval of subscriptions (hours)</value>
</data>
<data name="&gt;&gt;label19.Name" xml:space="preserve">
<value>label19</value>
</data>
<data name="label14.Text" xml:space="preserve">
<value>Custom DNS (multiple, separated by commas (,))</value>
</data>
@ -927,9 +951,6 @@
<data name="txtsystemProxyExceptions.TabIndex" type="System.Int32, mscorlib">
<value>41</value>
</data>
<data name="label16.TabIndex" type="System.Int32, mscorlib">
<value>39</value>
</data>
<data name="txtKcpmtu.Location" type="System.Drawing.Point, System.Drawing">
<value>111, 24</value>
</data>
@ -969,8 +990,8 @@
<data name="chkdefAllowInsecure.Size" type="System.Drawing.Size, System.Drawing">
<value>102, 16</value>
</data>
<data name="&gt;&gt;cmbCoreType4.Name" xml:space="preserve">
<value>cmbCoreType4</value>
<data name="label19.Text" xml:space="preserve">
<value>Outbound Freedom domainStrategy</value>
</data>
<data name="&gt;&gt;label12.Parent" xml:space="preserve">
<value>groupBox2</value>
@ -1017,6 +1038,9 @@
<data name="chkEnableStatistics.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label19.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 402</value>
</data>
<data name="label5.TabIndex" type="System.Int32, mscorlib">
<value>8</value>
</data>
@ -1083,6 +1107,9 @@
<data name="tabControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 10</value>
</data>
<data name="label11.Text" xml:space="preserve">
<value>readBufferSize</value>
</data>
<data name="labCoreType5.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@ -1095,9 +1122,15 @@
<data name="label16.Location" type="System.Drawing.Point, System.Drawing">
<value>397, 65</value>
</data>
<data name="label19.TabIndex" type="System.Int32, mscorlib">
<value>42</value>
</data>
<data name="&gt;&gt;cmbCoreType1.Parent" xml:space="preserve">
<value>tabPageCoreType</value>
</data>
<data name="&gt;&gt;label19.Parent" xml:space="preserve">
<value>tabPage2</value>
</data>
<data name="&gt;&gt;chksniffingEnabled.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@ -1119,9 +1152,6 @@
<data name="labCoreType2.Text" xml:space="preserve">
<value>Core Type</value>
</data>
<data name="&gt;&gt;label6.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="label8.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -1131,12 +1161,15 @@
<data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
<value>728, 427</value>
</data>
<data name="&gt;&gt;labCoreType2.Name" xml:space="preserve">
<value>labCoreType2</value>
<data name="&gt;&gt;btnSetLoopback.ZOrder" xml:space="preserve">
<value>7</value>
</data>
<data name="&gt;&gt;txtautoUpdateInterval.ZOrder" xml:space="preserve">
<value>8</value>
</data>
<data name="label17.Text" xml:space="preserve">
<value>Tray right-click menu servers display limit</value>
</data>
<data name="chksniffingEnabled.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
@ -1224,8 +1257,8 @@
<data name="&gt;&gt;txtuser.ZOrder" xml:space="preserve">
<value>3</value>
</data>
<data name="txtautoUpdateInterval.Location" type="System.Drawing.Point, System.Drawing">
<value>351, 157</value>
<data name="&gt;&gt;label6.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="txtautoUpdateSubInterval.TabIndex" type="System.Int32, mscorlib">
<value>43</value>
@ -1356,8 +1389,8 @@
<data name="&gt;&gt;label8.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="chkdefAllowInsecure.Location" type="System.Drawing.Point, System.Drawing">
<value>15, 192</value>
<data name="&gt;&gt;btnClose.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;tabPage2.Name" xml:space="preserve">
<value>tabPage2</value>
@ -1366,7 +1399,7 @@
<value>btnClose</value>
</data>
<data name="txtremoteDNS.Size" type="System.Drawing.Size, System.Drawing">
<value>638, 356</value>
<value>638, 349</value>
</data>
<data name="&gt;&gt;chkdefAllowInsecure.Name" xml:space="preserve">
<value>chkdefAllowInsecure</value>
@ -1407,6 +1440,9 @@
<data name="&gt;&gt;txtKcptti.Name" xml:space="preserve">
<value>txtKcptti</value>
</data>
<data name="label19.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="label6.Size" type="System.Drawing.Size, System.Drawing">
<value>23, 12</value>
</data>
@ -1422,6 +1458,9 @@
<data name="label14.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;cmbdomainStrategy4Freedom.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;chkudpEnabled.Type" xml:space="preserve">
<value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@ -1470,8 +1509,8 @@
<data name="&gt;&gt;label4.Name" xml:space="preserve">
<value>label4</value>
</data>
<data name="chkAllowLANConn.TabIndex" type="System.Int32, mscorlib">
<value>29</value>
<data name="chkKeepOlderDedupl.Text" xml:space="preserve">
<value>Keep older when deduplication</value>
</data>
<data name="&gt;&gt;label8.Name" xml:space="preserve">
<value>label8</value>
@ -1536,8 +1575,8 @@
<data name="cmbprotocol.TabIndex" type="System.Int32, mscorlib">
<value>12</value>
</data>
<data name="label17.Text" xml:space="preserve">
<value>Tray right-click menu servers display limit</value>
<data name="chkAutoRun.Text" xml:space="preserve">
<value>Automatically start at system startup</value>
</data>
<data name="chkKcpcongestion.Text" xml:space="preserve">
<value>congestion</value>
@ -1647,12 +1686,18 @@
<data name="&gt;&gt;txtautoUpdateInterval.Name" xml:space="preserve">
<value>txtautoUpdateInterval</value>
</data>
<data name="txtKcpuplinkCapacity.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
</data>
<data name="chkAutoRun.Size" type="System.Drawing.Size, System.Drawing">
<value>246, 16</value>
</data>
<data name="&gt;&gt;tabPage1.Name" xml:space="preserve">
<value>tabPage1</value>
</data>
<data name="&gt;&gt;labCoreType2.Name" xml:space="preserve">
<value>labCoreType2</value>
</data>
<data name="&gt;&gt;tabPage6.ZOrder" xml:space="preserve">
<value>2</value>
</data>
@ -1716,6 +1761,9 @@
<data name="label10.TabIndex" type="System.Int32, mscorlib">
<value>14</value>
</data>
<data name="tabPage6.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="chkEnableStatistics.TabIndex" type="System.Int32, mscorlib">
<value>29</value>
</data>
@ -1737,6 +1785,9 @@
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="&gt;&gt;cmbCoreType3.Parent" xml:space="preserve">
<value>tabPageCoreType</value>
</data>
<data name="label15.TabIndex" type="System.Int32, mscorlib">
<value>37</value>
</data>
@ -1797,21 +1848,18 @@
<data name="label12.TabIndex" type="System.Int32, mscorlib">
<value>40</value>
</data>
<data name="chkmuxEnabled.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 16</value>
</data>
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
<value>224, 29</value>
</data>
<data name="cmbCoreType3.TabIndex" type="System.Int32, mscorlib">
<value>40</value>
</data>
<data name="&gt;&gt;tabPage2.Type" xml:space="preserve">
<value>System.Windows.Forms.TabPage, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>722, 421</value>
</data>
<data name="cmbCoreType2.Location" type="System.Drawing.Point, System.Drawing">
<value>117, 68</value>
</data>
<data name="&gt;&gt;txtsystemProxyExceptions.ZOrder" xml:space="preserve">
<value>4</value>
</data>
@ -1845,12 +1893,12 @@
<data name="label4.TabIndex" type="System.Int32, mscorlib">
<value>38</value>
</data>
<data name="label14.Size" type="System.Drawing.Size, System.Drawing">
<value>281, 12</value>
</data>
<data name="label14.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="cmbdomainStrategy4Freedom.Items2" xml:space="preserve">
<value>UseIPv4</value>
</data>
<data name="chkKcpcongestion.Location" type="System.Drawing.Point, System.Drawing">
<value>20, 143</value>
</data>
@ -1929,6 +1977,9 @@
<data name="chkAllowLANConn.Size" type="System.Drawing.Size, System.Drawing">
<value>204, 16</value>
</data>
<data name="label19.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="labCoreType1.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
@ -1950,6 +2001,9 @@
<data name="txttrayMenuServersLimit.TabIndex" type="System.Int32, mscorlib">
<value>45</value>
</data>
<data name="&gt;&gt;label17.Name" xml:space="preserve">
<value>label17</value>
</data>
<data name="labCoreType4.Size" type="System.Drawing.Size, System.Drawing">
<value>59, 12</value>
</data>
@ -1977,8 +2031,8 @@
<data name="cmbloglevel.Items" xml:space="preserve">
<value>debug</value>
</data>
<data name="&gt;&gt;btnSetLoopback.ZOrder" xml:space="preserve">
<value>7</value>
<data name="cmbloglevel.Items1" xml:space="preserve">
<value>info</value>
</data>
<data name="tabPage6.Text" xml:space="preserve">
<value>Core: KCP settings</value>
@ -2016,6 +2070,9 @@
<data name="&gt;&gt;chkKcpcongestion.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="chkudpEnabled.Size" type="System.Drawing.Size, System.Drawing">
<value>84, 16</value>
</data>
<data name="&gt;&gt;cmbCoreType1.Type" xml:space="preserve">
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@ -2052,17 +2109,14 @@
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>728, 427</value>
</data>
<data name="&gt;&gt;btnClose.Type" xml:space="preserve">
<value>System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;label10.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="cmbSystemProxyAdvancedProtocol.Size" type="System.Drawing.Size, System.Drawing">
<value>638, 20</value>
</data>
<data name="&gt;&gt;labCoreType2.Parent" xml:space="preserve">
<value>tabPageCoreType</value>
<data name="chkAllowLANConn.TabIndex" type="System.Int32, mscorlib">
<value>29</value>
</data>
<data name="linkDnsObjectDoc.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
@ -2073,17 +2127,20 @@
<data name="&gt;&gt;txtKcpmtu.ZOrder" xml:space="preserve">
<value>11</value>
</data>
<data name="labCoreType5.TabIndex" type="System.Int32, mscorlib">
<value>45</value>
</data>
<data name="&gt;&gt;cmbprotocol.Name" xml:space="preserve">
<value>cmbprotocol</value>
</data>
<data name="tabPage6.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
<data name="chkmuxEnabled.Size" type="System.Drawing.Size, System.Drawing">
<value>174, 16</value>
</data>
<data name="&gt;&gt;label11.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
<data name="&gt;&gt;cmbCoreType3.Parent" xml:space="preserve">
<value>tabPageCoreType</value>
<data name="label16.TabIndex" type="System.Int32, mscorlib">
<value>39</value>
</data>
<data name="&gt;&gt;tabPageCoreType.ZOrder" xml:space="preserve">
<value>4</value>
@ -2100,17 +2157,17 @@
<data name="&gt;&gt;linkDnsObjectDoc.Parent" xml:space="preserve">
<value>tabPage2</value>
</data>
<data name="&gt;&gt;labCoreType3.Parent" xml:space="preserve">
<value>tabPageCoreType</value>
</data>
<data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
<data name="&gt;&gt;btnSetLoopback.Name" xml:space="preserve">
<value>btnSetLoopback</value>
</data>
<data name="labCoreType2.AutoSize" type="System.Boolean, mscorlib">
<value>True</value>
</data>
<data name="txtKcpuplinkCapacity.TabIndex" type="System.Int32, mscorlib">
<value>9</value>
<data name="&gt;&gt;cmbdomainStrategy4Freedom.Name" xml:space="preserve">
<value>cmbdomainStrategy4Freedom</value>
</data>
<data name="label12.Text" xml:space="preserve">
<value>Do not use proxy server for addresses beginning with</value>
</data>
<data name="panel1.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value>
@ -2121,6 +2178,9 @@
<data name="label16.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
<value>NoControl</value>
</data>
<data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
<value>75, 23</value>
</data>
<data name="cmbSystemProxyAdvancedProtocol.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 371</value>
</data>
@ -2139,6 +2199,9 @@
<data name="label18.Text" xml:space="preserve">
<value>Advanced proxy settings, protocol selection (optional)</value>
</data>
<data name="cmbdomainStrategy4Freedom.Items" xml:space="preserve">
<value>AsIs</value>
</data>
<data name="&gt;&gt;label17.Type" xml:space="preserve">
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</data>
@ -2152,7 +2215,7 @@
<value>1</value>
</data>
<data name="&gt;&gt;linkDnsObjectDoc.ZOrder" xml:space="preserve">
<value>0</value>
<value>2</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value>

81
v2rayN/v2rayN/Forms/OptionSettingForm.zh-Hans.resx
View File

@ -121,6 +121,18 @@
<value>取消(&amp;C)</value>
</data>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>662, 469</value>
</data>
<data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
<value>654, 443</value>
</data>
<data name="tabPage1.Text" xml:space="preserve">
<value> Core:基础设置 </value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>648, 437</value>
</data>
<data name="label16.Size" type="System.Drawing.Size, System.Drawing">
<value>53, 12</value>
</data>
@ -208,14 +220,17 @@
<data name="label2.Text" xml:space="preserve">
<value>本地监听端口</value>
</data>
<data name="groupBox1.Size" type="System.Drawing.Size, System.Drawing">
<value>648, 437</value>
</data>
<data name="tabPage1.Size" type="System.Drawing.Size, System.Drawing">
<data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
<value>654, 443</value>
</data>
<data name="tabPage1.Text" xml:space="preserve">
<value> Core:基础设置 </value>
<data name="tabPage2.Text" xml:space="preserve">
<value> Core:DNS设置 </value>
</data>
<data name="cmbdomainStrategy4Freedom.Location" type="System.Drawing.Point, System.Drawing">
<value>223, 413</value>
</data>
<data name="label19.Location" type="System.Drawing.Point, System.Drawing">
<value>8, 417</value>
</data>
<data name="linkDnsObjectDoc.Size" type="System.Drawing.Size, System.Drawing">
<value>161, 12</value>
@ -223,24 +238,27 @@
<data name="linkDnsObjectDoc.Text" xml:space="preserve">
<value>支持填写DnsObject,JSON格式</value>
</data>
<data name="txtremoteDNS.Size" type="System.Drawing.Size, System.Drawing">
<value>638, 366</value>
</data>
<data name="label14.Size" type="System.Drawing.Size, System.Drawing">
<value>191, 12</value>
</data>
<data name="label14.Text" xml:space="preserve">
<value>自定义DNS(可多个,用逗号(,)隔开)</value>
</data>
<data name="tabPage2.Size" type="System.Drawing.Size, System.Drawing">
<value>654, 443</value>
</data>
<data name="tabPage2.Text" xml:space="preserve">
<value> Core:DNS设置 </value>
</data>
<data name="tabPage6.Size" type="System.Drawing.Size, System.Drawing">
<value>654, 443</value>
</data>
<data name="tabPage6.Text" xml:space="preserve">
<value> Core:KCP设置 </value>
</data>
<data name="tabPage7.Size" type="System.Drawing.Size, System.Drawing">
<value>654, 443</value>
</data>
<data name="tabPage7.Text" xml:space="preserve">
<value> v2rayN设置 </value>
</data>
<data name="numStatisticsFreshRate.Location" type="System.Drawing.Point, System.Drawing">
<value>472, 37</value>
</data>
@ -316,18 +334,24 @@
<data name="chkAutoRun.Text" xml:space="preserve">
<value>开机自动启动(可能会不成功)</value>
</data>
<data name="tabPage7.Size" type="System.Drawing.Size, System.Drawing">
<value>654, 443</value>
</data>
<data name="tabPage7.Text" xml:space="preserve">
<value> v2rayN设置 </value>
</data>
<data name="tabPageCoreType.Size" type="System.Drawing.Size, System.Drawing">
<value>654, 443</value>
</data>
<data name="tabPageCoreType.Text" xml:space="preserve">
<value> Core类型设置 </value>
</data>
<data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
<value>654, 443</value>
</data>
<data name="tabPage3.Text" xml:space="preserve">
<value> 系统代理设置 </value>
</data>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>654, 443</value>
</data>
<data name="groupBox2.Text" xml:space="preserve">
<value>例外</value>
</data>
<data name="label18.Size" type="System.Drawing.Size, System.Drawing">
<value>173, 12</value>
</data>
@ -346,30 +370,15 @@
<data name="label12.Text" xml:space="preserve">
<value>对于下列字符开头的地址不使用代理服务器:</value>
</data>
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
<value>654, 443</value>
</data>
<data name="groupBox2.Text" xml:space="preserve">
<value>例外</value>
</data>
<data name="tabPage3.Size" type="System.Drawing.Size, System.Drawing">
<value>654, 443</value>
</data>
<data name="tabPage3.Text" xml:space="preserve">
<value> 系统代理设置 </value>
</data>
<data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>662, 469</value>
</data>
<data name="btnOK.Text" xml:space="preserve">
<value>确定(&amp;O)</value>
</data>
<data name="panel2.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 479</value>
</data>
<data name="panel2.Size" type="System.Drawing.Size, System.Drawing">
<value>662, 60</value>
</data>
<data name="btnOK.Text" xml:space="preserve">
<value>确定(&amp;O)</value>
</data>
<data name="panel1.Size" type="System.Drawing.Size, System.Drawing">
<value>662, 10</value>
</data>

19
v2rayN/v2rayN/Handler/V2rayConfigHandler.cs
View File

@ -833,6 +833,14 @@ namespace v2rayN.Handler
return 0;
}
//Outbound Freedom domainStrategy
if (!string.IsNullOrWhiteSpace(config.domainStrategy4Freedom))
{
var outbound = v2rayConfig.outbounds[1];
outbound.settings.domainStrategy = config.domainStrategy4Freedom;
outbound.settings.userLevel = 0;
}
var obj = Utils.ParseJson(config.remoteDNS);
if (obj != null && obj.ContainsKey("servers"))
{
@ -1481,10 +1489,13 @@ namespace v2rayN.Handler
msg = ResUI.FailedGenDefaultConfiguration;
return "";
}
List<IPEndPoint> lstIpEndPoints = null;
List<IPEndPoint> lstIpEndPoints = new List<IPEndPoint>();
List<TcpConnectionInformation> lstTcpConns = new List<TcpConnectionInformation>();
try
{
lstIpEndPoints = new List<IPEndPoint>(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpListeners());
lstIpEndPoints.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveUdpListeners());
lstTcpConns.AddRange(IPGlobalProperties.GetIPGlobalProperties().GetActiveTcpConnections());
}
catch (Exception ex)
{
@ -1525,6 +1536,10 @@ namespace v2rayN.Handler
{
continue;
}
if (lstTcpConns != null && lstTcpConns.FindIndex(_it => _it.LocalEndPoint.Port == k) >= 0)
{
continue;
}
//found
port = k;
httpPort = port + 1;

8
v2rayN/v2rayN/Mode/Config.cs
View File

@ -84,6 +84,14 @@ namespace v2rayN.Mode
get; set;
}
/// <summary>
/// Outbound Freedom domainStrategy
/// </summary>
public string domainStrategy4Freedom
{
get; set;
}
/// <summary>
/// 是否允许不安全连接
/// </summary>

10
v2rayN/v2rayN/Mode/V2rayConfig.cs
View File

@ -224,6 +224,16 @@ namespace v2rayN.Mode
///
/// </summary>
public Response response { get; set; }
/// <summary>
///
/// </summary>
public string domainStrategy { get; set; }
/// <summary>
///
/// </summary>
public int? userLevel { get; set; }
}
public class VnextItem