Chore: aggregate mmdb (#474)

This commit is contained in:
Kr328
2020-01-11 21:07:01 +08:00
committed by Dreamacro
parent f688eda2c2
commit 9071351022
4 changed files with 43 additions and 35 deletions

View File

@ -1,6 +1,10 @@
package dns
import "net"
import (
"net"
"github.com/Dreamacro/clash/component/mmdb"
)
type fallbackFilter interface {
Match(net.IP) bool
@ -9,11 +13,7 @@ type fallbackFilter interface {
type geoipFilter struct{}
func (gf *geoipFilter) Match(ip net.IP) bool {
if mmdb == nil {
return false
}
record, _ := mmdb.Country(ip)
record, _ := mmdb.Instance().Country(ip)
return record.Country.IsoCode == "CN" || record.Country.IsoCode == ""
}

View File

@ -6,17 +6,14 @@ import (
"errors"
"net"
"strings"
"sync"
"time"
"github.com/Dreamacro/clash/common/cache"
"github.com/Dreamacro/clash/common/picker"
trie "github.com/Dreamacro/clash/component/domain-trie"
"github.com/Dreamacro/clash/component/fakeip"
C "github.com/Dreamacro/clash/constant"
D "github.com/miekg/dns"
geoip2 "github.com/oschwald/geoip2-golang"
"golang.org/x/sync/singleflight"
)
@ -30,9 +27,6 @@ var (
var (
globalSessionCache = tls.NewLRUClientSessionCache(64)
mmdb *geoip2.Reader
once sync.Once
)
type resolver interface {
@ -311,10 +305,6 @@ func New(config Config) *Resolver {
fallbackFilters := []fallbackFilter{}
if config.FallbackFilter.GeoIP {
once.Do(func() {
mmdb, _ = geoip2.Open(C.Path.MMDB())
})
fallbackFilters = append(fallbackFilters, &geoipFilter{})
}
for _, ipnet := range config.FallbackFilter.IPCIDR {