mirror of
https://github.com/2dust/v2rayN.git
synced 2025-04-20 06:02:23 +00:00
up4.1
This commit is contained in:
2dust
parent
3c550e2803
commit
03c4954c27
10 changed files with 68 additions and 246 deletions
|
|
@ -32,8 +32,6 @@
|
|||
this.groupBox2 = new System.Windows.Forms.GroupBox();
|
||||
this.btnExpand = new System.Windows.Forms.Button();
|
||||
this.label4 = new System.Windows.Forms.Label();
|
||||
this.label1 = new System.Windows.Forms.Label();
|
||||
this.cmbroutingMode = new System.Windows.Forms.ComboBox();
|
||||
this.cmbOutboundTag = new System.Windows.Forms.ComboBox();
|
||||
this.btnRemove = new System.Windows.Forms.Button();
|
||||
this.txtUserRule = new System.Windows.Forms.TextBox();
|
||||
|
|
@ -48,8 +46,6 @@
|
|||
resources.ApplyResources(this.groupBox2, "groupBox2");
|
||||
this.groupBox2.Controls.Add(this.btnExpand);
|
||||
this.groupBox2.Controls.Add(this.label4);
|
||||
this.groupBox2.Controls.Add(this.label1);
|
||||
this.groupBox2.Controls.Add(this.cmbroutingMode);
|
||||
this.groupBox2.Controls.Add(this.cmbOutboundTag);
|
||||
this.groupBox2.Controls.Add(this.btnRemove);
|
||||
this.groupBox2.Controls.Add(this.txtUserRule);
|
||||
|
|
@ -71,24 +67,6 @@
|
|||
resources.ApplyResources(this.label4, "label4");
|
||||
this.label4.Name = "label4";
|
||||
//
|
||||
// label1
|
||||
//
|
||||
resources.ApplyResources(this.label1, "label1");
|
||||
this.label1.Name = "label1";
|
||||
//
|
||||
// cmbroutingMode
|
||||
//
|
||||
resources.ApplyResources(this.cmbroutingMode, "cmbroutingMode");
|
||||
this.cmbroutingMode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
|
||||
this.cmbroutingMode.FormattingEnabled = true;
|
||||
this.cmbroutingMode.Items.AddRange(new object[] {
|
||||
resources.GetString("cmbroutingMode.Items"),
|
||||
resources.GetString("cmbroutingMode.Items1"),
|
||||
resources.GetString("cmbroutingMode.Items2"),
|
||||
resources.GetString("cmbroutingMode.Items3"),
|
||||
resources.GetString("cmbroutingMode.Items4")});
|
||||
this.cmbroutingMode.Name = "cmbroutingMode";
|
||||
//
|
||||
// cmbOutboundTag
|
||||
//
|
||||
resources.ApplyResources(this.cmbOutboundTag, "cmbOutboundTag");
|
||||
|
|
@ -151,8 +129,6 @@
|
|||
private System.Windows.Forms.Label label3;
|
||||
private System.Windows.Forms.Button btnRemove;
|
||||
private System.Windows.Forms.ComboBox cmbOutboundTag;
|
||||
private System.Windows.Forms.Label label1;
|
||||
private System.Windows.Forms.ComboBox cmbroutingMode;
|
||||
private System.Windows.Forms.Label label4;
|
||||
private System.Windows.Forms.Button btnExpand;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,8 +31,6 @@ namespace v2rayN.Forms
|
|||
{
|
||||
txtRemarks.Text = routingItem.remarks.ToString();
|
||||
cmbOutboundTag.Text = routingItem.outboundTag;
|
||||
int.TryParse(routingItem.routingMode, out int routingMode);
|
||||
cmbroutingMode.SelectedIndex = routingMode;
|
||||
txtUserRule.Text = Utils.List2String(routingItem.userRules, true);
|
||||
}
|
||||
}
|
||||
|
|
@ -42,7 +40,6 @@ namespace v2rayN.Forms
|
|||
{
|
||||
routingItem.remarks = txtRemarks.Text.TrimEx();
|
||||
routingItem.outboundTag = cmbOutboundTag.Text;
|
||||
routingItem.routingMode = cmbroutingMode.SelectedIndex.ToString();
|
||||
routingItem.userRules = Utils.String2List(txtUserRule.Text);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -117,9 +117,6 @@
|
|||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<data name="label1.Text" xml:space="preserve">
|
||||
<value>Pre-defined</value>
|
||||
</data>
|
||||
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
|
||||
<data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
|
|
@ -128,29 +125,23 @@
|
|||
<data name="$this.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>733, 164</value>
|
||||
</data>
|
||||
<data name="groupBox2.Text" xml:space="preserve">
|
||||
<value>Rule</value>
|
||||
</data>
|
||||
<data name="cmbOutboundTag.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>119, 20</value>
|
||||
</data>
|
||||
<data name="cmbOutboundTag.Items1" xml:space="preserve">
|
||||
<value>direct</value>
|
||||
</data>
|
||||
<data name=">>txtUserRule.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=">>label3.Parent" xml:space="preserve">
|
||||
<value>groupBox2</value>
|
||||
</data>
|
||||
<data name=">>label3.ZOrder" xml:space="preserve">
|
||||
<value>9</value>
|
||||
</data>
|
||||
<data name="cmbroutingMode.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>127, 53</value>
|
||||
</data>
|
||||
<data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>75, 23</value>
|
||||
</data>
|
||||
<data name="txtUserRule.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>127, 87</value>
|
||||
</data>
|
||||
<data name="btnRemove.Text" xml:space="preserve">
|
||||
<value>Remove</value>
|
||||
<value>127, 50</value>
|
||||
</data>
|
||||
<data name=">>txtRemarks.Name" xml:space="preserve">
|
||||
<value>txtRemarks</value>
|
||||
|
|
@ -162,14 +153,14 @@
|
|||
<data name="txtUserRule.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>23</value>
|
||||
</data>
|
||||
<data name=">>txtUserRule.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name=">>$this.Name" xml:space="preserve">
|
||||
<value>RoutingSettingControl</value>
|
||||
</data>
|
||||
<data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>162, 21</value>
|
||||
</data>
|
||||
<data name=">>label1.Name" xml:space="preserve">
|
||||
<value>label1</value>
|
||||
<data name="btnExpand.Text" xml:space="preserve">
|
||||
<value>Expand</value>
|
||||
</data>
|
||||
<data name=">>txtRemarks.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
|
|
@ -181,7 +172,7 @@
|
|||
<value>28</value>
|
||||
</data>
|
||||
<data name=">>txtRemarks.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
<value>5</value>
|
||||
</data>
|
||||
<data name="cmbOutboundTag.Items" xml:space="preserve">
|
||||
<value>proxy</value>
|
||||
|
|
@ -189,11 +180,11 @@
|
|||
<data name="label3.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>77, 12</value>
|
||||
</data>
|
||||
<data name="cmbOutboundTag.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>362, 21</value>
|
||||
<data name=">>cmbOutboundTag.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
</data>
|
||||
<data name=">>cmbroutingMode.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.ComboBox, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
<data name="btnExpand.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>544, 21</value>
|
||||
</data>
|
||||
<data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
|
||||
<value>6, 12</value>
|
||||
|
|
@ -213,41 +204,20 @@
|
|||
<data name=">>btnExpand.Name" xml:space="preserve">
|
||||
<value>btnExpand</value>
|
||||
</data>
|
||||
<data name=">>label1.Parent" xml:space="preserve">
|
||||
<value>groupBox2</value>
|
||||
</data>
|
||||
<data name="label3.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>12, 87</value>
|
||||
</data>
|
||||
<data name=">>label1.ZOrder" xml:space="preserve">
|
||||
<value>2</value>
|
||||
<data name=">>txtUserRule.Name" xml:space="preserve">
|
||||
<value>txtUserRule</value>
|
||||
</data>
|
||||
<data name=">>cmbroutingMode.Name" xml:space="preserve">
|
||||
<value>cmbroutingMode</value>
|
||||
<data name="txtUserRule.Multiline" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="cmbroutingMode.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>255, 20</value>
|
||||
<data name="btnExpand.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>75, 23</value>
|
||||
</data>
|
||||
<data name=">>label4.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="cmbroutingMode.Items1" xml:space="preserve">
|
||||
<value>Global</value>
|
||||
</data>
|
||||
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>71, 12</value>
|
||||
</data>
|
||||
<data name="cmbroutingMode.Items3" xml:space="preserve">
|
||||
<value>Bypass mainland address</value>
|
||||
</data>
|
||||
<data name="cmbroutingMode.Items2" xml:space="preserve">
|
||||
<value>Bypassing the LAN address</value>
|
||||
</data>
|
||||
<data name=">>cmbOutboundTag.ZOrder" xml:space="preserve">
|
||||
<value>4</value>
|
||||
</data>
|
||||
<data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>640, 21</value>
|
||||
<data name=">>cmbOutboundTag.Parent" xml:space="preserve">
|
||||
<value>groupBox2</value>
|
||||
</data>
|
||||
<data name="groupBox2.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
|
||||
<value>Fill</value>
|
||||
|
|
@ -261,18 +231,18 @@
|
|||
<data name="cmbOutboundTag.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>25</value>
|
||||
</data>
|
||||
<data name=">>cmbOutboundTag.Parent" xml:space="preserve">
|
||||
<data name=">>groupBox2.Name" xml:space="preserve">
|
||||
<value>groupBox2</value>
|
||||
</data>
|
||||
<data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>11</value>
|
||||
</data>
|
||||
<data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>47, 12</value>
|
||||
</data>
|
||||
<data name="txtUserRule.Multiline" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name=">>btnRemove.Name" xml:space="preserve">
|
||||
<value>btnRemove</value>
|
||||
</data>
|
||||
|
|
@ -291,35 +261,23 @@
|
|||
<data name="label4.Text" xml:space="preserve">
|
||||
<value>Out Tag</value>
|
||||
</data>
|
||||
<data name="label1.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>27</value>
|
||||
</data>
|
||||
<data name="cmbOutboundTag.Items2" xml:space="preserve">
|
||||
<value>block</value>
|
||||
</data>
|
||||
<data name="cmbOutboundTag.Items1" xml:space="preserve">
|
||||
<value>direct</value>
|
||||
</data>
|
||||
<data name="btnExpand.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>75, 23</value>
|
||||
</data>
|
||||
<data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
<data name="cmbroutingMode.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>26</value>
|
||||
<data name="btnRemove.Text" xml:space="preserve">
|
||||
<value>Remove</value>
|
||||
</data>
|
||||
<data name=">>btnRemove.ZOrder" xml:space="preserve">
|
||||
<value>5</value>
|
||||
<value>3</value>
|
||||
</data>
|
||||
<data name=">>label4.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=">>btnExpand.Parent" xml:space="preserve">
|
||||
<value>groupBox2</value>
|
||||
</data>
|
||||
<data name=">>txtUserRule.ZOrder" xml:space="preserve">
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="btnExpand.Text" xml:space="preserve">
|
||||
<value>Expand</value>
|
||||
<data name=">>label4.Parent" xml:space="preserve">
|
||||
<value>groupBox2</value>
|
||||
</data>
|
||||
<data name=">>label4.ZOrder" xml:space="preserve">
|
||||
<value>1</value>
|
||||
|
|
@ -331,7 +289,7 @@
|
|||
<value>groupBox2</value>
|
||||
</data>
|
||||
<data name="txtUserRule.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>588, 68</value>
|
||||
<value>588, 105</value>
|
||||
</data>
|
||||
<data name="label2.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
|
@ -342,12 +300,6 @@
|
|||
<data name=">>txtUserRule.Parent" xml:space="preserve">
|
||||
<value>groupBox2</value>
|
||||
</data>
|
||||
<data name="label1.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
</data>
|
||||
<data name="cmbroutingMode.Items4" xml:space="preserve">
|
||||
<value>Bypassing LAN and mainland address</value>
|
||||
</data>
|
||||
<data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
|
||||
<value>NoControl</value>
|
||||
</data>
|
||||
|
|
@ -360,35 +312,26 @@
|
|||
<data name=">>cmbOutboundTag.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=">>cmbroutingMode.Parent" xml:space="preserve">
|
||||
<value>groupBox2</value>
|
||||
</data>
|
||||
<data name="groupBox2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>733, 164</value>
|
||||
</data>
|
||||
<data name=">>label2.ZOrder" xml:space="preserve">
|
||||
<value>8</value>
|
||||
<value>6</value>
|
||||
</data>
|
||||
<data name="txtUserRule.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
|
||||
<value>Top, Bottom, Left, Right</value>
|
||||
</data>
|
||||
<data name="label1.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>12, 57</value>
|
||||
<data name="cmbOutboundTag.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>362, 21</value>
|
||||
</data>
|
||||
<data name=">>cmbOutboundTag.Name" xml:space="preserve">
|
||||
<value>cmbOutboundTag</value>
|
||||
</data>
|
||||
<data name="txtRemarks.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>11</value>
|
||||
</data>
|
||||
<data name="label2.Text" xml:space="preserve">
|
||||
<value>Remarks</value>
|
||||
</data>
|
||||
<data name=">>label4.Parent" xml:space="preserve">
|
||||
<value>groupBox2</value>
|
||||
</data>
|
||||
<data name=">>cmbroutingMode.ZOrder" xml:space="preserve">
|
||||
<value>3</value>
|
||||
<data name="label3.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name="label4.AutoSize" type="System.Boolean, mscorlib">
|
||||
<value>True</value>
|
||||
|
|
@ -396,8 +339,8 @@
|
|||
<data name="label2.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>12, 25</value>
|
||||
</data>
|
||||
<data name=">>groupBox2.Name" xml:space="preserve">
|
||||
<value>groupBox2</value>
|
||||
<data name="btnRemove.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>75, 23</value>
|
||||
</data>
|
||||
<data name="label4.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>301, 26</value>
|
||||
|
|
@ -405,8 +348,8 @@
|
|||
<data name="label4.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>47, 12</value>
|
||||
</data>
|
||||
<data name="groupBox2.Text" xml:space="preserve">
|
||||
<value>Rule</value>
|
||||
<data name="txtRemarks.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>162, 21</value>
|
||||
</data>
|
||||
<data name="groupBox2.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>10</value>
|
||||
|
|
@ -414,32 +357,23 @@
|
|||
<data name="label3.Text" xml:space="preserve">
|
||||
<value>Domain or IP</value>
|
||||
</data>
|
||||
<data name=">>groupBox2.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
</data>
|
||||
<data name=">>btnRemove.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=">>txtUserRule.Name" xml:space="preserve">
|
||||
<value>txtUserRule</value>
|
||||
</data>
|
||||
<data name="label3.TabIndex" type="System.Int32, mscorlib">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>$this.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.UserControl, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</data>
|
||||
<data name=">>groupBox2.ZOrder" xml:space="preserve">
|
||||
<value>0</value>
|
||||
</data>
|
||||
<data name=">>groupBox2.Parent" xml:space="preserve">
|
||||
<value>$this</value>
|
||||
<data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>640, 21</value>
|
||||
</data>
|
||||
<data name="cmbroutingMode.Items" xml:space="preserve">
|
||||
<value>Use custom Domain or IP</value>
|
||||
</data>
|
||||
<data name=">>label1.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="btnExpand.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>640, 46</value>
|
||||
<data name=">>label3.ZOrder" xml:space="preserve">
|
||||
<value>7</value>
|
||||
</data>
|
||||
<data name=">>label3.Type" xml:space="preserve">
|
||||
<value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
|
|
|
|||
|
|
@ -119,7 +119,7 @@
|
|||
</resheader>
|
||||
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
|
||||
<data name="btnExpand.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>619, 46</value>
|
||||
<value>526, 20</value>
|
||||
</data>
|
||||
<data name="btnExpand.Text" xml:space="preserve">
|
||||
<value>扩大</value>
|
||||
|
|
@ -130,27 +130,6 @@
|
|||
<data name="label4.Text" xml:space="preserve">
|
||||
<value>出口标签</value>
|
||||
</data>
|
||||
<data name="label1.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>65, 12</value>
|
||||
</data>
|
||||
<data name="label1.Text" xml:space="preserve">
|
||||
<value>预定义规则</value>
|
||||
</data>
|
||||
<data name="cmbroutingMode.Items" xml:space="preserve">
|
||||
<value>使用自定义域名或IP</value>
|
||||
</data>
|
||||
<data name="cmbroutingMode.Items1" xml:space="preserve">
|
||||
<value>全局</value>
|
||||
</data>
|
||||
<data name="cmbroutingMode.Items2" xml:space="preserve">
|
||||
<value>绕过局域网</value>
|
||||
</data>
|
||||
<data name="cmbroutingMode.Items3" xml:space="preserve">
|
||||
<value>绕过大陆地址</value>
|
||||
</data>
|
||||
<data name="cmbroutingMode.Items4" xml:space="preserve">
|
||||
<value>绕过局域网及大陆地址</value>
|
||||
</data>
|
||||
<data name="btnRemove.Location" type="System.Drawing.Point, System.Drawing">
|
||||
<value>619, 20</value>
|
||||
</data>
|
||||
|
|
@ -158,7 +137,7 @@
|
|||
<value>移除</value>
|
||||
</data>
|
||||
<data name="txtUserRule.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>567, 64</value>
|
||||
<value>567, 104</value>
|
||||
</data>
|
||||
<data name="label2.Size" type="System.Drawing.Size, System.Drawing">
|
||||
<value>29, 12</value>
|
||||
|
|
|
|||
|
|
@ -65,6 +65,8 @@ namespace v2rayN.Forms
|
|||
|
||||
private void btnOK_Click(object sender, EventArgs e)
|
||||
{
|
||||
config.domainStrategy = cmbdomainStrategy.Text;
|
||||
|
||||
if (config.routingItem.Count <= 0)
|
||||
{
|
||||
AddSub("proxy", "");
|
||||
|
|
@ -93,12 +95,11 @@ namespace v2rayN.Forms
|
|||
}
|
||||
|
||||
|
||||
private void AddSub(string outboundTag, string userRule, string routingMode = "0")
|
||||
private void AddSub(string outboundTag, string userRule)
|
||||
{
|
||||
RoutingItem RoutingItem = new RoutingItem
|
||||
{
|
||||
remarks = outboundTag,
|
||||
routingMode = routingMode,
|
||||
outboundTag = outboundTag,
|
||||
userRules = Utils.String2List(userRule)
|
||||
|
||||
|
|
@ -129,8 +130,8 @@ namespace v2rayN.Forms
|
|||
AddSub(lstTag[k], result);
|
||||
}
|
||||
|
||||
AddSub(Global.directTag, "", "4");
|
||||
AddSub(Global.agentTag, "", "0");
|
||||
AddSub(Global.directTag, Utils.GetEmbedText(Global.CustomRoutingFileName + "private"));
|
||||
AddSub(Global.agentTag, "");
|
||||
|
||||
RefreshSubsView();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -197,28 +197,7 @@ namespace v2rayN.Handler
|
|||
|
||||
foreach (var item in config.routingItem)
|
||||
{
|
||||
if (item.routingMode != "0")
|
||||
{
|
||||
switch (item.routingMode)
|
||||
{
|
||||
case "1":
|
||||
break;
|
||||
case "2":
|
||||
routingGeo("ip", "private", Global.directTag, ref v2rayConfig);
|
||||
break;
|
||||
case "3":
|
||||
routingGeo("", "cn", Global.directTag, ref v2rayConfig);
|
||||
break;
|
||||
case "4":
|
||||
routingGeo("ip", "private", Global.directTag, ref v2rayConfig);
|
||||
routingGeo("", "cn", Global.directTag, ref v2rayConfig);
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
routingUserRule(item.userRules, item.outboundTag, ref v2rayConfig);
|
||||
}
|
||||
routingUserRule(item.userRules, item.outboundTag, ref v2rayConfig);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -297,46 +276,6 @@ namespace v2rayN.Handler
|
|||
return 0;
|
||||
}
|
||||
|
||||
|
||||
private static int routingGeo(string ipOrDomain, string code, string tag, ref V2rayConfig v2rayConfig)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (!Utils.IsNullOrEmpty(code))
|
||||
{
|
||||
//IP
|
||||
if (ipOrDomain == "ip" || ipOrDomain == "")
|
||||
{
|
||||
RulesItem rulesItem = new RulesItem
|
||||
{
|
||||
type = "field",
|
||||
outboundTag = Global.directTag,
|
||||
ip = new List<string>()
|
||||
};
|
||||
rulesItem.ip.Add($"geoip:{code}");
|
||||
|
||||
v2rayConfig.routing.rules.Add(rulesItem);
|
||||
}
|
||||
|
||||
if (ipOrDomain == "domain" || ipOrDomain == "")
|
||||
{
|
||||
RulesItem rulesItem = new RulesItem
|
||||
{
|
||||
type = "field",
|
||||
outboundTag = Global.directTag,
|
||||
domain = new List<string>()
|
||||
};
|
||||
rulesItem.domain.Add($"geosite:{code}");
|
||||
v2rayConfig.routing.rules.Add(rulesItem);
|
||||
}
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// vmess协议服务器配置
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -705,14 +705,6 @@ namespace v2rayN.Mode
|
|||
get; set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 路由模式
|
||||
/// </summary>
|
||||
public string routingMode
|
||||
{
|
||||
get; set;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -32,4 +32,4 @@ using System.Runtime.InteropServices;
|
|||
// 方法是按如下所示使用“*”:
|
||||
//[assembly: AssemblyVersion("1.0.*")]
|
||||
//[assembly: AssemblyVersion("1.0.0")]
|
||||
[assembly: AssemblyFileVersion("4.0")]
|
||||
[assembly: AssemblyFileVersion("4.1")]
|
||||
|
|
|
|||
3
v2rayN/v2rayN/Sample/custom_routing_private
Normal file
3
v2rayN/v2rayN/Sample/custom_routing_private
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
geoip:private,
|
||||
geoip:cn,
|
||||
geosite:cn
|
||||
|
|
@ -373,6 +373,7 @@
|
|||
<EmbeddedResource Include="Sample\custom_routing_proxy" />
|
||||
<None Include="Resources\sysproxy.exe.gz" />
|
||||
<None Include="Resources\sysproxy64.exe.gz" />
|
||||
<EmbeddedResource Include="Sample\custom_routing_private" />
|
||||
<Protobuf Include="Protos\Statistics.proto" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
Loading…
Reference in a new issue