lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-01-02 15:36:41 -05:00
Code Issues Releases Wiki Activity

Allow bulk definition of domain matcher at parent level

Browse Source
This commit is contained in:
Shelikhoo 2021-03-05 18:37:32 +00:00
parent 0043dd6685
commit e22cf451f4
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infra/conf/router.go
View File

@ -41,6 +41,8 @@ type RouterConfig struct {
RuleList []json.RawMessage `json:"rules"` RuleList []json.RawMessage `json:"rules"`
DomainStrategy *string `json:"domainStrategy"` DomainStrategy *string `json:"domainStrategy"`
Balancers []*BalancingRule `json:"balancers"` Balancers []*BalancingRule `json:"balancers"`
DomainMatcher string `json:"domainMatcher"`
} }
func (c *RouterConfig) getDomainStrategy() router.Config_DomainStrategy { func (c *RouterConfig) getDomainStrategy() router.Config_DomainStrategy {
@ -81,6 +83,11 @@ func (c *RouterConfig) Build() (*router.Config, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
if rule.DomainMatcher == "" {
rule.DomainMatcher = c.DomainMatcher
}
config.Rule = append(config.Rule, rule) config.Rule = append(config.Rule, rule)
} }
for _, rawBalancer := range c.Balancers { for _, rawBalancer := range c.Balancers {