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

ipn/ipnlocal: avoid ResetAndStop panic

Browse Source 
Updates #18187

Change-Id: If7375efb7df0452a5e85b742fc4c4eecbbd62717
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
(cherry picked from commit 0df463130889799588b95e63c0040be3501ec8b4)
This commit is contained in:
Brad Fitzpatrick 2025-12-11 08:46:53 -08:00 committed by Alex Chan
parent 95a957cdd7
commit f5d1075cd4
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ipn/ipnlocal/local.go
View File

@ -5768,7 +5768,14 @@ func (b *LocalBackend) stateMachineLocked() {
// b.mu must be held.
func (b *LocalBackend) stopEngineAndWaitLocked() {
b.logf("stopEngineAndWait...")
st, _ := b.e.ResetAndStop() // TODO: what should we do if this returns an error?
st, err := b.e.ResetAndStop()
if err != nil {
// TODO(braditz): our caller, popBrowserAuthNowLocked, probably
// should handle this somehow. For now, just log it.
// See tailscale/tailscale#18187
b.logf("stopEngineAndWait: ResetAndStop error: %v", err)
return
}
b.setWgengineStatusLocked(st)
b.logf("stopEngineAndWait: done.")
}