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

Improve sftp_read().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@601 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-24 09:05:52 +00:00
parent 10ddf310a6
commit 8ba57619fd
1 changed files with 171 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

172
libssh/sftp.c
View File

@@ -1352,66 +1352,92 @@ int sftp_closedir(SFTP_DIR *dir){
/* Open a file on the server. */ /* Open a file on the server. */
SFTP_FILE *sftp_open(SFTP_SESSION *sftp, const char *file, int flags, mode_t mode){ SFTP_FILE *sftp_open(SFTP_SESSION *sftp, const char *file, int flags, mode_t mode){
SFTP_FILE *handle; SFTP_MESSAGE *msg = NULL;
SFTP_MESSAGE *msg=NULL;
STATUS_MESSAGE *status; STATUS_MESSAGE *status;
SFTP_ATTRIBUTES attr; SFTP_ATTRIBUTES attr;
u32 sftp_flags = 0; SFTP_FILE *handle;
u32 id=sftp_get_new_id(sftp);
BUFFER *buffer=buffer_new();
STRING *filename; STRING *filename;
BUFFER *buffer;
u32 sftp_flags = 0;
u32 id;
buffer = buffer_new();
if (buffer == NULL) {
return NULL;
}
filename = string_from_char(file);
if (filename == NULL) {
buffer_free(buffer);
return NULL;
}
ZERO_STRUCT(attr); ZERO_STRUCT(attr);
attr.permissions = mode; attr.permissions = mode;
attr.flags = SSH_FILEXFER_ATTR_PERMISSIONS; attr.flags = SSH_FILEXFER_ATTR_PERMISSIONS;
if(flags == O_RDONLY) if (flags == O_RDONLY)
sftp_flags|=SSH_FXF_READ; // if any of the other flag is set, READ should not be set initialy sftp_flags |= SSH_FXF_READ; /* if any of the other flag is set,
if(flags & O_WRONLY) READ should not be set initialy */
if (flags & O_WRONLY)
sftp_flags |= SSH_FXF_WRITE; sftp_flags |= SSH_FXF_WRITE;
if(flags & O_RDWR) if (flags & O_RDWR)
sftp_flags|=(SSH_FXF_WRITE | SSH_FXF_READ); sftp_flags |= (SSH_FXF_WRITE | SSH_FXF_READ);
if(flags & O_CREAT) if (flags & O_CREAT)
sftp_flags |=SSH_FXF_CREAT; sftp_flags |= SSH_FXF_CREAT;
if(flags & O_TRUNC) if (flags & O_TRUNC)
sftp_flags |=SSH_FXF_TRUNC; sftp_flags |= SSH_FXF_TRUNC;
if(flags & O_EXCL) if (flags & O_EXCL)
sftp_flags |= SSH_FXF_EXCL; sftp_flags |= SSH_FXF_EXCL;
buffer_add_u32(buffer,id);
filename=string_from_char(file); id = sftp_get_new_id(sftp);
buffer_add_ssh_string(buffer,filename); if (buffer_add_u32(buffer, id) < 0 ||
free(filename); buffer_add_ssh_string(buffer, filename) < 0) {
buffer_add_u32(buffer,htonl(sftp_flags)); buffer_free(buffer);
if (buffer_add_attributes(buffer, &attr) < 0) { string_free(filename);
return NULL;
}
string_free(filename);
if (buffer_add_u32(buffer, htonl(sftp_flags)) < 0 ||
buffer_add_attributes(buffer, &attr) < 0 ||
sftp_packet_write(sftp, SSH_FXP_OPEN, buffer) < 0) {
buffer_free(buffer); buffer_free(buffer);
return NULL; return NULL;
} }
sftp_packet_write(sftp,SSH_FXP_OPEN,buffer);
buffer_free(buffer); buffer_free(buffer);
while(!msg){
if(sftp_read_and_dispatch(sftp)) while (msg == NULL) {
if (sftp_read_and_dispatch(sftp) < 0) {
/* something nasty has happened */ /* something nasty has happened */
return NULL; return NULL;
msg=sftp_dequeue(sftp,id);
} }
switch (msg->packet_type){ msg = sftp_dequeue(sftp, id);
}
switch (msg->packet_type) {
case SSH_FXP_STATUS: case SSH_FXP_STATUS:
status=parse_status_msg(msg); status = parse_status_msg(msg);
sftp_message_free(msg); sftp_message_free(msg);
if(!status) if (status == NULL) {
return NULL; return NULL;
}
sftp_set_error(sftp, status->status); sftp_set_error(sftp, status->status);
ssh_set_error(sftp->session,SSH_REQUEST_DENIED,"sftp server : %s",status->errormsg); ssh_set_error(sftp->session, SSH_REQUEST_DENIED,
"SFTP server: %s", status->errormsg);
status_msg_free(status); status_msg_free(status);
return NULL; return NULL;
case SSH_FXP_HANDLE: case SSH_FXP_HANDLE:
handle=parse_handle_msg(msg); handle = parse_handle_msg(msg);
sftp_message_free(msg); sftp_message_free(msg);
return handle; return handle;
default: default:
ssh_set_error(sftp->session,SSH_FATAL,"Received message %d during open!",msg->packet_type); ssh_set_error(sftp->session, SSH_FATAL,
"Received message %d during open!", msg->packet_type);
sftp_message_free(msg); sftp_message_free(msg);
} }
return NULL; return NULL;
} }
@@ -1423,78 +1449,96 @@ void sftp_file_set_blocking(SFTP_FILE *handle){
} }
/* Read from a file using an opened sftp file handle. */ /* Read from a file using an opened sftp file handle. */
ssize_t sftp_read(SFTP_FILE *handle, void *buf, size_t count){ ssize_t sftp_read(SFTP_FILE *handle, void *buf, size_t count) {
SFTP_MESSAGE *msg=NULL; SFTP_SESSION *sftp = handle->sftp;
SFTP_MESSAGE *msg = NULL;
STATUS_MESSAGE *status; STATUS_MESSAGE *status;
SFTP_SESSION *sftp=handle->sftp;
STRING *datastring; STRING *datastring;
int id;
int err=0;
BUFFER *buffer; BUFFER *buffer;
if(handle->eof) int id;
if (handle->eof) {
return 0; return 0;
buffer=buffer_new(); }
id=sftp_get_new_id(handle->sftp);
buffer_add_u32(buffer,id); buffer = buffer_new();
buffer_add_ssh_string(buffer,handle->handle); if (buffer == NULL) {
buffer_add_u64(buffer,htonll(handle->offset)); return -1;
buffer_add_u32(buffer,htonl(count)); }
sftp_packet_write(handle->sftp,SSH_FXP_READ,buffer); id = sftp_get_new_id(handle->sftp);
if (buffer_add_u32(buffer, id) < 0 ||
buffer_add_ssh_string(buffer, handle->handle) < 0 ||
buffer_add_u64(buffer, htonll(handle->offset)) < 0 ||
buffer_add_u32(buffer,htonl(count)) < 0 ||
sftp_packet_write(handle->sftp, SSH_FXP_READ, buffer) < 0) {
buffer_free(buffer); buffer_free(buffer);
while(!msg){ return -1;
if (handle->nonblocking){ }
if(channel_poll(handle->sftp->channel,0)==0){ buffer_free(buffer);
while (msg == NULL) {
if (handle->nonblocking) {
if (channel_poll(handle->sftp->channel, 0) == 0) {
/* we cannot block */ /* we cannot block */
return 0; return 0;
} }
} }
if(sftp_read_and_dispatch(handle->sftp)) if (sftp_read_and_dispatch(handle->sftp) < 0) {
/* something nasty has happened */ /* something nasty has happened */
return -1; return -1;
msg=sftp_dequeue(handle->sftp,id);
} }
switch (msg->packet_type){ msg = sftp_dequeue(handle->sftp, id);
}
switch (msg->packet_type) {
case SSH_FXP_STATUS: case SSH_FXP_STATUS:
status=parse_status_msg(msg); status = parse_status_msg(msg);
sftp_message_free(msg); sftp_message_free(msg);
if(!status) if (status == NULL) {
return -1; return -1;
}
sftp_set_error(sftp, status->status); sftp_set_error(sftp, status->status);
switch (status->status) { switch (status->status) {
case SSH_FX_EOF: case SSH_FX_EOF:
handle->eof=1; handle->eof = 1;
status_msg_free(status); status_msg_free(status);
return err ? err : 0; return 0;
default: default:
break; break;
} }
ssh_set_error(sftp->session,SSH_REQUEST_DENIED,"sftp server : %s",status->errormsg); ssh_set_error(sftp->session,SSH_REQUEST_DENIED,
"SFTP server: %s", status->errormsg);
status_msg_free(status); status_msg_free(status);
return -1; return -1;
case SSH_FXP_DATA: case SSH_FXP_DATA:
datastring=buffer_get_ssh_string(msg->payload); datastring = buffer_get_ssh_string(msg->payload);
sftp_message_free(msg); sftp_message_free(msg);
if(!datastring){ if (datastring == NULL) {
ssh_set_error(sftp->session,SSH_FATAL,"Received invalid DATA packet from sftp server"); ssh_set_error(sftp->session, SSH_FATAL,
"Received invalid DATA packet from sftp server");
return -1; return -1;
} }
if(string_len(datastring) > count){
if (string_len(datastring) > count) {
ssh_set_error(sftp->session, SSH_FATAL, ssh_set_error(sftp->session, SSH_FATAL,
"Received a too big DATA packet from sftp server: %zu and asked for %zu", "Received a too big DATA packet from sftp server: "
"%zu and asked for %zu",
string_len(datastring), count); string_len(datastring), count);
free(datastring); string_free(datastring);
return -1; return -1;
} }
count = string_len(datastring); count = string_len(datastring);
handle->offset+= count; handle->offset += count;
memcpy(buf, datastring->string, count); memcpy(buf, datastring->string, count);
free(datastring); string_free(datastring);
return count; return count;
default: default:
ssh_set_error(sftp->session,SSH_FATAL,"Received message %d during read!",msg->packet_type); ssh_set_error(sftp->session, SSH_FATAL,
"Received message %d during read!", msg->packet_type);
sftp_message_free(msg); sftp_message_free(msg);
return -1; return -1;
} }
return -1; /* not reached */ return -1; /* not reached */
} }