nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-25 09:12:24 +00:00
Code Issues Projects Releases Wiki Activity

Over-enthusiastic assertions in the port forwarding code removed.

Browse Source 
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_*.

[originally from svn r5446]
This commit is contained in:
Simon Tatham 2005-03-05 18:14:57 +00:00
parent f76c35b4b7
commit 0fbab7b041
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ssh.c
View File

@ -3682,10 +3682,8 @@ void sshfwd_close(struct ssh_channel *c)
{ {
Ssh ssh = c->ssh; Ssh ssh = c->ssh;
if (ssh->state != SSH_STATE_SESSION) { if (ssh->state == SSH_STATE_CLOSED)
assert(ssh->state == SSH_STATE_CLOSED);
return; return;
}
if (c && !c->closes) { if (c && !c->closes) {
/* /*
@ -3722,10 +3720,8 @@ int sshfwd_write(struct ssh_channel *c, char *buf, int len)
{ {
Ssh ssh = c->ssh; Ssh ssh = c->ssh;
if (ssh->state != SSH_STATE_SESSION) { if (ssh->state == SSH_STATE_CLOSED)
assert(ssh->state == SSH_STATE_CLOSED);
return 0; return 0;
}
if (ssh->version == 1) { if (ssh->version == 1) {
send_packet(ssh, SSH1_MSG_CHANNEL_DATA, send_packet(ssh, SSH1_MSG_CHANNEL_DATA,
@ -3751,10 +3747,8 @@ void sshfwd_unthrottle(struct ssh_channel *c, int bufsize)
{ {
Ssh ssh = c->ssh; Ssh ssh = c->ssh;
if (ssh->state != SSH_STATE_SESSION) { if (ssh->state == SSH_STATE_CLOSED)
assert(ssh->state == SSH_STATE_CLOSED);
return; return;
}
if (ssh->version == 1) { if (ssh->version == 1) {
if (c->v.v1.throttling && bufsize < SSH1_BUFFER_LIMIT) { if (c->v.v1.throttling && bufsize < SSH1_BUFFER_LIMIT) {