diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2013-09-17 11:23:56 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2013-10-01 14:47:58 +0200 |
| commit | 42c07f379d131eabf30bc9d3acb71020525474ea (patch) | |
| tree | 6fa32ec8c281ce971c04b12a2d5f37a610fb2c0c /src | |
| parent | f79c4fd7a35831bad7c7d501f506256bb284facc (diff) | |
| download | libssh-42c07f379d131eabf30bc9d3acb71020525474ea.tar.gz libssh-42c07f379d131eabf30bc9d3acb71020525474ea.tar.xz libssh-42c07f379d131eabf30bc9d3acb71020525474ea.zip | |
channels: Correctly handle timeouts in channel functions.
Diffstat (limited to 'src')
| -rw-r--r-- | src/channels.c | 19 |
1 files changed, 14 insertions, 5 deletions
diff --git a/src/channels.c b/src/channels.c index c2dcc42e..79baecd6 100644 --- a/src/channels.c +++ b/src/channels.c @@ -1586,7 +1586,11 @@ static int channel_request(ssh_channel channel, const char *request, return SSH_OK; } pending: - rc = ssh_handle_packets_termination(session,SSH_TIMEOUT_USER, ssh_channel_request_termination, channel); + rc = ssh_handle_packets_termination(session, + SSH_TIMEOUT_DEFAULT, + ssh_channel_request_termination, + channel); + if(session->session_state == SSH_SESSION_STATE_ERROR || rc == SSH_ERROR) { channel->request_state = SSH_CHANNEL_REQ_STATE_ERROR; } @@ -2127,8 +2131,11 @@ static int global_request(ssh_session session, const char *request, return SSH_OK; } pending: - rc = ssh_handle_packets_termination(session, SSH_TIMEOUT_USER, - ssh_global_request_termination, session); + rc = ssh_handle_packets_termination(session, + SSH_TIMEOUT_USER, + ssh_global_request_termination, + session); + if(rc==SSH_ERROR || session->session_state == SSH_SESSION_STATE_ERROR){ session->global_req_state = SSH_CHANNEL_REQ_STATE_ERROR; } @@ -2906,8 +2913,10 @@ int ssh_channel_get_exit_status(ssh_channel channel) { if(channel == NULL) { return SSH_ERROR; } - rc = ssh_handle_packets_termination(channel->session, SSH_TIMEOUT_USER, - ssh_channel_exit_status_termination, channel); + rc = ssh_handle_packets_termination(channel->session, + SSH_TIMEOUT_DEFAULT, + ssh_channel_exit_status_termination, + channel); if (rc == SSH_ERROR || channel->session->session_state == SSH_SESSION_STATE_ERROR) return SSH_ERROR; |