OrgGo
/
clash
mirror of https://github.com/Dreamacro/clash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Feature: add geoip-code option

This commit is contained in:
Dreamacro 2021-08-25 15:15:13 +08:00
parent 121bc910f6
commit e0d3f926b7
4 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/config.go
View File

@ -72,6 +72,7 @@ type DNS struct {
// FallbackFilter config // FallbackFilter config
type FallbackFilter struct { type FallbackFilter struct {
GeoIP bool `yaml:"geoip"` GeoIP bool `yaml:"geoip"`
GeoIPCode string `yaml:"geoip-code"`
IPCIDR []*net.IPNet `yaml:"ipcidr"` IPCIDR []*net.IPNet `yaml:"ipcidr"`
Domain []string `yaml:"domain"` Domain []string `yaml:"domain"`
} }
@ -114,6 +115,7 @@ type RawDNS struct {
type RawFallbackFilter struct { type RawFallbackFilter struct {
GeoIP bool `yaml:"geoip"` GeoIP bool `yaml:"geoip"`
GeoIPCode string `yaml:"geoip-code"`
IPCIDR []string `yaml:"ipcidr"` IPCIDR []string `yaml:"ipcidr"`
Domain []string `yaml:"domain"` Domain []string `yaml:"domain"`
} }
@ -173,6 +175,7 @@ func UnmarshalRawConfig(buf []byte) (*RawConfig, error) {
FakeIPRange: "198.18.0.1/16", FakeIPRange: "198.18.0.1/16",
FallbackFilter: RawFallbackFilter{ FallbackFilter: RawFallbackFilter{
GeoIP: true, GeoIP: true,
GeoIPCode: "CN",
IPCIDR: []string{}, IPCIDR: []string{},
}, },
DefaultNameserver: []string{ DefaultNameserver: []string{
@ -600,6 +603,7 @@ func parseDNS(cfg RawDNS, hosts *trie.DomainTrie) (*DNS, error) {
} }
dnsCfg.FallbackFilter.GeoIP = cfg.FallbackFilter.GeoIP dnsCfg.FallbackFilter.GeoIP = cfg.FallbackFilter.GeoIP
dnsCfg.FallbackFilter.GeoIPCode = cfg.FallbackFilter.GeoIPCode
if fallbackip, err := parseFallbackIPCIDR(cfg.FallbackFilter.IPCIDR); err == nil { if fallbackip, err := parseFallbackIPCIDR(cfg.FallbackFilter.IPCIDR); err == nil {
dnsCfg.FallbackFilter.IPCIDR = fallbackip dnsCfg.FallbackFilter.IPCIDR = fallbackip
} }

6
dns/filters.go
View File

@ -11,11 +11,13 @@ type fallbackIPFilter interface {
Match(net.IP) bool Match(net.IP) bool
} }
type geoipFilter struct{} type geoipFilter struct {
code string
}
func (gf *geoipFilter) Match(ip net.IP) bool { func (gf *geoipFilter) Match(ip net.IP) bool {
record, _ := mmdb.Instance().Country(ip) record, _ := mmdb.Instance().Country(ip)
return record.Country.IsoCode != "CN" && !ip.IsPrivate() return record.Country.IsoCode != gf.code && !ip.IsPrivate()
} }
type ipnetFilter struct { type ipnetFilter struct {

5
dns/resolver.go
View File

@ -303,6 +303,7 @@ type NameServer struct {
type FallbackFilter struct { type FallbackFilter struct {
GeoIP bool GeoIP bool
GeoIPCode string
IPCIDR []*net.IPNet IPCIDR []*net.IPNet
Domain []string Domain []string
} }
@ -344,7 +345,9 @@ func NewResolver(config Config) *Resolver {
fallbackIPFilters := []fallbackIPFilter{} fallbackIPFilters := []fallbackIPFilter{}
if config.FallbackFilter.GeoIP { if config.FallbackFilter.GeoIP {
fallbackIPFilters = append(fallbackIPFilters, &geoipFilter{}) fallbackIPFilters = append(fallbackIPFilters, &geoipFilter{
code: config.FallbackFilter.GeoIPCode,
})
} }
for _, ipnet := range config.FallbackFilter.IPCIDR { for _, ipnet := range config.FallbackFilter.IPCIDR {
fallbackIPFilters = append(fallbackIPFilters, &ipnetFilter{ipnet: ipnet}) fallbackIPFilters = append(fallbackIPFilters, &ipnetFilter{ipnet: ipnet})

1
hub/executor/executor.go
View File

@ -124,6 +124,7 @@ func updateDNS(c *config.DNS) {
Hosts: c.Hosts, Hosts: c.Hosts,
FallbackFilter: dns.FallbackFilter{ FallbackFilter: dns.FallbackFilter{
GeoIP: c.FallbackFilter.GeoIP, GeoIP: c.FallbackFilter.GeoIP,
GeoIPCode: c.FallbackFilter.GeoIPCode,
IPCIDR: c.FallbackFilter.IPCIDR, IPCIDR: c.FallbackFilter.IPCIDR,
Domain: c.FallbackFilter.Domain, Domain: c.FallbackFilter.Domain,
}, },