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

Add keep-alive support.

Browse Source
This commit is contained in:
Simon Josefsson
2010-02-25 15:58:52 +01:00
parent 69520e1564
commit 0d331aade1
5 changed files with 145 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/session.c
View File

@@ -1,5 +1,6 @@
/* Copyright (c) 2004-2007 Sara Golemon <sarag@libssh2.org>
* Copyright (c) 2009 by Daniel Stenberg
* Copyright (c) 2010 Simon Josefsson <simon@josefsson.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms,
@@ -521,6 +522,15 @@ int _libssh2_wait_socket(LIBSSH2_SESSION *session)
fd_set *readfd = NULL;
int dir;
int rc;
struct timeval tv;
int seconds_to_next;
rc = libssh2_keepalive_send (session, &seconds_to_next);
if (rc < 0)
return rc;
tv.tv_sec = seconds_to_next;
tv.tv_usec = 0;
FD_ZERO(&fd);
FD_SET(session->socket_fd, &fd);
@@ -536,7 +546,8 @@ int _libssh2_wait_socket(LIBSSH2_SESSION *session)
/* Note that this COULD be made to use a timeout that perhaps could be
customizable by the app or something... */
rc = select(session->socket_fd + 1, readfd, writefd, NULL, NULL);
rc = select(session->socket_fd + 1, readfd, writefd, NULL,
seconds_to_next ? &tv : NULL);
if(rc <= 0) {
/* timeout (or error), bail out with a timeout error */