nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 06:38:37 -05:00
Code Issues Projects Releases Wiki Activity

Fix 'winadj-success': since at least one server (boks_sshd) blithely responds

Browse Source 
to "winadj@putty.projects.tartarus.org" with SSH_MSG_CHANNEL_SUCCESS despite
probably having no idea what it means, treat this just the same as
SSH_MSG_CHANNEL_FAILURE instead of killing the connection.
Tested only as far as making sure that winadj/FAILURE with a normal server
isn't _completely_ broken.

[originally from svn r9185]
[this svn revision also touched putty-wishlist]
This commit is contained in:
Jacob Nevins 2011-07-01 21:53:41 +00:00
parent d764872e9e
commit 3a649ed4ed
1 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
ssh.c
View File

@ -6627,25 +6627,44 @@ static struct ssh_channel *ssh2_channel_msg(Ssh ssh, struct Packet *pktin)
return c; return c;
} }
static int ssh2_handle_winadj_response(struct ssh_channel *c)
{
struct winadj *wa = c->v.v2.winadj_head;
if (!wa)
return FALSE;
c->v.v2.winadj_head = wa->next;
c->v.v2.remlocwin += wa->size;
sfree(wa);
/*
* winadj messages are only sent when the window is fully open, so
* if we get an ack of one, we know any pending unthrottle is
* complete.
*/
if (c->v.v2.throttle_state == UNTHROTTLING)
c->v.v2.throttle_state = UNTHROTTLED;
return TRUE;
}
static void ssh2_msg_channel_success(Ssh ssh, struct Packet *pktin) static void ssh2_msg_channel_success(Ssh ssh, struct Packet *pktin)
{ {
/* /*
* This should never get called. All channel requests are either * This should never get called. All channel requests are either
* sent with want_reply false or are sent before this handler gets * sent with want_reply false, are sent before this handler gets
* installed. * installed, or are "winadj@putty" requests, which servers should
* never respond to with success.
*
* However, at least one server ("boks_sshd") is known to return
* SUCCESS for channel requests it's never heard of, such as
* "winadj@putty". Raised with foxt.com as bug 090916-090424, but
* for the sake of a quiet life, we handle it just the same as the
* expected FAILURE.
*/ */
struct ssh_channel *c; struct ssh_channel *c;
struct winadj *wa;
c = ssh2_channel_msg(ssh, pktin); c = ssh2_channel_msg(ssh, pktin);
if (!c) if (!c)
return; return;
wa = c->v.v2.winadj_head; if (!ssh2_handle_winadj_response(c))
if (wa)
ssh_disconnect(ssh, NULL, "Received SSH_MSG_CHANNEL_SUCCESS for "
"\"winadj@putty.projects.tartarus.org\"",
SSH2_DISCONNECT_PROTOCOL_ERROR, FALSE);
else
ssh_disconnect(ssh, NULL, ssh_disconnect(ssh, NULL,
"Received unsolicited SSH_MSG_CHANNEL_SUCCESS", "Received unsolicited SSH_MSG_CHANNEL_SUCCESS",
SSH2_DISCONNECT_PROTOCOL_ERROR, FALSE); SSH2_DISCONNECT_PROTOCOL_ERROR, FALSE);
@ -6660,28 +6679,14 @@ static void ssh2_msg_channel_failure(Ssh ssh, struct Packet *pktin)
* installed. * installed.
*/ */
struct ssh_channel *c; struct ssh_channel *c;
struct winadj *wa;
c = ssh2_channel_msg(ssh, pktin); c = ssh2_channel_msg(ssh, pktin);
if (!c) if (!c)
return; return;
wa = c->v.v2.winadj_head; if (!ssh2_handle_winadj_response(c))
if (!wa) {
ssh_disconnect(ssh, NULL, ssh_disconnect(ssh, NULL,
"Received unsolicited SSH_MSG_CHANNEL_FAILURE", "Received unsolicited SSH_MSG_CHANNEL_FAILURE",
SSH2_DISCONNECT_PROTOCOL_ERROR, FALSE); SSH2_DISCONNECT_PROTOCOL_ERROR, FALSE);
return;
}
c->v.v2.winadj_head = wa->next;
c->v.v2.remlocwin += wa->size;
sfree(wa);
/*
* winadj messages are only sent when the window is fully open, so
* if we get an ack of one, we know any pending unthrottle is
* complete.
*/
if (c->v.v2.throttle_state == UNTHROTTLING)
c->v.v2.throttle_state = UNTHROTTLED;
} }
static void ssh2_msg_channel_window_adjust(Ssh ssh, struct Packet *pktin) static void ssh2_msg_channel_window_adjust(Ssh ssh, struct Packet *pktin)