github
/
v2ray-core
mirror of https://github.com/v2ray/v2ray-core
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1293 from Quasilyte/quasilyte/ifElseChain 

app/router: rewrite if-else chain to switch
pull/1313/head^2
Victoria Raymond 2018-10-01 11:39:37 +02:00 committed by GitHub
parent 091fa6ad23 4dfe45ec19
commit 504eff5fe4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/router/config.go
View File

@ -36,14 +36,15 @@ func cidrToCondition(cidr []*CIDR, source bool) (Condition, error) {
} }
} }
if !ipv4Net.IsEmpty() && hasIpv6 { switch {
case !ipv4Net.IsEmpty() && hasIpv6:
cond := NewAnyCondition() cond := NewAnyCondition()
cond.Add(NewIPv4Matcher(ipv4Net, source)) cond.Add(NewIPv4Matcher(ipv4Net, source))
cond.Add(ipv6Cond) cond.Add(ipv6Cond)
return cond, nil return cond, nil
} else if !ipv4Net.IsEmpty() { case !ipv4Net.IsEmpty():
return NewIPv4Matcher(ipv4Net, source), nil return NewIPv4Matcher(ipv4Net, source), nil
} else { default:
return ipv6Cond, nil return ipv6Cond, nil
} }
} }