TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-16 03:31:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

net/netcheck: remove unused DNSCache from netcheck

Browse Source 
It's easy to add back later if/when the TODO is implemented.
This commit is contained in:
Brad Fitzpatrick 2020-11-11 11:52:35 -08:00
parent 19b0cfe89e
commit 97e82c6cc0
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/tailscale/cli/netcheck.go
View File

@ -17,7 +17,6 @@ import (
"github.com/peterbourgon/ff/v2/ffcli" "github.com/peterbourgon/ff/v2/ffcli"
"tailscale.com/derp/derpmap" "tailscale.com/derp/derpmap"
"tailscale.com/net/dnscache"
"tailscale.com/net/netcheck" "tailscale.com/net/netcheck"
"tailscale.com/tailcfg" "tailscale.com/tailcfg"
"tailscale.com/types/logger" "tailscale.com/types/logger"
@ -44,9 +43,7 @@ var netcheckArgs struct {
} }
func runNetcheck(ctx context.Context, args []string) error { func runNetcheck(ctx context.Context, args []string) error {
c := &netcheck.Client{ c := &netcheck.Client{}
DNSCache: dnscache.Get(),
}
if netcheckArgs.verbose { if netcheckArgs.verbose {
c.Logf = logger.WithPrefix(log.Printf, "netcheck: ") c.Logf = logger.WithPrefix(log.Printf, "netcheck: ")
c.Verbose = true c.Verbose = true

5
net/netcheck/netcheck.go
View File

@ -28,7 +28,6 @@ import (
"go4.org/mem" "go4.org/mem"
"inet.af/netaddr" "inet.af/netaddr"
"tailscale.com/derp/derphttp" "tailscale.com/derp/derphttp"
"tailscale.com/net/dnscache"
"tailscale.com/net/interfaces" "tailscale.com/net/interfaces"
"tailscale.com/net/netns" "tailscale.com/net/netns"
"tailscale.com/net/stun" "tailscale.com/net/stun"
@ -134,10 +133,6 @@ func cloneDurationMap(m map[int]time.Duration) map[int]time.Duration {
// Client generates a netcheck Report. // Client generates a netcheck Report.
type Client struct { type Client struct {
// DNSCache optionally specifies a DNSCache to use.
// If nil, a DNS cache is not used.
DNSCache *dnscache.Resolver
// Verbose enables verbose logging. // Verbose enables verbose logging.
Verbose bool Verbose bool