hesoyam/Xray-core
1
0
Fork 0
mirror of https://github.com/XTLS/Xray-core.git synced 2026-07-11 22:28:46 +00:00
Code Issues Packages Projects Releases Wiki 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
app/router/config.go
+17 -4
View File
@@ -30,11 +30,24 @@ func (rr *RoutingRule) BuildCondition() (Condition, error) {
conds := NewConditionChan()
if len(rr.Domain) > 0 {
matcher, err := dm.NewDomainMatcher(rr.Domain)
if err != nil {
return nil, newError("failed to build domain condition").Base(err)
switch rr.DomainMatcher {
case "linear":
matcher, err := dm.NewDomainMatcher(rr.Domain)
if err != nil {
return nil, newError("failed to build domain condition").Base(err)
}
conds.Add(matcher)
case "mph", "hybrid":
fallthrough
default:
matcher, err := dm.NewMphMatcherGroup(rr.Domain)
if err != nil {
return nil, newError("failed to build domain condition with MphDomainMatcher").Base(err)
}
newError("MphDomainMatcher is enabled for ", len(rr.Domain), " domain rule(s)").AtDebug().WriteToLog()
conds.Add(matcher)
}
conds.Add(matcher)
}
if len(rr.UserEmail) > 0 {