mirror of
https://github.com/tailscale/tailscale.git
synced 2025-01-05 14:57:49 +00:00
wgengine/monitor: make Darwin monitor shut down cleanly, add test
Don't use os.NewFile or (*os.File).Close on the AF_ROUTE socket. It apparently does weird things to the fd and at least doesn't seem to close it. Just use the unix package. The test doesn't actually fail reliably before the fix, though. It was an attempt. But this fixes the integration tests. Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
parent
625c413508
commit
24fa616e73
@ -7,7 +7,7 @@
|
||||
import (
|
||||
"fmt"
|
||||
"log"
|
||||
"os"
|
||||
"sync"
|
||||
|
||||
"golang.org/x/net/route"
|
||||
"golang.org/x/sys/unix"
|
||||
@ -31,22 +31,27 @@ func newOSMon(logf logger.Logf) (osMon, error) {
|
||||
}
|
||||
return &darwinRouteMon{
|
||||
logf: logf,
|
||||
f: os.NewFile(uintptr(fd), "AF_ROUTE"),
|
||||
fd: fd,
|
||||
}, nil
|
||||
}
|
||||
|
||||
type darwinRouteMon struct {
|
||||
logf logger.Logf
|
||||
f *os.File // AF_ROUTE socket
|
||||
buf [2 << 10]byte
|
||||
logf logger.Logf
|
||||
fd int // AF_ROUTE socket
|
||||
buf [2 << 10]byte
|
||||
closeOnce sync.Once
|
||||
}
|
||||
|
||||
func (m *darwinRouteMon) Close() error {
|
||||
return m.f.Close()
|
||||
var err error
|
||||
m.closeOnce.Do(func() {
|
||||
err = unix.Close(m.fd)
|
||||
})
|
||||
return err
|
||||
}
|
||||
|
||||
func (m *darwinRouteMon) Receive() (message, error) {
|
||||
n, err := m.f.Read(m.buf[:])
|
||||
n, err := unix.Read(m.fd, m.buf[:])
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
30
wgengine/monitor/monitor_test.go
Normal file
30
wgengine/monitor/monitor_test.go
Normal file
@ -0,0 +1,30 @@
|
||||
// Copyright (c) 2021 Tailscale Inc & AUTHORS All rights reserved.
|
||||
// Use of this source code is governed by a BSD-style
|
||||
// license that can be found in the LICENSE file.
|
||||
|
||||
package monitor
|
||||
|
||||
import (
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestMonitorStartClose(t *testing.T) {
|
||||
mon, err := New(t.Logf)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
mon.Start()
|
||||
if err := mon.Close(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMonitorJustClose(t *testing.T) {
|
||||
mon, err := New(t.Logf)
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err := mon.Close(); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
}
|
Loading…
x
Reference in New Issue
Block a user