TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-10-10 00:51:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/dns/{., resolver}, wgengine: fix goroutine leak on shutdown

Browse Source 
Signed-off-by: Tom DNetto <tom@tailscale.com>
This commit is contained in:
Tom DNetto
2022-05-02 09:35:32 -07:00
committed by Tom
parent 7f45734663
commit 2a0b5c21d2
3 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
net/dns/resolver/tsdns.go
View File

@@ -45,9 +45,6 @@ const maxResponseBytes = 4095
// defaultTTL is the TTL of all responses from Resolver.
const defaultTTL = 600 * time.Second
// ErrClosed indicates that the resolver has been closed and readers should exit.
var ErrClosed = errors.New("closed")
var (
errNotQuery = errors.New("not a DNS query")
errNotOurName = errors.New("not a Tailscale DNS name")
@@ -264,7 +261,7 @@ func (r *Resolver) Query(ctx context.Context, bs []byte, from netaddr.IPPort) ([
select {
case <-r.closed:
metricDNSQueryErrorClosed.Add(1)
return nil, ErrClosed
return nil, net.ErrClosed
default:
}