lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2026-04-11 08:15:27 -04:00
Code Issues Releases Wiki Activity

migrate NetworkList to []Network

Browse Source
This commit is contained in:
Darien Raymond
2018-11-20 16:58:26 +01:00
parent 7b80322b60
commit 769f770cf7
18 changed files with 167 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/router/config.go
View File

@@ -85,7 +85,9 @@ func (rr *RoutingRule) BuildCondition() (Condition, error) {
conds.Add(NewPortMatcher(*rr.PortRange))
}
if rr.NetworkList != nil {
if len(rr.Networks) > 0 {
conds.Add(NewNetworkMatcher(rr.Networks))
} else if rr.NetworkList != nil {
conds.Add(NewNetworkMatcher(rr.NetworkList.Network))
}