fix: fakeip6 logic not work correctly
Some checks failed
Build / build (map[abi:1 debian:loongarch64 goarch:loong64 goos:linux output:loong64-abi1 rpm:loongarch64]) (push) Has been cancelled
Build / build (map[abi:2 debian:loong64 goarch:loong64 goos:linux output:loong64-abi2 rpm:loong64]) (push) Has been cancelled
Build / build (map[debian:amd64 goamd64:v1 goarch:amd64 goos:linux output:amd64-v1 pacman:x86_64 rpm:x86_64 test:test]) (push) Has been cancelled
Build / build (map[debian:amd64 goamd64:v2 goarch:amd64 goos:linux output:amd64-v2 pacman:x86_64 rpm:x86_64]) (push) Has been cancelled
Build / build (map[debian:amd64 goamd64:v3 goarch:amd64 goos:linux output:amd64 pacman:x86_64 rpm:x86_64]) (push) Has been cancelled
Build / build (map[debian:amd64 goamd64:v3 goarch:amd64 goos:linux output:amd64-v3 pacman:x86_64 rpm:x86_64]) (push) Has been cancelled
Build / build (map[debian:arm64 goarch:arm64 goos:linux output:arm64 pacman:aarch64 rpm:aarch64]) (push) Has been cancelled
Build / build (map[debian:armel goarch:arm goarm:6 goos:linux output:armv6 rpm:armv6hl]) (push) Has been cancelled
Build / build (map[debian:armhf goarch:arm goarm:7 goos:linux output:armv7 pacman:armv7hl rpm:armv7hl]) (push) Has been cancelled
Build / build (map[debian:i386 go386:sse2 goarch:386 goos:linux output:386 rpm:i386]) (push) Has been cancelled
Build / build (map[debian:mips64el goarch:mips64le goos:linux output:mips64le rpm:mips64el]) (push) Has been cancelled
Build / build (map[debian:ppc64el goarch:ppc64le goos:linux output:ppc64le rpm:ppc64le]) (push) Has been cancelled
Build / build (map[debian:riscv64 goarch:riscv64 goos:linux output:riscv64 rpm:riscv64]) (push) Has been cancelled
Build / build (map[debian:s390x goarch:s390x goos:linux output:s390x rpm:s390x]) (push) Has been cancelled
Build / build (map[go386:softfloat goarch:386 goos:linux output:386-softfloat]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:darwin goversion:1.20 output:amd64-v1-go120]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:darwin goversion:1.22 output:amd64-v1-go122]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:darwin goversion:1.24 output:amd64-v1-go124]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:darwin output:amd64-compatible]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:darwin output:amd64-v1]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:freebsd output:amd64-compatible]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:freebsd output:amd64-v1]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:linux goversion:1.20 output:amd64-v1-go120 test:test]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:linux goversion:1.23 output:amd64-v1-go123 test:test]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:linux output:amd64-compatible]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows goversion:1.20 output:amd64-v1-go120]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows goversion:1.21 output:amd64-v1-go121]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows goversion:1.22 output:amd64-v1-go122]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows goversion:1.23 output:amd64-v1-go123]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows goversion:1.24 output:amd64-v1-go124]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows output:amd64-compatible]) (push) Has been cancelled
Build / build (map[goamd64:v1 goarch:amd64 goos:windows output:amd64-v1]) (push) Has been cancelled
Build / build (map[goamd64:v2 goarch:amd64 goos:darwin goversion:1.20 output:amd64-v2-go120]) (push) Has been cancelled
Build / build (map[goamd64:v2 goarch:amd64 goos:darwin goversion:1.22 output:amd64-v2-go122]) (push) Has been cancelled
Build / build (map[goamd64:v2 goarch:amd64 goos:darwin goversion:1.24 output:amd64-v2-go124]) (push) Has been cancelled
Build / build (map[goamd64:v2 goarch:amd64 goos:darwin output:amd64-v2]) (push) Has been cancelled
Build / build (map[goamd64:v2 goarch:amd64 goos:freebsd output:amd64-v2]) (push) Has been cancelled
Build / build (map[goamd64:v2 goarch:amd64 goos:linux goversion:1.20 output:amd64-v2-go120]) (push) Has been cancelled
Build / build (map[goamd64:v2 goarch:amd64 goos:linux goversion:1.23 output:amd64-v2-go123]) (push) Has been cancelled
Build / build (map[goamd64:v2 goarch:amd64 goos:windows goversion:1.20 output:amd64-v2-go120]) (push) Has been cancelled
Build / build (map[goamd64:v2 goarch:amd64 goos:windows goversion:1.21 output:amd64-v2-go121]) (push) Has been cancelled
Build / build (map[goamd64:v2 goarch:amd64 goos:windows goversion:1.22 output:amd64-v2-go122]) (push) Has been cancelled
Build / build (map[goamd64:v2 goarch:amd64 goos:windows goversion:1.23 output:amd64-v2-go123]) (push) Has been cancelled
Build / build (map[goamd64:v2 goarch:amd64 goos:windows goversion:1.24 output:amd64-v2-go124]) (push) Has been cancelled
Build / build (map[goamd64:v2 goarch:amd64 goos:windows output:amd64-v2]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:darwin goversion:1.20 output:amd64-v3-go120]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:darwin goversion:1.22 output:amd64-v3-go122]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:darwin goversion:1.24 output:amd64-v3-go124]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:darwin output:amd64-v3]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:darwin output:amd64]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:freebsd output:amd64-v3]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:freebsd output:amd64]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:linux goversion:1.20 output:amd64-v3-go120]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:linux goversion:1.23 output:amd64-v3-go123]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows goversion:1.20 output:amd64-v3-go120]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows goversion:1.21 output:amd64-v3-go121]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows goversion:1.22 output:amd64-v3-go122]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows goversion:1.23 output:amd64-v3-go123]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows goversion:1.24 output:amd64-v3-go124]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows output:amd64-v3]) (push) Has been cancelled
Build / build (map[goamd64:v3 goarch:amd64 goos:windows output:amd64]) (push) Has been cancelled
Build / build (map[goarch:386 goos:android ndk:i686-linux-android34 output:386]) (push) Has been cancelled
Build / build (map[goarch:386 goos:freebsd output:386]) (push) Has been cancelled
Build / build (map[goarch:386 goos:linux goversion:1.20 output:386-go120]) (push) Has been cancelled
Build / build (map[goarch:386 goos:linux goversion:1.23 output:386-go123]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows goversion:1.20 output:386-go120]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows goversion:1.21 output:386-go121]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows goversion:1.22 output:386-go122]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows goversion:1.23 output:386-go123]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows goversion:1.24 output:386-go124]) (push) Has been cancelled
Build / build (map[goarch:386 goos:windows output:386]) (push) Has been cancelled
Build / build (map[goarch:amd64 goos:android ndk:x86_64-linux-android34 output:amd64]) (push) Has been cancelled
Build / build (map[goarch:arm goarm:5 goos:linux output:armv5]) (push) Has been cancelled
Build / build (map[goarch:arm goos:android ndk:armv7a-linux-androideabi34 output:armv7]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:android ndk:aarch64-linux-android34 output:arm64-v8]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:darwin goversion:1.20 output:arm64-go120]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:darwin goversion:1.22 output:arm64-go122]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:darwin goversion:1.24 output:arm64-go124]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:darwin output:arm64]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:freebsd output:arm64]) (push) Has been cancelled
Build / build (map[goarch:arm64 goos:windows output:arm64]) (push) Has been cancelled
Build / build (map[goarch:mips gomips:hardfloat goos:linux output:mips-hardfloat]) (push) Has been cancelled
Build / build (map[goarch:mips gomips:softfloat goos:linux output:mips-softfloat]) (push) Has been cancelled
Build / build (map[goarch:mips64 goos:linux output:mips64]) (push) Has been cancelled
Build / build (map[goarch:mipsle gomips:hardfloat goos:linux output:mipsle-hardfloat]) (push) Has been cancelled
Build / build (map[goarch:mipsle gomips:softfloat goos:linux output:mipsle-softfloat]) (push) Has been cancelled
Build / Upload-Prerelease (push) Has been cancelled
Build / Upload-Release (push) Has been cancelled
Build / Docker (push) Has been cancelled
Test / test (1.20, macos-15-intel) (push) Has been cancelled
Test / test (1.20, macos-latest) (push) Has been cancelled
Test / test (1.20, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.20, ubuntu-latest) (push) Has been cancelled
Test / test (1.20, windows-latest) (push) Has been cancelled
Test / test (1.21, macos-15-intel) (push) Has been cancelled
Test / test (1.21, macos-latest) (push) Has been cancelled
Test / test (1.21, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.21, ubuntu-latest) (push) Has been cancelled
Test / test (1.21, windows-latest) (push) Has been cancelled
Test / test (1.22, macos-15-intel) (push) Has been cancelled
Test / test (1.22, macos-latest) (push) Has been cancelled
Test / test (1.22, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.22, ubuntu-latest) (push) Has been cancelled
Test / test (1.22, windows-latest) (push) Has been cancelled
Test / test (1.23, macos-15-intel) (push) Has been cancelled
Test / test (1.23, macos-latest) (push) Has been cancelled
Test / test (1.23, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.23, ubuntu-latest) (push) Has been cancelled
Test / test (1.23, windows-latest) (push) Has been cancelled
Test / test (1.24, macos-15-intel) (push) Has been cancelled
Test / test (1.24, macos-latest) (push) Has been cancelled
Test / test (1.24, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.24, ubuntu-latest) (push) Has been cancelled
Test / test (1.24, windows-latest) (push) Has been cancelled
Test / test (1.25, macos-15-intel) (push) Has been cancelled
Test / test (1.25, macos-latest) (push) Has been cancelled
Test / test (1.25, ubuntu-24.04-arm) (push) Has been cancelled
Test / test (1.25, ubuntu-latest) (push) Has been cancelled
Test / test (1.25, windows-latest) (push) Has been cancelled
Trigger CMFA Update / trigger-CMFA-update (push) Has been cancelled

This commit is contained in:
wwqgtxx
2025-11-09 19:12:44 +08:00
parent 0df2f79ece
commit d48bcf1e1e

View File

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