snow/wireguard-go
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

tun: windows: delete interface before deleting file handles

Browse source
This commit is contained in:
Jason A. Donenfeld 2019-03-22 16:45:03 -06:00
parent 2faf2dcf90
commit 52ec440d79
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
tun/tun_windows.go
View file

@ -214,18 +214,13 @@ func (tun *NativeTun) Events() chan TUNEvent {
func (tun *NativeTun) Close() error { func (tun *NativeTun) Close() error {
tun.close = true tun.close = true
err1 := tun.closeTUN()
if tun.events != nil { if tun.events != nil {
close(tun.events) close(tun.events)
} }
/* We delete it first, before closing, so that the close operations don't hang with the concurrent read operation. */
_, _, err2 := tun.wt.DeleteInterface(0) _, _, err := tun.wt.DeleteInterface(0)
if err1 == nil { tun.closeTUN()
err1 = err2 return err
}
return err1
} }
func (tun *NativeTun) MTU() (int, error) { func (tun *NativeTun) MTU() (int, error) {