mirrors/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-12-04 17:01:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

control/controlclient: remove unused reference to mapCtx (#17614)

Browse Source 
Updates #cleanup

Signed-off-by: James Sanderson <jsanderson@tailscale.com>
This commit is contained in:
James 'zofrex' Sanderson 2025-10-30 17:12:08 +00:00 committed by GitHub
parent adee8b9180
commit b6c6960e40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
control/controlclient/auto.go
View File

@ -433,7 +433,6 @@ func (mrs mapRoutineState) UpdateFullNetmap(nm *netmap.NetworkMap) {
c := mrs.c c := mrs.c
c.mu.Lock() c.mu.Lock()
ctx := c.mapCtx
c.inMapPoll = true c.inMapPoll = true
if c.loggedIn { if c.loggedIn {
c.state = StateSynchronized c.state = StateSynchronized
@ -447,7 +446,7 @@ func (mrs mapRoutineState) UpdateFullNetmap(nm *netmap.NetworkMap) {
c.sendStatus("mapRoutine-got-netmap", nil, "", nm) c.sendStatus("mapRoutine-got-netmap", nil, "", nm)
} }
// Reset the backoff timer if we got a netmap. // Reset the backoff timer if we got a netmap.
mrs.bo.BackOff(ctx, nil) mrs.bo.Reset()
} }
func (mrs mapRoutineState) UpdateNetmapDelta(muts []netmap.NodeMutation) bool { func (mrs mapRoutineState) UpdateNetmapDelta(muts []netmap.NodeMutation) bool {

6
util/backoff/backoff.go
View File

@ -78,3 +78,9 @@ func (b *Backoff) BackOff(ctx context.Context, err error) {
case <-tChannel: case <-tChannel:
} }
} }
// Reset resets the backoff schedule, equivalent to calling BackOff with a nil
// error.
func (b *Backoff) Reset() {
b.n = 0
}