From ad0dfcb1857105597b1bed3422c9057aafd7b22f Mon Sep 17 00:00:00 2001
From: Brad Fitzpatrick <bradfitz@tailscale.com>
Date: Tue, 17 Jun 2025 20:25:09 -0700
Subject: [PATCH] net/*: remove Windows exceptions for when Resolver.PreferGo
 didn't work

Resolver.PreferGo didn't used to work on Windows.

It was fixed in 2022, though. (https://github.com/golang/go/issues/33097)

Updates #5161

Change-Id: I4e1aeff220ebd6adc8a14f781664fa6a2068b48c
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
---
 net/dns/resolver/tsdns_test.go    | 7 -------
 net/dnscache/messagecache_test.go | 9 ---------
 net/tsdial/tsdial.go              | 2 +-
 3 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/net/dns/resolver/tsdns_test.go b/net/dns/resolver/tsdns_test.go
index de08450d2..4bbfd4d6a 100644
--- a/net/dns/resolver/tsdns_test.go
+++ b/net/dns/resolver/tsdns_test.go
@@ -1106,10 +1106,6 @@ type linkSelFunc func(ip netip.Addr) string
 func (f linkSelFunc) PickLink(ip netip.Addr) string { return f(ip) }
 
 func TestHandleExitNodeDNSQueryWithNetPkg(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("skipping test on Windows; waiting for golang.org/issue/33097")
-	}
-
 	records := []any{
 		"no-records.test.",
 		dnsHandler(),
@@ -1405,9 +1401,6 @@ func TestHandleExitNodeDNSQueryWithNetPkg(t *testing.T) {
 // newWrapResolver returns a resolver that uses r (via handleExitNodeDNSQueryWithNetPkg)
 // to make DNS requests.
 func newWrapResolver(r *net.Resolver) *net.Resolver {
-	if runtime.GOOS == "windows" {
-		panic("doesn't work on Windows") // golang.org/issue/33097
-	}
 	return &net.Resolver{
 		PreferGo: true,
 		Dial: func(ctx context.Context, network, addr string) (net.Conn, error) {
diff --git a/net/dnscache/messagecache_test.go b/net/dnscache/messagecache_test.go
index 41fc33448..0bedfa5ad 100644
--- a/net/dnscache/messagecache_test.go
+++ b/net/dnscache/messagecache_test.go
@@ -9,7 +9,6 @@ import (
 	"errors"
 	"fmt"
 	"net"
-	"runtime"
 	"testing"
 	"time"
 
@@ -249,14 +248,6 @@ func TestGetDNSQueryCacheKey(t *testing.T) {
 }
 
 func getGoNetPacketDNSQuery(name string) []byte {
-	if runtime.GOOS == "windows" {
-		// On Windows, Go's net.Resolver doesn't use the DNS client.
-		// See https://github.com/golang/go/issues/33097 which
-		// was approved but not yet implemented.
-		// For now just pretend it's implemented to make this test
-		// pass on Windows with complicated the caller.
-		return makeQ(123, name)
-	}
 	res := make(chan []byte, 1)
 	r := &net.Resolver{
 		PreferGo: true,
diff --git a/net/tsdial/tsdial.go b/net/tsdial/tsdial.go
index 2492f666c..e4e4e9e8b 100644
--- a/net/tsdial/tsdial.go
+++ b/net/tsdial/tsdial.go
@@ -322,7 +322,7 @@ func (d *Dialer) userDialResolve(ctx context.Context, network, addr string) (net
 	}
 
 	var r net.Resolver
-	if exitDNSDoH != "" && runtime.GOOS != "windows" { // Windows: https://github.com/golang/go/issues/33097
+	if exitDNSDoH != "" {
 		r.PreferGo = true
 		r.Dial = func(ctx context.Context, network, address string) (net.Conn, error) {
 			return &dohConn{