diff options
| author | Andreas Schneider <asn@cryptomilk.org> | 2013-09-17 11:19:49 +0200 |
|---|---|---|
| committer | Andreas Schneider <asn@cryptomilk.org> | 2013-10-01 14:47:58 +0200 |
| commit | f79c4fd7a35831bad7c7d501f506256bb284facc (patch) | |
| tree | c5cc55ca371cfd44d297565580e9406a60bdd5e2 /src | |
| parent | 7b2aee90f0bd15a5e8e0b69a1bb1f65e0aa363fa (diff) | |
channel: Use the correct timeout option in channel_open().
BUG: https://red.libssh.org/issues/124
Diffstat (limited to 'src')
| -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 fdd60655..c2dcc42e 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: |