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

When omitting session data from logs, don't omit the length of the session

Browse Source 
data string.  This isn't strictly necessary, but it makes the logs easier to
use.

[originally from svn r7666]
This commit is contained in:
Ben Harris 2007-08-04 15:48:52 +00:00
parent f48e3eb16b
commit 7cda30ac1a
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ssh.c
View File

@ -1222,9 +1222,9 @@ static struct Packet *ssh1_rdpkt(Ssh ssh, unsigned char **data, int *datalen)
/* "Session data" packets - omit the data field */ /* "Session data" packets - omit the data field */
if ((st->pktin->type == SSH1_SMSG_STDOUT_DATA) || if ((st->pktin->type == SSH1_SMSG_STDOUT_DATA) ||
(st->pktin->type == SSH1_SMSG_STDERR_DATA)) { (st->pktin->type == SSH1_SMSG_STDERR_DATA)) {
do_blank = TRUE; blank_prefix = 0;
} else if (st->pktin->type == SSH1_MSG_CHANNEL_DATA) {
do_blank = TRUE; blank_prefix = 4; do_blank = TRUE; blank_prefix = 4;
} else if (st->pktin->type == SSH1_MSG_CHANNEL_DATA) {
do_blank = TRUE; blank_prefix = 8;
} }
if (do_blank) { if (do_blank) {
blank.offset = blank_prefix; blank.offset = blank_prefix;
@ -1382,9 +1382,9 @@ static struct Packet *ssh2_rdpkt(Ssh ssh, unsigned char **data, int *datalen)
int do_blank = FALSE, blank_prefix = 0; int do_blank = FALSE, blank_prefix = 0;
/* "Session data" packets - omit the data field */ /* "Session data" packets - omit the data field */
if (st->pktin->type == SSH2_MSG_CHANNEL_DATA) { if (st->pktin->type == SSH2_MSG_CHANNEL_DATA) {
do_blank = TRUE; blank_prefix = 4;
} else if (st->pktin->type == SSH2_MSG_CHANNEL_EXTENDED_DATA) {
do_blank = TRUE; blank_prefix = 8; do_blank = TRUE; blank_prefix = 8;
} else if (st->pktin->type == SSH2_MSG_CHANNEL_EXTENDED_DATA) {
do_blank = TRUE; blank_prefix = 12;
} }
if (do_blank) { if (do_blank) {
blank.offset = blank_prefix; blank.offset = blank_prefix;
@ -2940,8 +2940,8 @@ static void ssh_agentf_callback(void *cv, void *reply, int replylen)
} else { } else {
send_packet(ssh, SSH1_MSG_CHANNEL_DATA, send_packet(ssh, SSH1_MSG_CHANNEL_DATA,
PKT_INT, c->remoteid, PKT_INT, c->remoteid,
PKTT_DATA,
PKT_INT, replylen, PKT_INT, replylen,
PKTT_DATA,
PKT_DATA, sentreply, replylen, PKT_DATA, sentreply, replylen,
PKTT_OTHER, PKTT_OTHER,
PKT_END); PKT_END);
@ -4001,8 +4001,7 @@ int sshfwd_write(struct ssh_channel *c, char *buf, int len)
if (ssh->version == 1) { if (ssh->version == 1) {
send_packet(ssh, SSH1_MSG_CHANNEL_DATA, send_packet(ssh, SSH1_MSG_CHANNEL_DATA,
PKT_INT, c->remoteid, PKT_INT, c->remoteid,
PKTT_DATA, PKT_INT, len, PKTT_DATA, PKT_DATA, buf, len,
PKT_INT, len, PKT_DATA, buf, len,
PKTT_OTHER, PKT_END); PKTT_OTHER, PKT_END);
/* /*
* In SSH-1 we can return 0 here - implying that forwarded * In SSH-1 we can return 0 here - implying that forwarded
@ -4973,8 +4972,8 @@ static void do_ssh1_connection(Ssh ssh, unsigned char *in, int inlen,
} else { } else {
while (inlen > 0) { while (inlen > 0) {
int len = min(inlen, 512); int len = min(inlen, 512);
send_packet(ssh, SSH1_CMSG_STDIN_DATA, PKTT_DATA, send_packet(ssh, SSH1_CMSG_STDIN_DATA,
PKT_INT, len, PKT_DATA, in, len, PKT_INT, len, PKTT_DATA, PKT_DATA, in, len,
PKTT_OTHER, PKT_END); PKTT_OTHER, PKT_END);
in += len; in += len;
inlen -= len; inlen -= len;
@ -6124,8 +6123,8 @@ static int ssh2_try_send(struct ssh_channel *c)
len = c->v.v2.remmaxpkt; len = c->v.v2.remmaxpkt;
pktout = ssh2_pkt_init(SSH2_MSG_CHANNEL_DATA); pktout = ssh2_pkt_init(SSH2_MSG_CHANNEL_DATA);
ssh2_pkt_adduint32(pktout, c->remoteid); ssh2_pkt_adduint32(pktout, c->remoteid);
dont_log_data(ssh, pktout, PKTLOG_OMIT);
ssh2_pkt_addstring_start(pktout); ssh2_pkt_addstring_start(pktout);
dont_log_data(ssh, pktout, PKTLOG_OMIT);
ssh2_pkt_addstring_data(pktout, data, len); ssh2_pkt_addstring_data(pktout, data, len);
end_log_omission(ssh, pktout); end_log_omission(ssh, pktout);
ssh2_pkt_send(ssh, pktout); ssh2_pkt_send(ssh, pktout);