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

Add SSH don't-allocate-pty option, and corresponding LF-implies-CR

Browse Source 
terminal setting

[originally from svn r16]
This commit is contained in:
Simon Tatham
1999-01-15 11:30:40 +00:00
parent 1e312c2658
commit e68a529cc9
7 changed files with 76 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
ssh.c
View File

@ -251,6 +251,7 @@ static int do_ssh_init(void) {
sprintf(vstring, "SSH-%s-7.7.7\n",
(strcmp(version, "1.5") <= 0 ? version : "1.5"));
s_write(vstring, strlen(vstring));
return 1;
}
static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
@ -433,30 +434,32 @@ static void ssh_protocol(unsigned char *in, int inlen, int ispkt) {
}
}
i = strlen(cfg.termtype);
s_wrpkt_start(10, i+5*4+1);
pktout.body[0] = (i >> 24) & 0xFF;
pktout.body[1] = (i >> 16) & 0xFF;
pktout.body[2] = (i >> 8) & 0xFF;
pktout.body[3] = i & 0xFF;
memcpy(pktout.body+4, cfg.termtype, i);
i += 4;
pktout.body[i++] = (rows >> 24) & 0xFF;
pktout.body[i++] = (rows >> 16) & 0xFF;
pktout.body[i++] = (rows >> 8) & 0xFF;
pktout.body[i++] = rows & 0xFF;
pktout.body[i++] = (cols >> 24) & 0xFF;
pktout.body[i++] = (cols >> 16) & 0xFF;
pktout.body[i++] = (cols >> 8) & 0xFF;
pktout.body[i++] = cols & 0xFF;
memset(pktout.body+i, 0, 9); /* 0 pixwidth, 0 pixheight, 0.b endofopt */
s_wrpkt();
ssh_state = SSH_STATE_INTERMED;
do { crReturnV; } while (!ispkt);
if (pktin.type != 14 && pktin.type != 15) {
fatalbox("Protocol confusion");
} else if (pktin.type == 15) {
c_write("Server refused to allocate pty\r\n", 32);
if (!cfg.nopty) {
i = strlen(cfg.termtype);
s_wrpkt_start(10, i+5*4+1);
pktout.body[0] = (i >> 24) & 0xFF;
pktout.body[1] = (i >> 16) & 0xFF;
pktout.body[2] = (i >> 8) & 0xFF;
pktout.body[3] = i & 0xFF;
memcpy(pktout.body+4, cfg.termtype, i);
i += 4;
pktout.body[i++] = (rows >> 24) & 0xFF;
pktout.body[i++] = (rows >> 16) & 0xFF;
pktout.body[i++] = (rows >> 8) & 0xFF;
pktout.body[i++] = rows & 0xFF;
pktout.body[i++] = (cols >> 24) & 0xFF;
pktout.body[i++] = (cols >> 16) & 0xFF;
pktout.body[i++] = (cols >> 8) & 0xFF;
pktout.body[i++] = cols & 0xFF;
memset(pktout.body+i, 0, 9); /* 0 pixwidth, 0 pixheight, 0.b endofopt */
s_wrpkt();
ssh_state = SSH_STATE_INTERMED;
do { crReturnV; } while (!ispkt);
if (pktin.type != 14 && pktin.type != 15) {
fatalbox("Protocol confusion");
} else if (pktin.type == 15) {
c_write("Server refused to allocate pty\r\n", 32);
}
}
s_wrpkt_start(12, 0);
@ -670,17 +673,19 @@ static void ssh_size(void) {
size_needed = TRUE; /* buffer for later */
break;
case SSH_STATE_SESSION:
s_wrpkt_start(11, 16);
pktout.body[0] = (rows >> 24) & 0xFF;
pktout.body[1] = (rows >> 16) & 0xFF;
pktout.body[2] = (rows >> 8) & 0xFF;
pktout.body[3] = rows & 0xFF;
pktout.body[4] = (cols >> 24) & 0xFF;
pktout.body[5] = (cols >> 16) & 0xFF;
pktout.body[6] = (cols >> 8) & 0xFF;
pktout.body[7] = cols & 0xFF;
memset(pktout.body+8, 0, 8);
s_wrpkt();
if (!cfg.nopty) {
s_wrpkt_start(11, 16);
pktout.body[0] = (rows >> 24) & 0xFF;
pktout.body[1] = (rows >> 16) & 0xFF;
pktout.body[2] = (rows >> 8) & 0xFF;
pktout.body[3] = rows & 0xFF;
pktout.body[4] = (cols >> 24) & 0xFF;
pktout.body[5] = (cols >> 16) & 0xFF;
pktout.body[6] = (cols >> 8) & 0xFF;
pktout.body[7] = cols & 0xFF;
memset(pktout.body+8, 0, 8);
s_wrpkt();
}
}
}