qiurui
/
uvgrtp-base
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Return RTP_INTERRUPTED from WSARecv() 

Return proper status indication if the operation was interrupted
as the socket might be non-blocking and caller must be able to
differentiate between a real error and timeout
This commit is contained in:
Aaro Altonen 2020-10-01 07:34:59 +03:00
parent 4480c10756
commit 9935706895
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/socket.cc
View File

@ -483,7 +483,7 @@ rtp_error_t uvg_rtp::socket::__recv(uint8_t *buf, size_t buf_len, int flags, int
int32_t ret = ::recv(socket_, buf, buf_len, flags);
if (ret == -1) {
if (errno == EAGAIN) {
if (errno == EAGAIN || errno == EINTR) {
set_bytes(bytes_read, 0);
return RTP_INTERRUPTED;
}
@ -504,8 +504,14 @@ rtp_error_t uvg_rtp::socket::__recv(uint8_t *buf, size_t buf_len, int flags, int
rc = ::WSARecv(socket_, &DataBuf, 1, &bytes_received, &flags_, NULL, NULL);
if ((rc == SOCKET_ERROR) && (WSA_IO_PENDING != (err = WSAGetLastError()))) {
win_get_last_error();
if (rc == SOCKET_ERROR) {
err = WSAGetLastError();
if (err == WSA_IO_PENDING || err == WSAEWOULDBLOCK) {
set_bytes(bytes_read, 0);
return RTP_INTERRUPTED;
}
log_platform_error("WSARecv() failed");
set_bytes(bytes_read, -1);
return RTP_GENERIC_ERROR;
}