generic-library/ssh2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

_libssh2_wait_socket: fix timeouts for poll() uses

Browse Source
This commit is contained in:
Daniel Stenberg 2011-05-31 23:49:32 +02:00
parent 81d53de4dc
commit 9a24b03402
1 changed files with 73 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
src/session.c
View File

@ -549,6 +549,8 @@ int _libssh2_wait_socket(LIBSSH2_SESSION *session, time_t start_time)
int seconds_to_next; int seconds_to_next;
int dir; int dir;
int has_timeout; int has_timeout;
long ms_to_next = 0;
long elapsed_ms;
/* since libssh2 often sets EAGAIN internally before this function is /* since libssh2 often sets EAGAIN internally before this function is
called, we can decrease some amount of confusion in user programs by called, we can decrease some amount of confusion in user programs by
@ -559,7 +561,9 @@ int _libssh2_wait_socket(LIBSSH2_SESSION *session, time_t start_time)
rc = libssh2_keepalive_send (session, &seconds_to_next); rc = libssh2_keepalive_send (session, &seconds_to_next);
if (rc < 0) if (rc < 0)
return rc; return rc;
else {
ms_to_next = seconds_to_next * 1000;
/* figure out what to wait for */ /* figure out what to wait for */
dir = libssh2_session_block_directions(session); dir = libssh2_session_block_directions(session);
@ -569,10 +573,29 @@ int _libssh2_wait_socket(LIBSSH2_SESSION *session, time_t start_time)
/* To avoid that we hang below just because there's nothing set to /* To avoid that we hang below just because there's nothing set to
wait for, we timeout on 1 second to also avoid busy-looping wait for, we timeout on 1 second to also avoid busy-looping
during this condition */ during this condition */
seconds_to_next = 1; ms_to_next = 1000;
} }
{
if (session->api_timeout > 0 &&
(seconds_to_next == 0 ||
seconds_to_next > session->api_timeout)) {
time_t now = time (NULL);
elapsed_ms = (long)(1000*difftime(start_time, now));
if (elapsed_ms > session->api_timeout) {
session->err_code = LIBSSH2_ERROR_TIMEOUT;
return LIBSSH2_ERROR_TIMEOUT;
}
ms_to_next = (session->api_timeout - elapsed_ms);
has_timeout = 1;
}
else if (ms_to_next > 0) {
has_timeout = 1;
}
else
has_timeout = 0;
#ifdef HAVE_POLL #ifdef HAVE_POLL
{
struct pollfd sockets[1]; struct pollfd sockets[1];
sockets[0].fd = session->socket_fd; sockets[0].fd = session->socket_fd;
@ -585,36 +608,18 @@ int _libssh2_wait_socket(LIBSSH2_SESSION *session, time_t start_time)
if(dir & LIBSSH2_SESSION_BLOCK_OUTBOUND) if(dir & LIBSSH2_SESSION_BLOCK_OUTBOUND)
sockets[0].events |= POLLOUT; sockets[0].events |= POLLOUT;
rc = poll(sockets, 1, seconds_to_next ? rc = poll(sockets, 1, has_timeout?ms_to_next: -1);
seconds_to_next * 1000 : -1); }
#else #else
{
fd_set rfd; fd_set rfd;
fd_set wfd; fd_set wfd;
fd_set *writefd = NULL; fd_set *writefd = NULL;
fd_set *readfd = NULL; fd_set *readfd = NULL;
struct timeval tv; struct timeval tv;
if (session->api_timeout > 0 && tv.tv_sec = ms_to_next / 1000;
(seconds_to_next == 0 || tv.tv_usec = (ms_to_next - tv.tv_sec*1000) * 1000;
seconds_to_next > session->api_timeout)) {
time_t now = time (NULL);
long elapsed_ms = (long)(1000*difftime(start_time, now));
if (elapsed_ms > session->api_timeout) {
session->err_code = LIBSSH2_ERROR_TIMEOUT;
return LIBSSH2_ERROR_TIMEOUT;
}
tv.tv_sec = (session->api_timeout - elapsed_ms) / 1000;
tv.tv_usec = ((session->api_timeout - elapsed_ms) % 1000) *
1000;
has_timeout = 1;
}
else if (seconds_to_next > 0) {
tv.tv_sec = seconds_to_next;
tv.tv_usec = 0;
has_timeout = 1;
}
else
has_timeout = 0;
if(dir & LIBSSH2_SESSION_BLOCK_INBOUND) { if(dir & LIBSSH2_SESSION_BLOCK_INBOUND) {
FD_ZERO(&rfd); FD_ZERO(&rfd);
@ -630,10 +635,8 @@ int _libssh2_wait_socket(LIBSSH2_SESSION *session, time_t start_time)
rc = select(session->socket_fd + 1, readfd, writefd, NULL, rc = select(session->socket_fd + 1, readfd, writefd, NULL,
has_timeout ? &tv : NULL); has_timeout ? &tv : NULL);
}
#endif #endif
}
}
if(rc <= 0) { if(rc <= 0) {
/* timeout (or error), bail out with a timeout error */ /* timeout (or error), bail out with a timeout error */
session->err_code = LIBSSH2_ERROR_TIMEOUT; session->err_code = LIBSSH2_ERROR_TIMEOUT;