TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2024-11-25 19:15:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

control/controlclient: make Auto.Shutdown call Direct.Close

Browse Source 
Updates #3488

Signed-off-by: Maisem Ali <maisem@tailscale.com>
This commit is contained in:
Maisem Ali 2022-03-08 11:45:48 -08:00 committed by Maisem Ali
parent 0f37317664
commit 91a8cdc84b
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
control/controlclient/auto.go
View File

@ -677,6 +677,7 @@ func (c *Auto) Shutdown() {
c.mu.Lock() c.mu.Lock()
inSendStatus := c.inSendStatus inSendStatus := c.inSendStatus
closed := c.closed closed := c.closed
direct := c.direct
if !closed { if !closed {
c.closed = true c.closed = true
c.statusFunc = nil c.statusFunc = nil
@ -685,6 +686,9 @@ func (c *Auto) Shutdown() {
c.logf("client.Shutdown: inSendStatus=%v", inSendStatus) c.logf("client.Shutdown: inSendStatus=%v", inSendStatus)
if !closed { if !closed {
if direct != nil {
direct.Close()
}
c.unregisterHealthWatch() c.unregisterHealthWatch()
close(c.quit) close(c.quit)
c.cancelAuth() c.cancelAuth()