lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-12-21 09:36:34 -05:00
Code Issues Releases Wiki Activity

Fix Simplified Router Bug in Processing Rules

Browse Source
This commit is contained in:
Shelikhoo 2022-04-13 23:00:46 +01:00 committed by Xiaokang Wang (Shelikhoo)
parent 010aa3a103
commit dae391fa41
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/router/router.go
View File

@ -223,7 +223,7 @@ func init() {
rule.Domain = append(rule.Domain, geo.Domain...)
}
}
{
if v.PortList != "" {
portList := &cfgcommon.PortList{}
err := portList.UnmarshalText(v.PortList)
if err != nil {
@ -231,7 +231,7 @@ func init() {
}
rule.PortList = portList.Build()
}
{
if v.SourcePortList != "" {
portList := &cfgcommon.PortList{}
err := portList.UnmarshalText(v.SourcePortList)
if err != nil {
@ -240,12 +240,21 @@ func init() {
rule.SourcePortList = portList.Build()
}
rule.Domain = v.Domain
rule.Networks = net.ParseNetworks(v.Networks)
if v.Networks != "" {
rule.Networks = net.ParseNetworks(v.Networks)
}
rule.Protocol = v.Protocol
rule.Attributes = v.Attributes
rule.UserEmail = v.UserEmail
rule.InboundTag = v.InboundTag
rule.DomainMatcher = v.DomainMatcher
switch s := v.TargetTag.(type) {
case *SimplifiedRoutingRule_Tag:
rule.TargetTag = &RoutingRule_Tag{s.Tag}
case *SimplifiedRoutingRule_BalancingTag:
rule.TargetTag = &RoutingRule_BalancingTag{s.BalancingTag}
}
routingRules = append(routingRules, rule)
}
fullConfig := &Config{