TheArchive/tailscale
1
0
Fork 0
mirror of https://github.com/tailscale/tailscale.git synced 2025-04-20 21:51:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

wgengine/tstun: make Close safe for concurrent use

Browse Source
This commit is contained in:
Brad Fitzpatrick 2020-09-18 08:03:10 -07:00
parent 3bdcfa7193
commit abe095f036
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
wgengine/tstun/tun.go
View File

@ -63,6 +63,8 @@ type TUN struct {
// tdev is the underlying TUN device. // tdev is the underlying TUN device.
tdev tun.Device tdev tun.Device
closeOnce sync.Once
_ [4]byte // force 64-bit alignment of following field on 32-bit _ [4]byte // force 64-bit alignment of following field on 32-bit
lastActivityAtomic int64 // unix seconds of last send or receive lastActivityAtomic int64 // unix seconds of last send or receive
@ -140,15 +142,14 @@ func (t *TUN) SetDestIPActivityFuncs(m map[packet.IP]func()) {
} }
func (t *TUN) Close() error { func (t *TUN) Close() error {
select { var err error
case <-t.closed: t.closeOnce.Do(func() {
// continue
default:
// Other channels need not be closed: poll will exit gracefully after this. // Other channels need not be closed: poll will exit gracefully after this.
close(t.closed) close(t.closed)
}
return t.tdev.Close() err = t.tdev.Close()
})
return err
} }
func (t *TUN) Events() chan tun.Event { func (t *TUN) Events() chan tun.Event {