mirrors/Xray-core
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2025-06-18 14:19:48 +03:00
Code Issues Releases Activity

Merge branch 'dns' into dns-geo

Browse Source
This commit is contained in:
秋のかえで
2021-05-01 08:48:29 +08:00
parent a5b2a9be2d 2e56fe11e1
commit ee682b17d1
12 changed files with 910 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
infra/conf/router.go
View File

@ -97,6 +97,8 @@ type RouterRule struct {
Type string `json:"type"`
OutboundTag string `json:"outboundTag"`
BalancerTag string `json:"balancerTag"`
DomainMatcher string `json:"domainMatcher"`
}
func ParseIP(s string) (*geoip.CIDR, error) {
@ -182,6 +184,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 := conf.ParseDomainRule(domain)