diff options
| author | Oliver Stöneberg <oliverst@online.de> | 2011-05-16 06:49:38 -0700 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2011-05-17 20:57:38 +0200 |
| commit | 629cfbccc44da2a3eda66ec665d2f98ad93be0b6 (patch) | |
| tree | 3b5582c9205429645f04f36edbdb9a5f827864c5 /src/session.c | |
| parent | c5990791db48521f9e9271b65110eb6ebb2820eb (diff) | |
| download | libssh-629cfbccc44da2a3eda66ec665d2f98ad93be0b6.tar.gz libssh-629cfbccc44da2a3eda66ec665d2f98ad93be0b6.tar.xz libssh-629cfbccc44da2a3eda66ec665d2f98ad93be0b6.zip | |
connect: Set timeout on connect
This also fixes error handling in ssh_poll_ctx_dopoll() and
ssh_handle_packets(), so it won't loop forever on an actual timeout.
(cherry picked from commit 671a9827394714cfc90d75c8a8fb2ccd86f80abf)
Diffstat (limited to 'src/session.c')
| -rw-r--r-- | src/session.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/session.c b/src/session.c index 18688c60..35fb0b28 100644 --- a/src/session.c +++ b/src/session.c @@ -429,7 +429,8 @@ int ssh_handle_packets(ssh_session session, int timeout) { if(spoll_in != spoll_out) ssh_poll_ctx_add(ctx,spoll_out); } - ssh_poll_ctx_dopoll(ctx,timeout); + if( ssh_poll_ctx_dopoll(ctx,timeout) ) + session->session_state = SSH_SESSION_STATE_ERROR; leave_function(); if (session->session_state != SSH_SESSION_STATE_ERROR) return SSH_OK; |