TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-02-18 02:48:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/monitor: prevent shutdown hang in darwin link monitor

Browse Source
This commit is contained in:
Brad Fitzpatrick 2021-02-15 08:59:53 -08:00
parent bbb4631e04
commit 36189e2704
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wgengine/monitor/monitor_darwin_tailscaled.go
View File

@ -8,8 +8,10 @@ package monitor
import ( import (
"bufio" "bufio"
"errors"
"os/exec" "os/exec"
"tailscale.com/syncs"
"tailscale.com/types/logger" "tailscale.com/types/logger"
) )
@ -29,12 +31,14 @@ func newOSMon(logf logger.Logf) (osMon, error) {
// we can just shell out to "route -n monitor". It waits for any input // we can just shell out to "route -n monitor". It waits for any input
// but doesn't parse it. Then we poll to see if something is different. // but doesn't parse it. Then we poll to see if something is different.
type routeMonitorSubProcMon struct { type routeMonitorSubProcMon struct {
cmd *exec.Cmd // of "/sbin/route -n monitor" closed syncs.AtomicBool
br *bufio.Reader cmd *exec.Cmd // of "/sbin/route -n monitor"
buf []byte br *bufio.Reader
buf []byte
} }
func (m *routeMonitorSubProcMon) Close() error { func (m *routeMonitorSubProcMon) Close() error {
m.closed.Set(true)
if m.cmd != nil { if m.cmd != nil {
m.cmd.Process.Kill() m.cmd.Process.Kill()
m.cmd = nil m.cmd = nil
@ -43,6 +47,9 @@ func (m *routeMonitorSubProcMon) Close() error {
} }
func (m *routeMonitorSubProcMon) Receive() (message, error) { func (m *routeMonitorSubProcMon) Receive() (message, error) {
if m.closed.Get() {
return nil, errors.New("monitor closed")
}
if m.cmd == nil { if m.cmd == nil {
cmd := exec.Command("/sbin/route", "-n", "monitor") cmd := exec.Command("/sbin/route", "-n", "monitor")
outPipe, err := cmd.StdoutPipe() outPipe, err := cmd.StdoutPipe()