types/netmap,*: remove some redundant fields from NetMap

Updates #12639

Change-Id: Ia50b15529bd1c002cdd2c937cdfbe69c06fa2dc8
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>

3 files changed, 2 insertions, 4 deletions

diff --git a/control/controlclient/auto.go b/control/controlclient/auto.go
index 20795d5a7..3cbfe8581 100644
--- a/control/controlclient/auto.go
+++ b/control/controlclient/auto.go
@@ -443,7 +443,7 @@ func (mrs mapRoutineState) UpdateFullNetmap(nm *netmap.NetworkMap) {
 
 	c.mu.Lock()
 	c.inMapPoll = true
-	c.expiry = nm.Expiry
+	c.expiry = nm.SelfKeyExpiry()
 	stillAuthed := c.loggedIn
 	c.logf("[v1] mapRoutine: netmap received: loggedIn=%v inMapPoll=true", stillAuthed)
 	c.mu.Unlock()
diff --git a/control/controlclient/direct.go b/control/controlclient/direct.go
index 1e1ce781f..62bbb3586 100644
--- a/control/controlclient/direct.go
+++ b/control/controlclient/direct.go
@@ -1093,7 +1093,7 @@ func (c *Direct) sendMapRequest(ctx context.Context, isStreaming bool, nu Netmap
 			c.persist = newPersist.View()
 			persist = c.persist
 		}
-		c.expiry = nm.Expiry
+		c.expiry = nm.SelfKeyExpiry()
 	}
 
 	// gotNonKeepAliveMessage is whether we've yet received a MapResponse message without
diff --git a/control/controlclient/map.go b/control/controlclient/map.go
index a9db25517..9aa8e3710 100644
--- a/control/controlclient/map.go
+++ b/control/controlclient/map.go
@@ -891,8 +891,6 @@ func (ms *mapSession) netmap() *netmap.NetworkMap {
 
 	if node := ms.lastNode; node.Valid() {
 		nm.SelfNode = node
-		nm.Expiry = node.KeyExpiry()
-		nm.Name = node.Name()
 		nm.AllCaps = ms.lastCapSet
 	}