Improve fake-ip dual stack behavior

SagerNet · Jul 31, 2023 · ec0fa47 · ec0fa47
1 parent 8d629ef
commit ec0fa47
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 2 deletions.
diff --git a/route/router.go b/route/router.go
@@ -69,6 +69,7 @@ type Router struct {
 	transportDomainStrategy            map[dns.Transport]dns.DomainStrategy
 	dnsReverseMapping                  *DNSReverseMapping
 	fakeIPStore                        adapter.FakeIPStore
+	fakeIPDualStack                    bool
 	interfaceFinder                    myInterfaceFinder
 	autoDetectInterface                bool
 	defaultInterface                   string
@@ -253,6 +254,7 @@ func NewRouter(
 			inet6Range = fakeIPOptions.Inet6Range.Build()
 		}
 		router.fakeIPStore = fakeip.NewStore(router, router.logger, inet4Range, inet6Range)
+		router.fakeIPDualStack = inet4Range.IsValid() && inet6Range.IsValid()
 	}
 
 	usePlatformDefaultInterfaceMonitor := platformInterface != nil && platformInterface.UsePlatformDefaultInterfaceMonitor()

diff --git a/route/router_dns.go b/route/router_dns.go
@@ -63,14 +63,14 @@ func (r *Router) matchDNS(ctx context.Context) (context.Context, dns.Transport,
 			if domainStrategy, dsLoaded := r.transportDomainStrategy[transport]; dsLoaded {
 				return ctx, transport, domainStrategy
 			} else {
-				return ctx, transport, r.defaultDomainStrategy
+				return ctx, transport, dns.DomainStrategyAsIS
 			}
 		}
 	}
 	if domainStrategy, dsLoaded := r.transportDomainStrategy[r.defaultTransport]; dsLoaded {
 		return ctx, r.defaultTransport, domainStrategy
 	} else {
-		return ctx, r.defaultTransport, r.defaultDomainStrategy
+		return ctx, r.defaultTransport, dns.DomainStrategyAsIS
 	}
 }
 
@@ -128,6 +128,22 @@ func (r *Router) Lookup(ctx context.Context, domain string, strategy dns.DomainS
 	if strategy == dns.DomainStrategyAsIS {
 		strategy = transportStrategy
 	}
+	if strategy == dns.DomainStrategyAsIS {
+		switch r.defaultDomainStrategy {
+		case dns.DomainStrategyUseIPv4, dns.DomainStrategyUseIPv6:
+			strategy = r.defaultDomainStrategy
+		}
+	}
+	if strategy == dns.DomainStrategyAsIS && metadata.FakeIP && r.fakeIPDualStack {
+		if metadata.IPVersion == 4 {
+			strategy = dns.DomainStrategyUseIPv4
+		} else if metadata.IPVersion == 6 {
+			strategy = dns.DomainStrategyPreferIPv6
+		}
+	}
+	if strategy == dns.DomainStrategyAsIS {
+		strategy = r.defaultDomainStrategy
+	}
 	ctx, cancel := context.WithTimeout(ctx, C.DNSTimeout)
 	defer cancel()
 	addrs, err := r.dnsClient.Lookup(ctx, transport, domain, strategy)