TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-01-08 09:07:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/monitor: make Close not block forever on Linux

Browse Source 
Signed-off-by: Brad Fitzpatrick <bradfitz@tailscale.com>
This commit is contained in:
Brad Fitzpatrick 2020-02-17 11:28:07 -08:00 committed by Brad Fitzpatrick
parent 7f5e3febe5
commit 997678f540
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wgengine/monitor/monitor_linux.go
View File

@ -6,6 +6,7 @@
import ( import (
"fmt" "fmt"
"time"
"github.com/mdlayher/netlink" "github.com/mdlayher/netlink"
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
@ -45,6 +46,7 @@ func newOSMon() (osMon, error) {
} }
func (c *nlConn) Close() error { func (c *nlConn) Close() error {
c.conn.SetDeadline(time.Unix(0, 0)) // abort any Receive in flight
return c.conn.Close() return c.conn.Close()
} }