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

Properly bubble up setsockopt error from closure

Browse source
This commit is contained in:
Jason A. Donenfeld 2018-12-25 22:56:36 +01:00
parent 8fde8334dc
commit 6e61c369e8
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
mark_unix.go
View file

@ -26,6 +26,7 @@ func init() {
} }
func (bind *NativeBind) SetMark(mark uint32) error { func (bind *NativeBind) SetMark(mark uint32) error {
var operr error
if fwmarkIoctl == 0 { if fwmarkIoctl == 0 {
return nil return nil
} }
@ -35,8 +36,11 @@ func (bind *NativeBind) SetMark(mark uint32) error {
return err return err
} }
err = fd.Control(func(fd uintptr) { err = fd.Control(func(fd uintptr) {
err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, fwmarkIoctl, int(mark)) operr = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, fwmarkIoctl, int(mark))
}) })
if err == nil {
err = operr
}
if err != nil { if err != nil {
return err return err
} }
@ -47,8 +51,11 @@ func (bind *NativeBind) SetMark(mark uint32) error {
return err return err
} }
err = fd.Control(func(fd uintptr) { err = fd.Control(func(fd uintptr) {
err = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, fwmarkIoctl, int(mark)) operr = unix.SetsockoptInt(int(fd), unix.SOL_SOCKET, fwmarkIoctl, int(mark))
}) })
if err == nil {
err = operr
}
if err != nil { if err != nil {
return err return err
} }