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

Arrange that log_packet() isn't called for raw data logging if logctx is null.

Browse Source 
This allows us to send data in ssh_init(), albeit at the expense of its not
being properly logged, so arrange to send the version string then if that's
sensible, which should reduce the number of round-trips required to bring
up an SSH-2 connection.

[originally from svn r7646]
This commit is contained in:
Ben Harris 2007-07-21 13:43:57 +00:00
parent 22cde3ee5b
commit c1459927df
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
ssh.c
View File

@ -1453,7 +1453,8 @@ static int s_wrpkt_prepare(Ssh ssh, struct Packet *pkt, int *offset_p)
static int s_write(Ssh ssh, void *data, int len) static int s_write(Ssh ssh, void *data, int len)
{ {
log_packet(ssh->logctx, PKT_OUTGOING, -1, NULL, data, len, 0, NULL); if (ssh->logctx)
log_packet(ssh->logctx, PKT_OUTGOING, -1, NULL, data, len, 0, NULL);
return sk_write(ssh->s, (char *)data, len); return sk_write(ssh->s, (char *)data, len);
} }
@ -2432,20 +2433,6 @@ static int do_ssh_init(Ssh ssh, unsigned char c)
crBegin(ssh->do_ssh_init_crstate); crBegin(ssh->do_ssh_init_crstate);
/*
* If the SSH version number's fixed, set it now, and if it's SSH-2,
* send the version string too.
*
* XXX This isn't actually early enough to be useful, since we only
* get here when the first incoming byte turns up.
*/
if (ssh->cfg.sshprot == 0)
ssh->version = 1;
if (ssh->cfg.sshprot == 3) {
ssh->version = 2;
ssh_send_verstring(ssh, NULL);
}
/* Search for a line beginning with the string "SSH-" in the input. */ /* Search for a line beginning with the string "SSH-" in the input. */
for (;;) { for (;;) {
if (c != 'S') goto no; if (c != 'S') goto no;
@ -2606,7 +2593,9 @@ static void ssh_set_frozen(Ssh ssh, int frozen)
static void ssh_gotdata(Ssh ssh, unsigned char *data, int datalen) static void ssh_gotdata(Ssh ssh, unsigned char *data, int datalen)
{ {
/* Log raw data, if we're in that mode. */ /* Log raw data, if we're in that mode. */
log_packet(ssh->logctx, PKT_INCOMING, -1, NULL, data, datalen, 0, NULL); if (ssh->logctx)
log_packet(ssh->logctx, PKT_INCOMING, -1, NULL, data, datalen,
0, NULL);
crBegin(ssh->ssh_gotdata_crstate); crBegin(ssh->ssh_gotdata_crstate);
@ -2831,6 +2820,17 @@ static const char *connect_to_host(Ssh ssh, char *host, int port,
return err; return err;
} }
/*
* If the SSH version number's fixed, set it now, and if it's SSH-2,
* send the version string too.
*/
if (ssh->cfg.sshprot == 0)
ssh->version = 1;
if (ssh->cfg.sshprot == 3) {
ssh->version = 2;
ssh_send_verstring(ssh, NULL);
}
return NULL; return NULL;
} }