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

Introduce a sane interface function, from_backend(), for backends to

Browse Source 
use when they have data from the network. Replaces the utterly daft
inbuf / inbuf_head / term_out() interface, which only made sense
when feeding to terminal.c. (terminal.c now implements
from_backend() as a small function that gateways to the old
interface.)

As a side effect, from_backend() also has an `is_stderr' parameter,
so scp can once again separate the server's pronouncements on stderr
from the actual protocol progress on stdout.

[originally from svn r729]
This commit is contained in:
Simon Tatham
2000-10-20 13:51:46 +00:00
parent 31374678c0
commit e32603347c
9 changed files with 51 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ssh.c
View File

@ -322,13 +322,7 @@ static void c_write (char *buf, int len) {
fputc(buf[i], stderr);
return;
}
while (len--)
c_write1(*buf++);
}
static void c_writedata (char *buf, int len) {
while (len--)
c_write1(*buf++);
from_backend(1, buf, len);
}
/*
@ -1674,7 +1668,8 @@ static void ssh1_protocol(unsigned char *in, int inlen, int ispkt) {
if (pktin.type == SSH1_SMSG_STDOUT_DATA ||
pktin.type == SSH1_SMSG_STDERR_DATA) {
long len = GET_32BIT(pktin.body);
c_writedata(pktin.body+4, len);
from_backend(pktin.type == SSH1_SMSG_STDERR_DATA,
pktin.body+4, len);
} else if (pktin.type == SSH1_MSG_DISCONNECT) {
ssh_state = SSH_STATE_CLOSED;
logevent("Received disconnect request");
@ -2414,7 +2409,8 @@ static void do_ssh2_authconn(unsigned char *in, int inlen, int ispkt)
continue; /* extended but not stderr */
ssh2_pkt_getstring(&data, &length);
if (data) {
c_writedata(data, length);
from_backend(pktin.type == SSH2_MSG_CHANNEL_EXTENDED_DATA,
data, length);
/*
* Enlarge the window again at the remote side,
* just in case it ever runs down and they fail