lzc256
/
tailscale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wgengine: add two missing TUN close calls

reviewable/pr773/r1
Brad Fitzpatrick 2020-09-18 08:04:15 -07:00
parent abe095f036
commit afb2be71de
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/userspace.go
View File

@ -187,6 +187,7 @@ func NewUserspaceEngine(logf logger.Logf, tunname string, listenPort uint16) (En
e, err := NewUserspaceEngineAdvanced(conf) e, err := NewUserspaceEngineAdvanced(conf)
if err != nil { if err != nil {
tun.Close()
return nil, err return nil, err
} }
return e, err return e, err
@ -1098,6 +1099,7 @@ func (e *userspaceEngine) Close() {
e.linkMon.Close() e.linkMon.Close()
e.router.Close() e.router.Close()
e.wgdev.Close() e.wgdev.Close()
e.tundev.Close()
// Shut down pingers after tundev is closed (by e.wgdev.Close) so the // Shut down pingers after tundev is closed (by e.wgdev.Close) so the
// synchronous close does not get stuck on InjectOutbound. // synchronous close does not get stuck on InjectOutbound.