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

ssh_do_close() was only closing about half the channels. Fixed.

Browse Source 
[originally from svn r5324]
This commit is contained in:
Jacob Nevins 2005-02-17 01:47:01 +00:00
parent abb7b4ea57
commit 077ce4012f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssh.c
View File

@ -2377,7 +2377,7 @@ static void ssh_gotdata(Ssh ssh, unsigned char *data, int datalen)
static int ssh_do_close(Ssh ssh, int notify_exit) static int ssh_do_close(Ssh ssh, int notify_exit)
{ {
int i, ret = 0; int ret = 0;
struct ssh_channel *c; struct ssh_channel *c;
ssh->state = SSH_STATE_CLOSED; ssh->state = SSH_STATE_CLOSED;
@ -2390,11 +2390,11 @@ static int ssh_do_close(Ssh ssh, int notify_exit)
ret = 1; ret = 1;
} }
/* /*
* Now we must shut down any port and X forwardings going * Now we must shut down any port- and X-forwarded channels going
* through this connection. * through this connection.
*/ */
if (ssh->channels) { if (ssh->channels) {
for (i = 0; NULL != (c = index234(ssh->channels, i)); i++) { while (NULL != (c = index234(ssh->channels, 0))) {
switch (c->type) { switch (c->type) {
case CHAN_X11: case CHAN_X11:
x11_close(c->u.x11.s); x11_close(c->u.x11.s);
@ -2403,7 +2403,7 @@ static int ssh_do_close(Ssh ssh, int notify_exit)
pfd_close(c->u.pfd.s); pfd_close(c->u.pfd.s);
break; break;
} }
del234(ssh->channels, c); del234(ssh->channels, c); /* moving next one to index 0 */
if (ssh->version == 2) if (ssh->version == 2)
bufchain_clear(&c->v.v2.outbuffer); bufchain_clear(&c->v.v2.outbuffer);
sfree(c); sfree(c);