mirror/mihomo
1
1
Fork 0
mirror of https://github.com/MetaCubeX/mihomo.git synced 2025-12-19 16:30:07 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

fix: fakeip6 logic not work correctly

Browse Source
This commit is contained in:
wwqgtxx 2025-11-09 19:12:44 +08:00
parent 0df2f79ece
commit d48bcf1e1e
1 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
dns/enhancer.go
View File

@ -1,6 +1,7 @@
package dns package dns
import ( import (
"errors"
"net/netip" "net/netip"
"github.com/metacubex/mihomo/common/lru" "github.com/metacubex/mihomo/common/lru"
@ -31,11 +32,15 @@ func (h *ResolverEnhancer) IsExistFakeIP(ip netip.Addr) bool {
} }
if pool := h.fakeIPPool; pool != nil { if pool := h.fakeIPPool; pool != nil {
return pool.Exist(ip) if pool.Exist(ip) {
return true
}
} }
if pool6 := h.fakeIPPool6; pool6 != nil { if pool6 := h.fakeIPPool6; pool6 != nil {
return pool6.Exist(ip) if pool6.Exist(ip) {
return true
}
} }
return false return false
@ -47,11 +52,15 @@ func (h *ResolverEnhancer) IsFakeIP(ip netip.Addr) bool {
} }
if pool := h.fakeIPPool; pool != nil { if pool := h.fakeIPPool; pool != nil {
return pool.IPNet().Contains(ip) && ip != pool.Gateway() && ip != pool.Broadcast() if pool.IPNet().Contains(ip) && ip != pool.Gateway() && ip != pool.Broadcast() {
return true
}
} }
if pool6 := h.fakeIPPool6; pool6 != nil { if pool6 := h.fakeIPPool6; pool6 != nil {
return pool6.IPNet().Contains(ip) && ip != pool6.Gateway() && ip != pool6.Broadcast() if pool6.IPNet().Contains(ip) && ip != pool6.Gateway() && ip != pool6.Broadcast() {
return true
}
} }
return false return false
@ -63,11 +72,15 @@ func (h *ResolverEnhancer) IsFakeBroadcastIP(ip netip.Addr) bool {
} }
if pool := h.fakeIPPool; pool != nil { if pool := h.fakeIPPool; pool != nil {
return pool.Broadcast() == ip if pool.Broadcast() == ip {
return true
}
} }
if pool6 := h.fakeIPPool6; pool6 != nil { if pool6 := h.fakeIPPool6; pool6 != nil {
return pool6.Broadcast() == ip if pool6.Broadcast() == ip {
return true
}
} }
return false return false
@ -102,11 +115,19 @@ func (h *ResolverEnhancer) InsertHostByIP(ip netip.Addr, host string) {
} }
func (h *ResolverEnhancer) FlushFakeIP() error { func (h *ResolverEnhancer) FlushFakeIP() error {
var errs []error
if pool := h.fakeIPPool; pool != nil { if pool := h.fakeIPPool; pool != nil {
return pool.FlushFakeIP() if err := pool.FlushFakeIP(); err != nil {
errs = append(errs, err)
}
} }
if pool6 := h.fakeIPPool6; pool6 != nil { if pool6 := h.fakeIPPool6; pool6 != nil {
return pool6.FlushFakeIP() if err := pool6.FlushFakeIP(); err != nil {
errs = append(errs, err)
}
}
if len(errs) > 0 {
return errors.Join(errs...)
} }
return nil return nil
} }