shinys000114/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2026-02-09 18:04:25 +09:00
Code Issues Packages Projects Releases Wiki Activity

sftp: Reformat sftp_packet_write()

Browse Source 
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Reviewed-by: Jakub Jelen <jjelen@redhat.com>
This commit is contained in:
Andreas Schneider
2018-10-07 14:08:17 +02:00
parent 43a40999da
commit 508dfc5251
1 changed files with 23 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/sftp.c
View File

@@ -318,32 +318,33 @@ void sftp_free(sftp_session sftp)
SAFE_FREE(sftp); SAFE_FREE(sftp);
} }
int sftp_packet_write(sftp_session sftp, uint8_t type, ssh_buffer payload){ int sftp_packet_write(sftp_session sftp, uint8_t type, ssh_buffer payload)
int size; {
int size;
if (ssh_buffer_prepend_data(payload, &type, sizeof(uint8_t)) < 0) { if (ssh_buffer_prepend_data(payload, &type, sizeof(uint8_t)) < 0) {
ssh_set_error_oom(sftp->session); ssh_set_error_oom(sftp->session);
return -1; return -1;
} }
size = htonl(ssh_buffer_get_len(payload)); size = htonl(ssh_buffer_get_len(payload));
if (ssh_buffer_prepend_data(payload, &size, sizeof(uint32_t)) < 0) { if (ssh_buffer_prepend_data(payload, &size, sizeof(uint32_t)) < 0) {
ssh_set_error_oom(sftp->session); ssh_set_error_oom(sftp->session);
return -1; return -1;
} }
size = ssh_channel_write(sftp->channel, ssh_buffer_get(payload), size = ssh_channel_write(sftp->channel, ssh_buffer_get(payload),
ssh_buffer_get_len(payload)); ssh_buffer_get_len(payload));
if (size < 0) { if (size < 0) {
return -1; return -1;
} else if((uint32_t) size != ssh_buffer_get_len(payload)) { } else if((uint32_t) size != ssh_buffer_get_len(payload)) {
SSH_LOG(SSH_LOG_PACKET, SSH_LOG(SSH_LOG_PACKET,
"Had to write %d bytes, wrote only %d", "Had to write %d bytes, wrote only %d",
ssh_buffer_get_len(payload), ssh_buffer_get_len(payload),
size); size);
} }
return size; return size;
} }
sftp_packet sftp_packet_read(sftp_session sftp) sftp_packet sftp_packet_read(sftp_session sftp)