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

Simplifiy handling of stdin data in SSH-2.

Browse Source 
Specifically, don't try to unblock all channels just because we've got
something to send on the main one.  It looks like the code to do that
was left over from when SSH_MSG_CHANNEL_ADJUST was handled in
do_ssh2_authconn().
This commit is contained in:
Ben Harris 2016-04-23 13:10:11 +01:00
parent 5347f9e69c
commit 6da1a325cc
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ssh.c
View File

@ -9188,7 +9188,6 @@ static void do_ssh2_authconn(Ssh ssh, const unsigned char *in, int inlen,
int pklen, alglen, commentlen;
int siglen, retlen, len;
char *q, *agentreq, *ret;
int try_send;
struct Packet *pktout;
Filename *keyfile;
#ifndef NO_GSSAPI
@ -10841,7 +10840,6 @@ static void do_ssh2_authconn(Ssh ssh, const unsigned char *in, int inlen,
ssh->send_ok = 1;
while (1) {
crReturnV;
s->try_send = FALSE;
if (pktin) {
/*
@ -10857,17 +10855,7 @@ static void do_ssh2_authconn(Ssh ssh, const unsigned char *in, int inlen,
* We have spare data. Add it to the channel buffer.
*/
ssh2_add_channel_data(ssh->mainchan, (char *)in, inlen);
s->try_send = TRUE;
}
if (s->try_send) {
int i;
struct ssh_channel *c;
/*
* Try to send data on all channels if we can.
*/
for (i = 0; NULL != (c = index234(ssh->channels, i)); i++)
if (c->type != CHAN_SHARING)
ssh2_try_send_and_unthrottle(ssh, c);
ssh2_try_send(ssh->mainchan);
}
}