lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-08-08 19:02:06 +03:00
Code Activity

channels: Correctly handle timeouts in channel functions.

Browse Source
This commit is contained in:
Andreas Schneider
2013-09-17 11:23:56 +02:00
parent f79c4fd7a3
commit 42c07f379d
1 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/channels.c
View File

@@ -1586,7 +1586,11 @@ static int channel_request(ssh_channel channel, const char *request,
return SSH_OK; return SSH_OK;
} }
pending: 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) { if(session->session_state == SSH_SESSION_STATE_ERROR || rc == SSH_ERROR) {
channel->request_state = SSH_CHANNEL_REQ_STATE_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; return SSH_OK;
} }
pending: pending:
rc = ssh_handle_packets_termination(session, SSH_TIMEOUT_USER, rc = ssh_handle_packets_termination(session,
ssh_global_request_termination, session); SSH_TIMEOUT_USER,
ssh_global_request_termination,
session);
if(rc==SSH_ERROR || session->session_state == SSH_SESSION_STATE_ERROR){ if(rc==SSH_ERROR || session->session_state == SSH_SESSION_STATE_ERROR){
session->global_req_state = SSH_CHANNEL_REQ_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) { if(channel == NULL) {
return SSH_ERROR; return SSH_ERROR;
} }
rc = ssh_handle_packets_termination(channel->session, SSH_TIMEOUT_USER, rc = ssh_handle_packets_termination(channel->session,
ssh_channel_exit_status_termination, channel); SSH_TIMEOUT_DEFAULT,
ssh_channel_exit_status_termination,
channel);
if (rc == SSH_ERROR || channel->session->session_state == if (rc == SSH_ERROR || channel->session->session_state ==
SSH_SESSION_STATE_ERROR) SSH_SESSION_STATE_ERROR)
return SSH_ERROR; return SSH_ERROR;