diff options
| author | Brad Fitzpatrick <bradfitz@tailscale.com> | 2025-11-15 10:28:09 -0800 |
|---|---|---|
| committer | Brad Fitzpatrick <bradfitz@tailscale.com> | 2025-11-15 10:28:09 -0800 |
| commit | 91d23babef688c3564d445cdacd91c7c55bd66da (patch) | |
| tree | a3a9cee0a8d2b99fb4e4ce9786aabd5a508017fa /ipn | |
| parent | 4e01e8a66ec6ae1d5ebecc60ad12b26ce300c860 (diff) | |
| download | tailscale-bradfitz/nm_cache.tar.xz tailscale-bradfitz/nm_cache.zip | |
types/netmap: remove some useless denormalized fields from NetworkMapbradfitz/nm_cache
Updates #12639
Change-Id: Iec51c280141e22a0e3501df2053f2435e16fc0c8
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
Diffstat (limited to 'ipn')
| -rw-r--r-- | ipn/ipnlocal/local.go | 4 | ||||
| -rw-r--r-- | ipn/ipnlocal/node_backend.go | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ipn/ipnlocal/local.go b/ipn/ipnlocal/local.go index 41d110400..48d6995aa 100644 --- a/ipn/ipnlocal/local.go +++ b/ipn/ipnlocal/local.go @@ -1295,7 +1295,7 @@ func (b *LocalBackend) UpdateStatus(sb *ipnstate.StatusBuilder) { if hi := nm.SelfNode.Hostinfo(); hi.Valid() { ss.HostName = hi.Hostname() } - ss.DNSName = nm.Name + ss.DNSName = nm.SelfName() ss.UserID = nm.User() if sn := nm.SelfNode; sn.Valid() { peerStatusFromNode(ss, sn) @@ -1611,7 +1611,7 @@ func (b *LocalBackend) SetControlClientStatus(c controlclient.Client, st control keyExpiryExtended := false if st.NetMap != nil { wasExpired := b.keyExpired - isExpired := !st.NetMap.Expiry.IsZero() && st.NetMap.Expiry.Before(b.clock.Now()) + isExpired := !st.NetMap.SelfKeyExpiry().IsZero() && st.NetMap.SelfKeyExpiry().Before(b.clock.Now()) if wasExpired && !isExpired { keyExpiryExtended = true } diff --git a/ipn/ipnlocal/node_backend.go b/ipn/ipnlocal/node_backend.go index dbe23e4d5..3c2e88246 100644 --- a/ipn/ipnlocal/node_backend.go +++ b/ipn/ipnlocal/node_backend.go @@ -747,7 +747,7 @@ func dnsConfigForNetmap(nm *netmap.NetworkMap, peers map[tailcfg.NodeID]tailcfg. } dcfg.Hosts[fqdn] = ips } - set(nm.Name, nm.GetAddresses()) + set(nm.SelfName(), nm.GetAddresses()) for _, peer := range peers { set(peer.Name(), peer.Addresses()) } |