From 8d0ed1c9ba27d28d4609e038df98656aa0281aee Mon Sep 17 00:00:00 2001 From: Brad Fitzpatrick Date: Thu, 6 Jan 2022 15:01:50 -0800 Subject: [PATCH] net/dns/resolver: on Android, make ExitDNS use net package for DNS Like Windows. Updates #1738 Change-Id: I9f26bc58ce7e760c749786fbe5d9952c99eeb91c Signed-off-by: Brad Fitzpatrick --- net/dns/resolver/tsdns.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/net/dns/resolver/tsdns.go b/net/dns/resolver/tsdns.go index 82f4ebe31..4d75c18d5 100644 --- a/net/dns/resolver/tsdns.go +++ b/net/dns/resolver/tsdns.go @@ -357,10 +357,7 @@ func (r *Resolver) HandleExitNodeDNSQuery(ctx context.Context, q []byte, from ne switch runtime.GOOS { default: return nil, errors.New("unsupported exit node OS") - case "windows": - // TODO: use DnsQueryEx and write to ch. - // See https://docs.microsoft.com/en-us/windows/win32/api/windns/nf-windns-dnsqueryex. - // For now just use the net package: + case "windows", "android": return handleExitNodeDNSQueryWithNetPkg(ctx, nil, resp) case "darwin": // /etc/resolv.conf is a lie and only says one upstream DNS