Austin/mihomo
1
0
Fork 0
mirror of https://github.com/MetaCubeX/mihomo.git synced 2024-11-16 11:42:43 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #22 from Adlyq/Alpha-pr

Browse Source 
[skip ci]
[Fix] skip when country code not found in GeoIP.dat
This commit is contained in:
Meta 2022-03-22 00:33:02 +08:00 committed by GitHub
commit e068563b58
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/config.go
View File

@ -440,13 +440,6 @@ func parseProxies(cfg *RawConfig) (proxies map[string]C.Proxy, providersMap map[
providersMap[name] = pd
}
for _, proxyProvider := range providersMap {
log.Infoln("Start initial provider %s", proxyProvider.Name())
if err := proxyProvider.Initial(); err != nil {
return nil, nil, fmt.Errorf("initial proxy provider %s error: %w", proxyProvider.Name(), err)
}
}
// parse proxy group
for idx, mapping := range groupsConfig {
group, err := outboundgroup.ParseProxyGroup(mapping, proxies, providersMap)

2
hub/executor/executor.go
View File

@ -77,8 +77,8 @@ func ApplyConfig(cfg *config.Config, force bool) {
updateUsers(cfg.Users)
updateProxies(cfg.Proxies, cfg.Providers)
updateRules(cfg.Rules, cfg.RuleProviders)
updateGeneral(cfg.General, force)
updateDNS(cfg.DNS, cfg.Tun)
updateGeneral(cfg.General, force)
updateTun(cfg.Tun)
autoUpdateIPTables(cfg.DNS, cfg.General, cfg.Tun)
updateExperimental(cfg)

3
rule/provider/parse.go
View File

@ -85,6 +85,9 @@ func parseRule(tp, payload, target string, params []string) (C.Rule, error) {
default:
parseErr = fmt.Errorf("unsupported rule type %s", tp)
}
if parseErr != nil {
return nil, parseErr
}
ruleExtra := &C.RuleExtra{
Network: RC.FindNetwork(params),
SourceIPs: RC.FindSourceIPs(params),

15
rule/provider/provider.go
View File

@ -6,6 +6,7 @@ import (
"github.com/Dreamacro/clash/component/trie"
C "github.com/Dreamacro/clash/constant"
P "github.com/Dreamacro/clash/constant/provider"
"github.com/Dreamacro/clash/log"
"gopkg.in/yaml.v2"
"runtime"
"strings"
@ -129,7 +130,12 @@ func NewRuleSetProvider(name string, behavior P.RuleType, interval time.Duration
return err
}
rp.count = len(rulesRaw)
if rp.behavior == P.Classical {
rp.count = len(rules.([]C.Rule))
} else {
rp.count = len(rulesRaw)
}
rp.setRules(rules)
return nil
}
@ -201,13 +207,12 @@ func handleClassicalRules(rules []string) (interface{}, error) {
var classicalRules []C.Rule
for _, rawRule := range rules {
ruleType, rule, params := ruleParse(rawRule)
if ruleType == "RULE-SET" {
return nil, errors.New("error rule type")
}
r, err := parseRule(ruleType, rule, "", params)
if err != nil {
return nil, err
//return nil, err
log.Warnln("%s", err)
continue
}
classicalRules = append(classicalRules, r)