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

Use poll when available on blocking API.

Browse Source 
Signed-off-by: Simon Josefsson <simon@josefsson.org>
This commit is contained in:
Paul Querna 2010-03-23 20:48:58 +01:00 committed by Simon Josefsson
parent 4c09324b02
commit 1decccbb52
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,3 +1,4 @@
o Use poll instead of select when available. By Paul Querna.
o Add APIs to have libssh2 automatically send keep-alive requests. o Add APIs to have libssh2 automatically send keep-alive requests.
The APIs are libssh2_keepalive_config, and libssh2_keepalive_send. The APIs are libssh2_keepalive_config, and libssh2_keepalive_send.

22
src/session.c
View File

@ -517,11 +517,28 @@ libssh2_session_callback_set(LIBSSH2_SESSION * session,
*/ */
int _libssh2_wait_socket(LIBSSH2_SESSION *session) int _libssh2_wait_socket(LIBSSH2_SESSION *session)
{ {
int rc;
int dir;
#if HAVE_POLL
struct pollfd sockets[1];
sockets[0].fd = session->socket_fd;
sockets[0].events = 0;
sockets[0].revents = 0;
/* now make sure we wait in the correct direction */
dir = libssh2_session_block_directions(session);
if(dir & LIBSSH2_SESSION_BLOCK_INBOUND)
sockets[0].events |= POLLIN;
if(dir & LIBSSH2_SESSION_BLOCK_OUTBOUND)
sockets[0].events |= POLLOUT;
rc = poll(sockets, 1, -1);
#else
fd_set fd; fd_set fd;
fd_set *writefd = NULL; fd_set *writefd = NULL;
fd_set *readfd = NULL; fd_set *readfd = NULL;
int dir;
int rc;
struct timeval tv; struct timeval tv;
int seconds_to_next; int seconds_to_next;
@ -548,6 +565,7 @@ int _libssh2_wait_socket(LIBSSH2_SESSION *session)
customizable by the app or something... */ customizable by the app or something... */
rc = select(session->socket_fd + 1, readfd, writefd, NULL, rc = select(session->socket_fd + 1, readfd, writefd, NULL,
seconds_to_next ? &tv : NULL); seconds_to_next ? &tv : NULL);
#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 */