Hesham/wireguard-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tun: windows: Attempt to reopen handle on all errors

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman 2019-04-03 05:40:35 +02:00
parent ac25702eaf
commit 421c1f9143
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
tun/tun_windows.go
View File

@ -188,13 +188,6 @@ func (tun *NativeTun) getTUN() (read *os.File, write *os.File, err error) {
return return
} }
func (tun *NativeTun) shouldReopenHandle(err error) bool {
if pe, ok := err.(*os.PathError); ok && pe.Err == windows.ERROR_OPERATION_ABORTED {
return !tun.close
}
return false
}
func (tun *NativeTun) Name() (string, error) { func (tun *NativeTun) Name() (string, error) {
return tun.wt.GetInterfaceName() return tun.wt.GetInterfaceName()
} }
@ -267,12 +260,13 @@ func (tun *NativeTun) Read(buff []byte, offset int) (int, error) {
// Fill queue. // Fill queue.
n, err := file.Read(tun.rdBuff.data[:]) n, err := file.Read(tun.rdBuff.data[:])
if err != nil { if err != nil {
tun.rdBuff.offset = 0
tun.rdBuff.avail = 0 tun.rdBuff.avail = 0
if tun.shouldReopenHandle(err) { if tun.close {
tun.closeTUN() return 0, err
continue
} }
return 0, err tun.closeTUN()
continue
} }
tun.rdBuff.offset = 0 tun.rdBuff.offset = 0
tun.rdBuff.avail = uint32(n) tun.rdBuff.avail = uint32(n)
@ -298,11 +292,11 @@ func (tun *NativeTun) Flush() error {
tun.wrBuff.packetNum = 0 tun.wrBuff.packetNum = 0
tun.wrBuff.offset = 0 tun.wrBuff.offset = 0
if err != nil { if err != nil {
if tun.shouldReopenHandle(err) { if tun.close {
tun.closeTUN() return err
continue
} }
return err tun.closeTUN()
continue
} }
return nil return nil
} }