Chore: script built

rule/geodata/router/condition.go

@@ -2,7 +2,6 @@ package router
 
 import (
 	"fmt"
-	"net"
 	"strings"
 
 	"github.com/Dreamacro/clash/rule/geodata/strmatcher"
@@ -69,44 +68,3 @@ func NewDomainMatcher(domains []*Domain) (*DomainMatcher, error) {
 func (m *DomainMatcher) ApplyDomain(domain string) bool {
 	return len(m.matchers.Match(strings.ToLower(domain))) > 0
 }
-
-type MultiGeoIPMatcher struct {
-	matchers []*GeoIPMatcher
-}
-
-func NewMultiGeoIPMatcher(geoips []*GeoIP) (*MultiGeoIPMatcher, error) {
-	var matchers []*GeoIPMatcher
-	for _, geoip := range geoips {
-		matcher, err := globalGeoIPContainer.Add(geoip)
-		if err != nil {
-			return nil, err
-		}
-		matchers = append(matchers, matcher)
-	}
-
-	matcher := &MultiGeoIPMatcher{
-		matchers: matchers,
-	}
-
-	return matcher, nil
-}
-
-func (m *MultiGeoIPMatcher) ApplyIp(ip net.IP) bool {
-
-	for _, matcher := range m.matchers {
-		if matcher.Match(ip) {
-			return true
-		}
-	}
-
-	return false
-}
-
-func NewGeoIPMatcher(geoip *GeoIP) (*GeoIPMatcher, error) {
-	matcher, err := globalGeoIPContainer.Add(geoip)
-	if err != nil {
-		return nil, err
-	}
-
-	return matcher, nil
-}

rule/geodata/router/condition_geoip.go

@@ -1,110 +0,0 @@
-package router
-
-import (
-	"fmt"
-	"net"
-
-	"inet.af/netaddr"
-)
-
-type GeoIPMatcher struct {
-	countryCode  string
-	reverseMatch bool
-	ip4          *netaddr.IPSet
-	ip6          *netaddr.IPSet
-}
-
-func (m *GeoIPMatcher) Init(cidrs []*CIDR) error {
-	var builder4, builder6 netaddr.IPSetBuilder
-	for _, cidr := range cidrs {
-		netaddrIP, ok := netaddr.FromStdIP(net.IP(cidr.GetIp()))
-		if !ok {
-			return fmt.Errorf("invalid IP address %v", cidr)
-		}
-		ipPrefix := netaddr.IPPrefixFrom(netaddrIP, uint8(cidr.GetPrefix()))
-		switch {
-		case netaddrIP.Is4():
-			builder4.AddPrefix(ipPrefix)
-		case netaddrIP.Is6():
-			builder6.AddPrefix(ipPrefix)
-		}
-	}
-
-	var err error
-	m.ip4, err = builder4.IPSet()
-	if err != nil {
-		return err
-	}
-	m.ip6, err = builder6.IPSet()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m *GeoIPMatcher) SetReverseMatch(isReverseMatch bool) {
-	m.reverseMatch = isReverseMatch
-}
-
-func (m *GeoIPMatcher) match4(ip net.IP) bool {
-	nip, ok := netaddr.FromStdIP(ip)
-	if !ok {
-		return false
-	}
-	return m.ip4.Contains(nip)
-}
-
-func (m *GeoIPMatcher) match6(ip net.IP) bool {
-	nip, ok := netaddr.FromStdIP(ip)
-	if !ok {
-		return false
-	}
-	return m.ip6.Contains(nip)
-}
-
-// Match returns true if the given ip is included by the GeoIP.
-func (m *GeoIPMatcher) Match(ip net.IP) bool {
-	isMatched := false
-	switch len(ip) {
-	case net.IPv4len:
-		isMatched = m.match4(ip)
-	case net.IPv6len:
-		isMatched = m.match6(ip)
-	}
-	if m.reverseMatch {
-		return !isMatched
-	}
-	return isMatched
-}
-
-// GeoIPMatcherContainer is a container for GeoIPMatchers. It keeps unique copies of GeoIPMatcher by country code.
-type GeoIPMatcherContainer struct {
-	matchers []*GeoIPMatcher
-}
-
-// Add adds a new GeoIP set into the container.
-// If the country code of GeoIP is not empty, GeoIPMatcherContainer will try to find an existing one, instead of adding a new one.
-func (c *GeoIPMatcherContainer) Add(geoip *GeoIP) (*GeoIPMatcher, error) {
-	if geoip.CountryCode != "" {
-		for _, m := range c.matchers {
-			if m.countryCode == geoip.CountryCode && m.reverseMatch == geoip.ReverseMatch {
-				return m, nil
-			}
-		}
-	}
-
-	m := &GeoIPMatcher{
-		countryCode:  geoip.CountryCode,
-		reverseMatch: geoip.ReverseMatch,
-	}
-	if err := m.Init(geoip.Cidr); err != nil {
-		return nil, err
-	}
-	if geoip.CountryCode != "" {
-		c.matchers = append(c.matchers, m)
-	}
-	return m, nil
-}
-
-var globalGeoIPContainer GeoIPMatcherContainer