go-gost/x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add selector

Browse Source
This commit is contained in:
ginuerzh
2022-09-02 15:00:07 +08:00
parent 09dbdbb03c
commit c643014e12
9 changed files with 264 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
config/parsing/service.go
View File

@ -11,11 +11,13 @@ import (
"github.com/go-gost/core/listener"
"github.com/go-gost/core/logger"
"github.com/go-gost/core/recorder"
"github.com/go-gost/core/selector"
"github.com/go-gost/core/service"
"github.com/go-gost/x/config"
tls_util "github.com/go-gost/x/internal/util/tls"
"github.com/go-gost/x/metadata"
"github.com/go-gost/x/registry"
xs "github.com/go-gost/x/selector"
)
func ParseService(cfg *config.ServiceConfig) (service.Service, error) {
@ -184,7 +186,11 @@ func parseForwarder(cfg *config.ForwarderConfig) *chain.NodeGroup {
}
}
return group.WithSelector(parseNodeSelector(cfg.Selector))
sel := parseNodeSelector(cfg.Selector)
if sel == nil {
sel = xs.DefaultNodeSelector
}
return group.WithSelector(sel)
}
func bypassList(name string, names ...string) []bypass.Bypass {
@ -228,18 +234,25 @@ func admissionList(name string, names ...string) []admission.Admission {
}
func chainGroup(name string, group *config.ChainGroupConfig) chain.Chainer {
cg := &chain.ChainGroup{}
var chains []chain.SelectableChainer
var sel selector.Selector[chain.SelectableChainer]
if c := registry.ChainRegistry().Get(name); c != nil {
cg.Chains = append(cg.Chains, c)
chains = append(chains, c)
}
if group != nil {
for _, s := range group.Chains {
if c := registry.ChainRegistry().Get(s); c != nil {
cg.Chains = append(cg.Chains, c)
chains = append(chains, c)
}
}
cg.Selector = parseChainSelector(group.Selector)
sel = parseChainSelector(group.Selector)
}
return cg
if sel == nil {
sel = xs.DefaultChainSelector
}
return chain.NewChainGroup(chains...).
WithSelector(sel)
}