mirrors/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-05-09 05:38:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into dns

Browse source
This commit is contained in:
秋のかえで 2021-04-18 13:24:44 +08:00
commit 2e56fe11e1
No known key found for this signature in database
GPG key ID: B208CDDD55BEF92C
13 changed files with 910 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

6
infra/conf/router.go
View file

@ -98,6 +98,8 @@ type RouterRule struct {
Type string `json:"type"`
OutboundTag string `json:"outboundTag"`
BalancerTag string `json:"balancerTag"`
DomainMatcher string `json:"domainMatcher"`
}
func ParseIP(s string) (*router.CIDR, error) {
@ -491,6 +493,10 @@ func parseFieldRule(msg json.RawMessage) (*router.RoutingRule, error) {
return nil, newError("neither outboundTag nor balancerTag is specified in routing rule")
}
if rawFieldRule.DomainMatcher != "" {
rule.DomainMatcher = rawFieldRule.DomainMatcher
}
if rawFieldRule.Domain != nil {
for _, domain := range *rawFieldRule.Domain {
rules, err := parseDomainRule(domain)