TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-07-29 15:23:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

ipn/ipnlocal: move resetDialPlan to after cc.Logout() returns

Browse Source 
We shouldn't be resetting the current dial plan until cc.Logout() has returned,
so we move the resetDialPlan() call accordingly.

We also update a comment that become inaccurate sometime since 2020.

Finally, we add a resetDialPlan() call when the current profile is deleted.
It results in a switch to a new, empty profile and resets the state machine,
so the dial plan should be reset as well.

Updates #cleanup
Updates #11938

Signed-off-by: Nick Khyl <nickk@tailscale.com>
This commit is contained in:
Nick Khyl 2025-04-21 11:38:55 -05:00
parent 7090f7fffc
commit 926aec56e8
No known key found for this signature in database
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ipn/ipnlocal/local.go
View File

@ -5962,17 +5962,14 @@ func (b *LocalBackend) Logout(ctx context.Context) error {
} }
// b.mu is now unlocked, after editPrefsLockedOnEntry. // b.mu is now unlocked, after editPrefsLockedOnEntry.
// Clear any previous dial plan(s), if set.
b.resetDialPlan()
if cc == nil { if cc == nil {
// Double Logout can happen via repeated IPN
// connections to ipnserver making it repeatedly
// transition from 1->0 total connections, which on
// Windows by default ("client mode") causes a Logout
// on the transition to zero.
// Previously this crashed when we asserted that c was non-nil // Previously this crashed when we asserted that c was non-nil
// here. // here.
// It can be nil due to atypical locking patterns in LocalBackend.
// For example, the old cc can be set to nil while holding b.mu,
// then b.mu is unlocked before calling [LocalBackend.Start],
// which re-acquires the lock and sets a new cc.
// If Logout is called in between, cc can be nil.
return errors.New("no controlclient") return errors.New("no controlclient")
} }
@ -5983,6 +5980,9 @@ func (b *LocalBackend) Logout(ctx context.Context) error {
unlock = b.lockAndGetUnlock() unlock = b.lockAndGetUnlock()
defer unlock() defer unlock()
// Clear any previous dial plan(s), if set.
b.resetDialPlan()
if err := b.pm.DeleteProfile(profile.ID()); err != nil { if err := b.pm.DeleteProfile(profile.ID()); err != nil {
b.logf("error deleting profile: %v", err) b.logf("error deleting profile: %v", err)
return err return err
@ -7334,6 +7334,9 @@ func (b *LocalBackend) DeleteProfile(p ipn.ProfileID) error {
if !needToRestart { if !needToRestart {
return nil return nil
} }
// Deleting the current profile switches to a new, empty one.
// Its ControlURL hasn't been set yet, so we conservatively reset the dialPlan.
b.resetDialPlan()
return b.resetForProfileChangeLockedOnEntry(unlock) return b.resetForProfileChangeLockedOnEntry(unlock)
} }