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

Convert sftp.c to ssh_channel_read

Browse Source
This commit is contained in:
Aris Adamantiadis
2010-10-01 21:41:56 +02:00
parent 9f7e2c3252
commit c4e67730a3
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/sftp.c
View File

@@ -288,8 +288,10 @@ int sftp_packet_write(sftp_session sftp, uint8_t type, ssh_buffer payload){
} }
sftp_packet sftp_packet_read(sftp_session sftp) { sftp_packet sftp_packet_read(sftp_session sftp) {
unsigned char buffer[4096];
sftp_packet packet = NULL; sftp_packet packet = NULL;
uint32_t size; uint32_t size;
int r;
sftp_enter_function(); sftp_enter_function();
@@ -306,13 +308,14 @@ sftp_packet sftp_packet_read(sftp_session sftp) {
return NULL; return NULL;
} }
if (channel_read_buffer(sftp->channel, packet->payload, 4, 0) <= 0) { r=ssh_channel_read(sftp->channel, buffer, 4, 0);
if (r < 0) {
ssh_buffer_free(packet->payload); ssh_buffer_free(packet->payload);
SAFE_FREE(packet); SAFE_FREE(packet);
sftp_leave_function(); sftp_leave_function();
return NULL; return NULL;
} }
buffer_add_data(packet->payload,buffer, r);
if (buffer_get_u32(packet->payload, &size) != sizeof(uint32_t)) { if (buffer_get_u32(packet->payload, &size) != sizeof(uint32_t)) {
ssh_set_error(sftp->session, SSH_FATAL, "Short sftp packet!"); ssh_set_error(sftp->session, SSH_FATAL, "Short sftp packet!");
ssh_buffer_free(packet->payload); ssh_buffer_free(packet->payload);
@@ -322,23 +325,36 @@ sftp_packet sftp_packet_read(sftp_session sftp) {
} }
size = ntohl(size); size = ntohl(size);
if (channel_read_buffer(sftp->channel, packet->payload, 1, 0) <= 0) { r=ssh_channel_read(sftp->channel, buffer, 1, 0);
if (r <= 0) {
/* TODO: check if there are cases where an error needs to be set here */ /* TODO: check if there are cases where an error needs to be set here */
ssh_buffer_free(packet->payload); ssh_buffer_free(packet->payload);
SAFE_FREE(packet); SAFE_FREE(packet);
sftp_leave_function(); sftp_leave_function();
return NULL; return NULL;
} }
buffer_add_data(packet->payload, buffer, r);
buffer_get_u8(packet->payload, &packet->type); buffer_get_u8(packet->payload, &packet->type);
if (size > 1) { size=size-1;
if (channel_read_buffer(sftp->channel, packet->payload, size - 1, 0) <= 0) { while (size>0){
r=ssh_channel_read(sftp->channel,buffer,
sizeof(buffer)>size ? size:sizeof(buffer),0);
if(r <= 0) {
/* TODO: check if there are cases where an error needs to be set here */ /* TODO: check if there are cases where an error needs to be set here */
ssh_buffer_free(packet->payload); ssh_buffer_free(packet->payload);
SAFE_FREE(packet); SAFE_FREE(packet);
sftp_leave_function(); sftp_leave_function();
return NULL; return NULL;
} }
if(buffer_add_data(packet->payload,buffer,r)==SSH_ERROR){
ssh_buffer_free(packet->payload);
SAFE_FREE(packet);
sftp_leave_function();
ssh_set_error_oom(sftp->session);
return NULL;
}
size -= r;
} }
sftp_leave_function(); sftp_leave_function();