diff options
Diffstat (limited to 'pkg/tcpip/link/rawfile/rawfile_unsafe.go')
| -rw-r--r-- | pkg/tcpip/link/rawfile/rawfile_unsafe.go | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/pkg/tcpip/link/rawfile/rawfile_unsafe.go b/pkg/tcpip/link/rawfile/rawfile_unsafe.go index 87a0b9a62..e76fc55b6 100644 --- a/pkg/tcpip/link/rawfile/rawfile_unsafe.go +++ b/pkg/tcpip/link/rawfile/rawfile_unsafe.go @@ -181,9 +181,7 @@ func BlockingReadvUntilStopped(efd int, fd int, iovecs []unix.Iovec) (int, tcpip if e == 0 { return int(n), nil } - if e != 0 && e != unix.EWOULDBLOCK { - return 0, TranslateErrno(e) - } + stopped, e := BlockingPollUntilStopped(efd, fd, unix.POLLIN) if stopped { return -1, nil @@ -206,10 +204,6 @@ func BlockingRecvMMsgUntilStopped(efd int, fd int, msgHdrs []MMsgHdr) (int, tcpi return int(n), nil } - if e != 0 && e != unix.EWOULDBLOCK { - return 0, TranslateErrno(e) - } - stopped, e := BlockingPollUntilStopped(efd, fd, unix.POLLIN) if stopped { return -1, nil @@ -234,13 +228,5 @@ func BlockingPollUntilStopped(efd int, fd int, events int16) (bool, unix.Errno) }, } _, errno := BlockingPoll(&pevents[0], len(pevents), nil) - if errno != 0 { - return pevents[0].Revents&unix.POLLIN != 0, errno - } - - if pevents[1].Revents&unix.POLLHUP != 0 || pevents[1].Revents&unix.POLLERR != 0 { - errno = unix.ECONNRESET - } - return pevents[0].Revents&unix.POLLIN != 0, errno } |