Code: refresh code

dns/filters.go

@@ -3,10 +3,15 @@ package dns
 import (
 	"net"
 
-	"github.com/Dreamacro/clash/component/mmdb"
 	"github.com/Dreamacro/clash/component/trie"
+	"github.com/Dreamacro/clash/log"
+	"github.com/Dreamacro/clash/rule/geodata"
+	"github.com/Dreamacro/clash/rule/geodata/router"
+	_ "github.com/Dreamacro/clash/rule/geodata/standard"
 )
 
+var geoIPMatcher *router.GeoIPMatcher
+
 type fallbackIPFilter interface {
 	Match(net.IP) bool
 }
@@ -14,8 +19,35 @@ type fallbackIPFilter interface {
 type geoipFilter struct{}
 
 func (gf *geoipFilter) Match(ip net.IP) bool {
-	record, _ := mmdb.Instance().Country(ip)
-	return record.Country.IsoCode != "CN" && record.Country.IsoCode != ""
+	if geoIPMatcher == nil {
+		countryCode := "cn"
+		geoLoader, err := geodata.GetGeoDataLoader("standard")
+		if err != nil {
+			log.Errorln("[GeoIPFilter] GetGeoDataLoader error: %s", err.Error())
+			return false
+		}
+
+		records, err := geoLoader.LoadGeoIP(countryCode)
+		if err != nil {
+			log.Errorln("[GeoIPFilter] LoadGeoIP error: %s", err.Error())
+			return false
+		}
+
+		geoIP := &router.GeoIP{
+			CountryCode:  countryCode,
+			Cidr:         records,
+			ReverseMatch: false,
+		}
+
+		geoIPMatcher, err = router.NewGeoIPMatcher(geoIP)
+
+		if err != nil {
+			log.Errorln("[GeoIPFilter] NewGeoIPMatcher error: %s", err.Error())
+			return false
+		}
+	}
+
+	return !geoIPMatcher.Match(ip)
 }
 
 type ipnetFilter struct {

dns/middleware.go

@@ -169,7 +169,7 @@ func compose(middlewares []middleware, endpoint handler) handler {
 	return h
 }
 
-func newHandler(resolver *Resolver, mapper *ResolverEnhancer) handler {
+func NewHandler(resolver *Resolver, mapper *ResolverEnhancer) handler {
 	middlewares := []middleware{}
 
 	if resolver.hosts != nil {

dns/patch.go

@@ -0,0 +1,16 @@
+package dns
+
+import D "github.com/miekg/dns"
+
+type LocalServer struct {
+	handler handler
+}
+
+// ServeMsg implement resolver.LocalServer ResolveMsg
+func (s *LocalServer) ServeMsg(msg *D.Msg) (*D.Msg, error) {
+	return handlerWithContext(s.handler, msg)
+}
+
+func NewLocalServer(resolver *Resolver, mapper *ResolverEnhancer) *LocalServer {
+	return &LocalServer{handler: NewHandler(resolver, mapper)}
+}

dns/server.go

@@ -43,14 +43,14 @@ func handlerWithContext(handler handler, msg *D.Msg) (*D.Msg, error) {
 	return handler(ctx, msg)
 }
 
-func (s *Server) setHandler(handler handler) {
+func (s *Server) SetHandler(handler handler) {
 	s.handler = handler
 }
 
 func ReCreateServer(addr string, resolver *Resolver, mapper *ResolverEnhancer) error {
 	if addr == address && resolver != nil {
-		handler := newHandler(resolver, mapper)
-		server.setHandler(handler)
+		handler := NewHandler(resolver, mapper)
+		server.SetHandler(handler)
 		return nil
 	}
 
@@ -81,7 +81,7 @@ func ReCreateServer(addr string, resolver *Resolver, mapper *ResolverEnhancer) e
 	}
 
 	address = addr
-	handler := newHandler(resolver, mapper)
+	handler := NewHandler(resolver, mapper)
 	server = &Server{handler: handler}
 	server.Server = &D.Server{Addr: addr, PacketConn: p, Handler: server}