[Fix] skip when country code not found in GeoIP.dat
This commit is contained in:
parent
652759a9ae
commit
f2b00371ef
2 changed files with 14 additions and 5 deletions
|
@ -85,6 +85,9 @@ func parseRule(tp, payload, target string, params []string) (C.Rule, error) {
|
||||||
default:
|
default:
|
||||||
parseErr = fmt.Errorf("unsupported rule type %s", tp)
|
parseErr = fmt.Errorf("unsupported rule type %s", tp)
|
||||||
}
|
}
|
||||||
|
if parseErr != nil {
|
||||||
|
return nil, parseErr
|
||||||
|
}
|
||||||
ruleExtra := &C.RuleExtra{
|
ruleExtra := &C.RuleExtra{
|
||||||
Network: RC.FindNetwork(params),
|
Network: RC.FindNetwork(params),
|
||||||
SourceIPs: RC.FindSourceIPs(params),
|
SourceIPs: RC.FindSourceIPs(params),
|
||||||
|
|
|
@ -6,10 +6,12 @@ import (
|
||||||
"github.com/Dreamacro/clash/component/trie"
|
"github.com/Dreamacro/clash/component/trie"
|
||||||
C "github.com/Dreamacro/clash/constant"
|
C "github.com/Dreamacro/clash/constant"
|
||||||
P "github.com/Dreamacro/clash/constant/provider"
|
P "github.com/Dreamacro/clash/constant/provider"
|
||||||
|
"github.com/Dreamacro/clash/log"
|
||||||
"gopkg.in/yaml.v2"
|
"gopkg.in/yaml.v2"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strings"
|
"strings"
|
||||||
"time"
|
"time"
|
||||||
|
"unsafe"
|
||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
|
@ -129,7 +131,12 @@ func NewRuleSetProvider(name string, behavior P.RuleType, interval time.Duration
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if rp.behavior == P.Classical {
|
||||||
|
rp.count = len(*(*[]C.Rule)(unsafe.Pointer(&rules)))
|
||||||
|
} else {
|
||||||
rp.count = len(rulesRaw)
|
rp.count = len(rulesRaw)
|
||||||
|
}
|
||||||
|
|
||||||
rp.setRules(rules)
|
rp.setRules(rules)
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
@ -201,13 +208,12 @@ func handleClassicalRules(rules []string) (interface{}, error) {
|
||||||
var classicalRules []C.Rule
|
var classicalRules []C.Rule
|
||||||
for _, rawRule := range rules {
|
for _, rawRule := range rules {
|
||||||
ruleType, rule, params := ruleParse(rawRule)
|
ruleType, rule, params := ruleParse(rawRule)
|
||||||
if ruleType == "RULE-SET" {
|
|
||||||
return nil, errors.New("error rule type")
|
|
||||||
}
|
|
||||||
|
|
||||||
r, err := parseRule(ruleType, rule, "", params)
|
r, err := parseRule(ruleType, rule, "", params)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
//return nil, err
|
||||||
|
log.Warnln("%s", err)
|
||||||
|
continue
|
||||||
}
|
}
|
||||||
|
|
||||||
classicalRules = append(classicalRules, r)
|
classicalRules = append(classicalRules, r)
|
||||||
|
|
Loading…
Reference in a new issue