diff options
author | Andreas Schneider <asn@cryptomilk.org> | 2013-09-17 11:19:49 +0200 |
---|---|---|
committer | Andreas Schneider <asn@cryptomilk.org> | 2013-09-17 11:19:49 +0200 |
commit | 566d842405f321daea005a453fff2fb6c3bb4a94 (patch) | |
tree | 39ab25e7f5496310da13d58dab8eacb15b420a75 /src/channels.c | |
parent | 5e2fbbc202aab30a4e345406ba5ae5344a53d078 (diff) | |
download | libssh-566d842405f321daea005a453fff2fb6c3bb4a94.tar.gz libssh-566d842405f321daea005a453fff2fb6c3bb4a94.tar.xz libssh-566d842405f321daea005a453fff2fb6c3bb4a94.zip |
channel: Use the correct timeout option in channel_open().
BUG: https://red.libssh.org/issues/124
Diffstat (limited to 'src/channels.c')
-rw-r--r-- | src/channels.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/channels.c b/src/channels.c index 27a29b35..4d0fd354 100644 --- a/src/channels.c +++ b/src/channels.c @@ -312,7 +312,11 @@ static int channel_open(ssh_channel channel, const char *type_c, int window, type_c, channel->local_channel); pending: /* wait until channel is opened by server */ - err = ssh_handle_packets_termination(session, SSH_TIMEOUT_USER, ssh_channel_open_termination, channel); + err = ssh_handle_packets_termination(session, + SSH_TIMEOUT_DEFAULT, + ssh_channel_open_termination, + channel); + if (session->session_state == SSH_SESSION_STATE_ERROR) err = SSH_ERROR; end: |