nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-05 21:42:47 -05:00
Code Issues Projects Releases Wiki Activity

Move SSH_MSG_DISCONNECT construction into the BPP.

Browse Source 
This is a convenient place for it because it abstracts away the
difference in disconnect packet formats between SSH-1 and -2, so when
I start restructuring, I'll be able to call it even from places that
don't know which version of SSH they're running.
This commit is contained in:
Simon Tatham
2018-09-24 18:14:33 +01:00
parent 6bb847738b
commit 3074440040
7 changed files with 41 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ssh.c
View File

@ -1429,19 +1429,8 @@ static void ssh_disconnect(Ssh ssh, const char *client_reason,
error = dupprintf("Disconnected: %s", client_reason);
else
error = dupstr("Disconnected");
if (wire_reason) {
if (ssh->version == 1) {
PktOut *pktout = ssh_bpp_new_pktout(ssh->bpp, SSH1_MSG_DISCONNECT);
put_stringz(pktout, wire_reason);
ssh_pkt_write(ssh, pktout);
} else if (ssh->version == 2) {
PktOut *pktout = ssh_bpp_new_pktout(ssh->bpp, SSH2_MSG_DISCONNECT);
put_uint32(pktout, code);
put_stringz(pktout, wire_reason);
put_stringz(pktout, "en"); /* language tag */
ssh_pkt_write(ssh, pktout);
}
}
if (wire_reason)
ssh_bpp_queue_disconnect(ssh->bpp, wire_reason, code);
ssh->close_expected = TRUE;
ssh->clean_exit = clean_exit;
ssh_closing(&ssh->plugvt, error, 0, 0);