shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-11 18:50:28 +09:00
Code Issues Packages Projects Releases Wiki Activity

poll: Return early for timeout and count every revent

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2018-12-10 09:25:33 +01:00
parent 51f035aa3f
commit de54a88ee1
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/poll.c
View File

@@ -286,6 +286,10 @@ static int bsd_poll(ssh_pollfd_t *fds, nfds_t nfds, int timeout)
if (rc < 0) { if (rc < 0) {
return -1; return -1;
} }
/* A timeout occured */
if (rc == 0) {
return 0;
}
for (rc = 0, i = 0; i < nfds; i++) { for (rc = 0, i = 0; i < nfds; i++) {
if (fds[i].fd >= 0) { if (fds[i].fd >= 0) {
@@ -303,7 +307,7 @@ static int bsd_poll(ssh_pollfd_t *fds, nfds_t nfds, int timeout)
fds[i].revents |= fds[i].events & (POLLPRI | POLLRDBAND); fds[i].revents |= fds[i].events & (POLLPRI | POLLRDBAND);
} }
if (fds[i].revents & ~POLLHUP) { if (fds[i].revents != 0) {
rc++; rc++;
} }
} else { } else {