history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Chore: allow tunnels don't set special proxy

Browse Source
This commit is contained in:
wwqgtxx
2022-11-28 20:31:32 +08:00
parent e715ccbdd5
commit db81db5363
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/config.go
View File

@ -340,7 +340,7 @@ func (t *Tunnel) UnmarshalYAML(unmarshal func(any) error) error {
parts := lo.Map(strings.Split(tp, ","), func(s string, _ int) string {
return strings.TrimSpace(s)
})
if len(parts) != 4 {
if len(parts) != 3 && len(parts) != 4 {
return fmt.Errorf("invalid tunnel config %s", tp)
}
network := strings.Split(parts[0], "/")
@ -367,8 +367,10 @@ func (t *Tunnel) UnmarshalYAML(unmarshal func(any) error) error {
Network: network,
Address: address,
Target: target,
Proxy: parts[3],
})
if len(parts) == 4 {
t.Proxy = parts[3]
}
return nil
}
@ -620,8 +622,10 @@ func ParseRawConfig(rawCfg *RawConfig) (*Config, error) {
config.Tunnels = rawCfg.Tunnels
// verify tunnels
for _, t := range config.Tunnels {
if _, ok := config.Proxies[t.Proxy]; !ok {
return nil, fmt.Errorf("tunnel proxy %s not found", t.Proxy)
if len(t.Proxy) > 0 {
if _, ok := config.Proxies[t.Proxy]; !ok {
return nil, fmt.Errorf("tunnel proxy %s not found", t.Proxy)
}
}
}