kapitan/IXWebSocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

socket polling / handle more error case such as hanged socket

Browse Source
This commit is contained in:
Benjamin Sergeant 2020-01-09 12:26:57 -08:00
parent a844dbc587
commit ce9db42c23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ixwebsocket/IXSocket.cpp
View File

@ -54,11 +54,12 @@ namespace ix
// to ::poll does fix that. // to ::poll does fix that.
// //
// However poll isn't as portable as select and has bugs on Windows, so we // However poll isn't as portable as select and has bugs on Windows, so we
// should write a shim to fallback to select on those platforms. See // have a shim to fallback to select on those platforms. See
// https://github.com/mpv-player/mpv/pull/5203/files for such a select wrapper. // https://github.com/mpv-player/mpv/pull/5203/files for such a select wrapper.
// //
nfds_t nfds = 1; nfds_t nfds = 1;
struct pollfd fds[2]; struct pollfd fds[2];
memset(fds, 0 , sizeof(fds));
fds[0].fd = sockfd; fds[0].fd = sockfd;
fds[0].events = (readyToRead) ? POLLIN : POLLOUT; fds[0].events = (readyToRead) ? POLLIN : POLLOUT;
@ -132,6 +133,10 @@ namespace ix
} }
#endif #endif
} }
else if (sockfd != -1 && (fds[0].revents & POLLERR || fds[0].revents & POLLHUP))
{
pollResult = PollResultType::Error;
}
return pollResult; return pollResult;
} }