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

Window resizing wasn't working in SSH2

Browse Source 
[originally from svn r753]
This commit is contained in:
Simon Tatham 2000-10-24 09:49:03 +00:00
parent e51b4da9f7
commit 039103ff5d
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
ssh.c
View File

@ -2304,6 +2304,7 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
ssh2_pkt_addstring_start(); ssh2_pkt_addstring_start();
ssh2_pkt_addstring_data("\0", 1);/* TTY_OP_END, no special options */ ssh2_pkt_addstring_data("\0", 1);/* TTY_OP_END, no special options */
ssh2_pkt_send(); ssh2_pkt_send();
ssh_state = SSH_STATE_INTERMED;
do { do {
crWaitUntilV(ispkt); crWaitUntilV(ispkt);
@ -2360,6 +2361,10 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
logevent("Started a shell/command"); logevent("Started a shell/command");
} }
ssh_state = SSH_STATE_SESSION;
if (size_needed)
ssh_size();
/* /*
* Transfer data! * Transfer data!
*/ */
@ -2515,7 +2520,7 @@ static void ssh_send (char *buf, int len) {
} }
/* /*
* Called to set the size of the window from Telnet's POV. * Called to set the size of the window from SSH's POV.
*/ */
static void ssh_size(void) { static void ssh_size(void) {
switch (ssh_state) { switch (ssh_state) {
@ -2527,9 +2532,21 @@ static void ssh_size(void) {
break; break;
case SSH_STATE_SESSION: case SSH_STATE_SESSION:
if (!cfg.nopty) { if (!cfg.nopty) {
send_packet(SSH1_CMSG_WINDOW_SIZE, if (ssh_version == 1) {
PKT_INT, rows, PKT_INT, cols, send_packet(SSH1_CMSG_WINDOW_SIZE,
PKT_INT, 0, PKT_INT, 0, PKT_END); PKT_INT, rows, PKT_INT, cols,
PKT_INT, 0, PKT_INT, 0, PKT_END);
} else {
ssh2_pkt_init(SSH2_MSG_CHANNEL_REQUEST);
ssh2_pkt_adduint32(mainchan->remoteid);
ssh2_pkt_addstring("window-change");
ssh2_pkt_addbool(0);
ssh2_pkt_adduint32(cols);
ssh2_pkt_adduint32(rows);
ssh2_pkt_adduint32(0);
ssh2_pkt_adduint32(0);
ssh2_pkt_send();
}
} }
} }
} }