lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-11-30 13:01:23 +03:00
Code Activity

sftp: Move the packet payload to the message

Browse Source 
This reduces memory allocations and copying.

Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
This commit is contained in:
Andreas Schneider
2018-09-08 09:36:14 +02:00
parent 57153f6481
commit 0762057eb9
1 changed files with 7 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/sftp.c
View File

@@ -451,26 +451,6 @@ int sftp_get_error(sftp_session sftp) {
return sftp->errnum; return sftp->errnum;
} }
static sftp_message sftp_message_new(sftp_session sftp){
sftp_message msg = NULL;
msg = calloc(1, sizeof(struct sftp_message_struct));
if (msg == NULL) {
ssh_set_error_oom(sftp->session);
return NULL;
}
msg->payload = ssh_buffer_new();
if (msg->payload == NULL) {
ssh_set_error_oom(sftp->session);
SAFE_FREE(msg);
return NULL;
}
msg->sftp = sftp;
return msg;
}
static void sftp_message_free(sftp_message msg) static void sftp_message_free(sftp_message msg)
{ {
if (msg == NULL) { if (msg == NULL) {
@@ -503,15 +483,20 @@ static sftp_message sftp_get_message(sftp_packet packet)
return NULL; return NULL;
} }
msg = sftp_message_new(sftp); msg = calloc(1, sizeof(struct sftp_message_struct));
if (msg == NULL) { if (msg == NULL) {
ssh_set_error_oom(sftp->session);
return NULL; return NULL;
} }
msg->sftp = packet->sftp; msg->sftp = packet->sftp;
msg->packet_type = packet->type; msg->packet_type = packet->type;
rc = ssh_buffer_unpack(packet->payload, "d", &msg->id); /* Move the payload from the packet to the message */
msg->payload = packet->payload;
packet->payload = NULL;
rc = ssh_buffer_unpack(msg->payload, "d", &msg->id);
if (rc != SSH_OK) { if (rc != SSH_OK) {
ssh_set_error(packet->sftp->session, SSH_FATAL, ssh_set_error(packet->sftp->session, SSH_FATAL,
"Invalid packet %d: no ID", packet->type); "Invalid packet %d: no ID", packet->type);
@@ -524,13 +509,6 @@ static sftp_message sftp_get_message(sftp_packet packet)
msg->id, msg->id,
msg->packet_type); msg->packet_type);
if (ssh_buffer_add_data(msg->payload, ssh_buffer_get(packet->payload),
ssh_buffer_get_len(packet->payload)) < 0) {
ssh_set_error_oom(sftp->session);
sftp_message_free(msg);
return NULL;
}
return msg; return msg;
} }