From 1ef619ae08b9950cfd89f171668c494784459476 Mon Sep 17 00:00:00 2001 From: simon Date: Sat, 5 Mar 2005 18:14:57 +0000 Subject: [PATCH] Over-enthusiastic assertions in the port forwarding code removed. Port forwardings are set up before initialising the last few details of the main shell session, so ssh->state can reasonably hold values other than SSH_STATE_SESSION and SSH_STATE_CLOSED during calls to sshfwd_*. git-svn-id: svn://svn.tartarus.org/sgt/putty@5446 cda61777-01e9-0310-a592-d414129be87e --- ssh.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/ssh.c b/ssh.c index 7f3748af..94a04fd0 100644 --- a/ssh.c +++ b/ssh.c @@ -3682,10 +3682,8 @@ void sshfwd_close(struct ssh_channel *c) { Ssh ssh = c->ssh; - if (ssh->state != SSH_STATE_SESSION) { - assert(ssh->state == SSH_STATE_CLOSED); + if (ssh->state == SSH_STATE_CLOSED) return; - } if (c && !c->closes) { /* @@ -3722,10 +3720,8 @@ int sshfwd_write(struct ssh_channel *c, char *buf, int len) { Ssh ssh = c->ssh; - if (ssh->state != SSH_STATE_SESSION) { - assert(ssh->state == SSH_STATE_CLOSED); + if (ssh->state == SSH_STATE_CLOSED) return 0; - } if (ssh->version == 1) { send_packet(ssh, SSH1_MSG_CHANNEL_DATA, @@ -3751,10 +3747,8 @@ void sshfwd_unthrottle(struct ssh_channel *c, int bufsize) { Ssh ssh = c->ssh; - if (ssh->state != SSH_STATE_SESSION) { - assert(ssh->state == SSH_STATE_CLOSED); + if (ssh->state == SSH_STATE_CLOSED) return; - } if (ssh->version == 1) { if (c->v.v1.throttling && bufsize < SSH1_BUFFER_LIMIT) { -- 2.11.0