diff options
Diffstat (limited to 'control')
| -rw-r--r-- | control/controlclient/auto.go | 2 | ||||
| -rw-r--r-- | control/controlclient/direct.go | 2 | ||||
| -rw-r--r-- | control/controlclient/map.go | 2 |
3 files changed, 2 insertions, 4 deletions
diff --git a/control/controlclient/auto.go b/control/controlclient/auto.go index 9d648409b..58d4864b2 100644 --- a/control/controlclient/auto.go +++ b/control/controlclient/auto.go @@ -424,7 +424,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 d30db6191..d64ed7bf3 100644 --- a/control/controlclient/direct.go +++ b/control/controlclient/direct.go @@ -1085,7 +1085,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 eafdb2d56..df85aed52 100644 --- a/control/controlclient/map.go +++ b/control/controlclient/map.go @@ -892,8 +892,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 } |