diff --git a/cmd/tailscaled/depaware.txt b/cmd/tailscaled/depaware.txt index c1183bf57..5104c8c8a 100644 --- a/cmd/tailscaled/depaware.txt +++ b/cmd/tailscaled/depaware.txt @@ -78,7 +78,7 @@ tailscale.com/cmd/tailscaled dependencies: (generated by github.com/tailscale/de tailscale.com/derp/derpmap from tailscale.com/cmd/tailscaled+ tailscale.com/disco from tailscale.com/derp+ tailscale.com/health from tailscale.com/control/controlclient+ - tailscale.com/internal/deepprint from tailscale.com/ipn/ipnlocal+ + tailscale.com/internal/deephash from tailscale.com/ipn/ipnlocal+ tailscale.com/ipn from tailscale.com/ipn/ipnserver+ tailscale.com/ipn/ipnlocal from tailscale.com/ipn/ipnserver+ tailscale.com/ipn/ipnserver from tailscale.com/cmd/tailscaled diff --git a/internal/deepprint/deepprint.go b/internal/deephash/deephash.go similarity index 91% rename from internal/deepprint/deepprint.go rename to internal/deephash/deephash.go index d2be04440..a82d04ba9 100644 --- a/internal/deepprint/deepprint.go +++ b/internal/deephash/deephash.go @@ -2,14 +2,9 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// Package deepprint walks a Go value recursively, in a predictable -// order, without looping, and prints each value out to a given -// Writer, which is assumed to be a hash.Hash, as this package doesn't -// format things nicely. -// -// This is intended as a lighter version of go-spew, etc. We don't need its -// features when our writer is just a hash. -package deepprint +// Package deephash hashes a Go value recursively, in a predictable +// order, without looping. +package deephash import ( "bufio" diff --git a/internal/deepprint/deepprint_test.go b/internal/deephash/deephash_test.go similarity index 98% rename from internal/deepprint/deepprint_test.go rename to internal/deephash/deephash_test.go index 731548f3f..06faa32ec 100644 --- a/internal/deepprint/deepprint_test.go +++ b/internal/deephash/deephash_test.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -package deepprint +package deephash import ( "testing" diff --git a/internal/deepprint/fmtsort.go b/internal/deephash/fmtsort.go similarity index 99% rename from internal/deepprint/fmtsort.go rename to internal/deephash/fmtsort.go index 861679153..f4d3674f9 100644 --- a/internal/deepprint/fmtsort.go +++ b/internal/deephash/fmtsort.go @@ -10,7 +10,7 @@ // This is a slightly modified fork of Go's src/internal/fmtsort/sort.go -package deepprint +package deephash import ( "reflect" diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go index 6df575621..00065623a 100644 --- a/ipn/ipnlocal/local.go +++ b/ipn/ipnlocal/local.go @@ -29,7 +29,7 @@ import ( "tailscale.com/client/tailscale/apitype" "tailscale.com/control/controlclient" "tailscale.com/health" - "tailscale.com/internal/deepprint" + "tailscale.com/internal/deephash" "tailscale.com/ipn" "tailscale.com/ipn/ipnstate" "tailscale.com/ipn/policy" @@ -903,7 +903,7 @@ func (b *LocalBackend) updateFilter(netMap *netmap.NetworkMap, prefs *ipn.Prefs) localNets := localNetsB.IPSet() logNets := logNetsB.IPSet() - changed := deepprint.UpdateHash(&b.filterHash, haveNetmap, addrs, packetFilter, localNets.Ranges(), logNets.Ranges(), shieldsUp) + changed := deephash.UpdateHash(&b.filterHash, haveNetmap, addrs, packetFilter, localNets.Ranges(), logNets.Ranges(), shieldsUp) if !changed { return } diff --git a/wgengine/userspace.go b/wgengine/userspace.go index 4a7f56545..38002b218 100644 --- a/wgengine/userspace.go +++ b/wgengine/userspace.go @@ -27,7 +27,7 @@ import ( "inet.af/netaddr" "tailscale.com/control/controlclient" "tailscale.com/health" - "tailscale.com/internal/deepprint" + "tailscale.com/internal/deephash" "tailscale.com/ipn/ipnstate" "tailscale.com/net/dns" "tailscale.com/net/dns/resolver" @@ -664,7 +664,7 @@ func (e *userspaceEngine) maybeReconfigWireguardLocked(discoChanged map[key.Publ } } - if !deepprint.UpdateHash(&e.lastEngineSigTrim, min, trimmedDisco, trackDisco, trackIPs) { + if !deephash.UpdateHash(&e.lastEngineSigTrim, min, trimmedDisco, trackDisco, trackIPs) { // No changes return nil } @@ -785,8 +785,8 @@ func (e *userspaceEngine) Reconfig(cfg *wgcfg.Config, routerCfg *router.Config, } e.mu.Unlock() - engineChanged := deepprint.UpdateHash(&e.lastEngineSigFull, cfg) - routerChanged := deepprint.UpdateHash(&e.lastRouterSig, routerCfg, dnsCfg) + engineChanged := deephash.UpdateHash(&e.lastEngineSigFull, cfg) + routerChanged := deephash.UpdateHash(&e.lastRouterSig, routerCfg, dnsCfg) if !engineChanged && !routerChanged { return ErrNoChanges }