chore: add sourceGeoIP and sourceIPASN to metadata

component/cidr/ipcidr_set.go

@@ -46,6 +46,14 @@ func (set *IpCidrSet) IsContain(ip netip.Addr) bool {
 	return set.ToIPSet().Contains(ip.WithZone(""))
 }
 
+// MatchIp implements C.IpMatcher
+func (set *IpCidrSet) MatchIp(ip netip.Addr) bool {
+	if set.IsEmpty() {
+		return false
+	}
+	return set.IsContain(ip)
+}
+
 func (set *IpCidrSet) Merge() error {
 	var b netipx.IPSetBuilder
 	b.AddSet(set.ToIPSet())

component/fakeip/pool.go

@@ -35,7 +35,7 @@ type Pool struct {
 	offset  netip.Addr
 	cycle   bool
 	mux     sync.Mutex
-	host    []C.Rule
+	host    []C.DomainMatcher
 	ipnet   netip.Prefix
 	store   store
 }
@@ -66,8 +66,8 @@ func (p *Pool) LookBack(ip netip.Addr) (string, bool) {
 
 // ShouldSkipped return if domain should be skipped
 func (p *Pool) ShouldSkipped(domain string) bool {
-	for _, rule := range p.host {
-		if match, _ := rule.Match(&C.Metadata{Host: domain}); match {
+	for _, matcher := range p.host {
+		if matcher.MatchDomain(domain) {
 			return true
 		}
 	}
@@ -156,7 +156,7 @@ func (p *Pool) restoreState() {
 
 type Options struct {
 	IPNet netip.Prefix
-	Host  []C.Rule
+	Host  []C.DomainMatcher
 
 	// Size sets the maximum number of entries in memory
 	// and does not work if Persistence is true

component/fakeip/pool_test.go

@@ -10,7 +10,6 @@ import (
 	"github.com/metacubex/mihomo/component/profile/cachefile"
 	"github.com/metacubex/mihomo/component/trie"
 	C "github.com/metacubex/mihomo/constant"
-	RP "github.com/metacubex/mihomo/rules/provider"
 
 	"github.com/metacubex/bbolt"
 	"github.com/stretchr/testify/assert"
@@ -157,7 +156,7 @@ func TestPool_Skip(t *testing.T) {
 	pools, tempfile, err := createPools(Options{
 		IPNet: ipnet,
 		Size:  10,
-		Host:  []C.Rule{RP.NewDomainSet(tree.NewDomainSet(), "")},
+		Host:  []C.DomainMatcher{tree.NewDomainSet()},
 	})
 	assert.Nil(t, err)
 	defer os.Remove(tempfile)

component/sniffer/dispatcher.go

@@ -22,23 +22,23 @@ var (
 type Dispatcher struct {
 	enable          bool
 	sniffers        map[sniffer.Sniffer]SnifferConfig
-	forceDomain     []C.Rule
-	skipSrcAddress  []C.Rule
-	skipDstAddress  []C.Rule
-	skipDomain      []C.Rule
+	forceDomain     []C.DomainMatcher
+	skipSrcAddress  []C.IpMatcher
+	skipDstAddress  []C.IpMatcher
+	skipDomain      []C.DomainMatcher
 	skipList        *lru.LruCache[netip.AddrPort, uint8]
 	forceDnsMapping bool
 	parsePureIp     bool
 }
 
 func (sd *Dispatcher) shouldOverride(metadata *C.Metadata) bool {
-	for _, rule := range sd.skipDstAddress {
-		if ok, _ := rule.Match(&C.Metadata{DstIP: metadata.DstIP}); ok {
+	for _, matcher := range sd.skipDstAddress {
+		if matcher.MatchIp(metadata.DstIP) {
 			return false
 		}
 	}
-	for _, rule := range sd.skipSrcAddress {
-		if ok, _ := rule.Match(&C.Metadata{DstIP: metadata.SrcIP}); ok {
+	for _, matcher := range sd.skipSrcAddress {
+		if matcher.MatchIp(metadata.SrcIP) {
 			return false
 		}
 	}
@@ -48,8 +48,8 @@ func (sd *Dispatcher) shouldOverride(metadata *C.Metadata) bool {
 	if metadata.DNSMode == C.DNSMapping && sd.forceDnsMapping {
 		return true
 	}
-	for _, rule := range sd.forceDomain {
-		if ok, _ := rule.Match(&C.Metadata{Host: metadata.Host}); ok {
+	for _, matcher := range sd.forceDomain {
+		if matcher.MatchDomain(metadata.Host) {
 			return true
 		}
 	}
@@ -112,8 +112,8 @@ func (sd *Dispatcher) TCPSniff(conn *N.BufferedConn, metadata *C.Metadata) bool
 			return false
 		}
 
-		for _, rule := range sd.skipDomain {
-			if ok, _ := rule.Match(&C.Metadata{Host: host}); ok {
+		for _, matcher := range sd.skipDomain {
+			if matcher.MatchDomain(host) {
 				log.Debugln("[Sniffer] Skip sni[%s]", host)
 				return false
 			}
@@ -200,10 +200,10 @@ func (sd *Dispatcher) cacheSniffFailed(metadata *C.Metadata) {
 type Config struct {
 	Enable          bool
 	Sniffers        map[sniffer.Type]SnifferConfig
-	ForceDomain     []C.Rule
-	SkipSrcAddress  []C.Rule
-	SkipDstAddress  []C.Rule
-	SkipDomain      []C.Rule
+	ForceDomain     []C.DomainMatcher
+	SkipSrcAddress  []C.IpMatcher
+	SkipDstAddress  []C.IpMatcher
+	SkipDomain      []C.DomainMatcher
 	ForceDnsMapping bool
 	ParsePureIp     bool
 }

component/trie/domain_set.go

@@ -172,6 +172,11 @@ func (ss *DomainSet) Foreach(f func(key string) bool) {
 	})
 }
 
+// MatchDomain implements C.DomainMatcher
+func (ss *DomainSet) MatchDomain(domain string) bool {
+	return ss.Has(domain)
+}
+
 func setBit(bm *[]uint64, i int, v int) {
 	for i>>6 >= len(*bm) {
 		*bm = append(*bm, 0)