nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

Use a single sftp_senddata() to send each SFTP packet, rather than

Browse Source 
using one for the length field and one for the rest of the packet
contents. Since sftp_senddata() has no queuing or deferral mechanism
but instead constructs and sends an SSH2_MSG_CHANNEL_DATA message
immediately, this change has the effect of ceasing to split every SFTP
packet across two SSH messages.

[originally from svn r9603]
This commit is contained in:
Simon Tatham 2012-08-12 20:17:13 +00:00
parent b599e77ada
commit 1ac65ff017
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sftp.c
View File

@ -45,6 +45,13 @@ static void sftp_pkt_addbyte(struct sftp_packet *pkt, unsigned char byte)
{ {
sftp_pkt_adddata(pkt, &byte, 1); sftp_pkt_adddata(pkt, &byte, 1);
} }
static void sftp_pkt_adduint32(struct sftp_packet *pkt,
unsigned long value)
{
unsigned char x[4];
PUT_32BIT(x, value);
sftp_pkt_adddata(pkt, x, 4);
}
static struct sftp_packet *sftp_pkt_init(int pkt_type) static struct sftp_packet *sftp_pkt_init(int pkt_type)
{ {
struct sftp_packet *pkt; struct sftp_packet *pkt;
@ -53,6 +60,7 @@ static struct sftp_packet *sftp_pkt_init(int pkt_type)
pkt->savedpos = -1; pkt->savedpos = -1;
pkt->length = 0; pkt->length = 0;
pkt->maxlen = 0; pkt->maxlen = 0;
sftp_pkt_adduint32(pkt, 0); /* length field will be filled in later */
sftp_pkt_addbyte(pkt, (unsigned char) pkt_type); sftp_pkt_addbyte(pkt, (unsigned char) pkt_type);
return pkt; return pkt;
} }
@ -62,13 +70,6 @@ static void sftp_pkt_addbool(struct sftp_packet *pkt, unsigned char value)
sftp_pkt_adddata(pkt, &value, 1); sftp_pkt_adddata(pkt, &value, 1);
} }
*/ */
static void sftp_pkt_adduint32(struct sftp_packet *pkt,
unsigned long value)
{
unsigned char x[4];
PUT_32BIT(x, value);
sftp_pkt_adddata(pkt, x, 4);
}
static void sftp_pkt_adduint64(struct sftp_packet *pkt, uint64 value) static void sftp_pkt_adduint64(struct sftp_packet *pkt, uint64 value)
{ {
unsigned char x[8]; unsigned char x[8];
@ -215,9 +216,8 @@ static void sftp_pkt_free(struct sftp_packet *pkt)
int sftp_send(struct sftp_packet *pkt) int sftp_send(struct sftp_packet *pkt)
{ {
int ret; int ret;
char x[4]; PUT_32BIT(pkt->data, pkt->length - 4);
PUT_32BIT(x, pkt->length); ret = sftp_senddata(pkt->data, pkt->length);
ret = (sftp_senddata(x, 4) && sftp_senddata(pkt->data, pkt->length));
sftp_pkt_free(pkt); sftp_pkt_free(pkt);
return ret; return ret;
} }