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

Improve the sftp async read functions.

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@602 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-24 09:33:47 +00:00
parent 8ba57619fd
commit ac724eb3fb
2 changed files with 117 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
include/libssh/sftp.h
View File

@@ -377,7 +377,8 @@ ssize_t sftp_read(SFTP_FILE *file, void *buf, size_t count);
* *
* @param len Size to read in bytes. * @param len Size to read in bytes.
* *
* @return A u32 identifier corresponding to the sent request. * @return An identifier corresponding to the sent request, < 0 on
* error.
* *
* @warning When calling this function, the internal offset is * @warning When calling this function, the internal offset is
* updated corresponding to the len parameter. * updated corresponding to the len parameter.
@@ -391,7 +392,7 @@ ssize_t sftp_read(SFTP_FILE *file, void *buf, size_t count);
* @see sftp_async_read() * @see sftp_async_read()
* @see sftp_open() * @see sftp_open()
*/ */
u32 sftp_async_read_begin(SFTP_FILE *file, u32 len); int sftp_async_read_begin(SFTP_FILE *file, u32 len);
/** /**
* @brief Wait for an asynchronous read to complete and save the data. * @brief Wait for an asynchronous read to complete and save the data.
@@ -408,9 +409,8 @@ u32 sftp_async_read_begin(SFTP_FILE *file, u32 len);
* function. * function.
* *
* @return Number of bytes read, 0 on EOF, SSH_ERROR if an error * @return Number of bytes read, 0 on EOF, SSH_ERROR if an error
* occured, SSH_AGAIN SSH_AGAIN if the file is opened in * occured, SSH_AGAIN if the file is opened in nonblocking
* nonblocking mode and the request hasn't been executed * mode and the request hasn't been executed yet.
* yet.
* *
* @warning A call to this function with an invalid identifier * @warning A call to this function with an invalid identifier
* will never return. * will never return.

202
libssh/sftp.c
View File

@@ -1543,102 +1543,124 @@ ssize_t sftp_read(SFTP_FILE *handle, void *buf, size_t count) {
} }
/* Start an asynchronous read from a file using an opened sftp file handle. */ /* Start an asynchronous read from a file using an opened sftp file handle. */
u32 sftp_async_read_begin(SFTP_FILE *file, u32 len){ int sftp_async_read_begin(SFTP_FILE *file, u32 len){
SFTP_SESSION *sftp=file->sftp; SFTP_SESSION *sftp = file->sftp;
BUFFER *buffer; BUFFER *buffer;
u32 id; u32 id;
sftp_enter_function();
buffer=buffer_new(); sftp_enter_function();
id=sftp_get_new_id(sftp);
buffer_add_u32(buffer,id); buffer = buffer_new();
buffer_add_ssh_string(buffer,file->handle); if (buffer == NULL) {
buffer_add_u64(buffer,htonll(file->offset)); return -1;
buffer_add_u32(buffer,htonl(len)); }
sftp_packet_write(sftp,SSH_FXP_READ,buffer);
buffer_free(buffer); id = sftp_get_new_id(sftp);
file->offset += len; // assume we'll read len bytes if (buffer_add_u32(buffer, id) < 0 ||
sftp_leave_function(); buffer_add_ssh_string(buffer, file->handle) < 0 ||
return id; buffer_add_u64(buffer, htonll(file->offset)) < 0 ||
buffer_add_u32(buffer, htonl(len)) < 0 ||
sftp_packet_write(sftp, SSH_FXP_READ, buffer) < 0) {
buffer_free(buffer);
return -1;
}
buffer_free(buffer);
file->offset += len; /* assume we'll read len bytes */
sftp_leave_function();
return id;
} }
/* Wait for an asynchronous read to complete and save the data. */ /* Wait for an asynchronous read to complete and save the data. */
int sftp_async_read(SFTP_FILE *file, void *data, u32 size, u32 id){ int sftp_async_read(SFTP_FILE *file, void *data, u32 size, u32 id){
SFTP_MESSAGE *msg=NULL; SFTP_SESSION *sftp = file->sftp;
STATUS_MESSAGE *status; SFTP_MESSAGE *msg = NULL;
SFTP_SESSION *sftp=file->sftp; STATUS_MESSAGE *status;
STRING *datastring; STRING *datastring;
int err=0; int err = SSH_OK;
u32 len; u32 len;
sftp_enter_function();
if(file->eof){ sftp_enter_function();
sftp_leave_function();
return 0; if (file->eof) {
sftp_leave_function();
return 0;
}
/* handle an existing request */
while (msg == NULL) {
if (file->nonblocking){
if (channel_poll(sftp->channel, 0) == 0) {
/* we cannot block */
return SSH_AGAIN;
}
} }
// handle an existing request if (sftp_read_and_dispatch(sftp) < 0) {
while(!msg){ /* something nasty has happened */
if (file->nonblocking){ sftp_leave_function();
if(channel_poll(sftp->channel,0)==0){ return SSH_ERROR;
/* we cannot block */ }
return SSH_AGAIN;
} msg = sftp_dequeue(sftp,id);
} }
if(sftp_read_and_dispatch(sftp)){
/* something nasty has happened */ switch (msg->packet_type) {
sftp_leave_function(); case SSH_FXP_STATUS:
return SSH_ERROR; status = parse_status_msg(msg);
} sftp_message_free(msg);
msg=sftp_dequeue(sftp,id); if (status == NULL) {
} sftp_leave_function();
switch (msg->packet_type){ return -1;
case SSH_FXP_STATUS: }
status=parse_status_msg(msg); sftp_set_error(sftp, status->status);
sftp_message_free(msg); if (status->status != SSH_FX_EOF) {
if(!status){ ssh_set_error(sftp->session, SSH_REQUEST_DENIED,
sftp_leave_function(); "SFTP server : %s", status->errormsg);
return -1; sftp_leave_function();
} err = SSH_ERROR;
sftp_set_error(sftp, status->status); } else {
if(status->status != SSH_FX_EOF){ file->eof = 1;
ssh_set_error(sftp->session,SSH_REQUEST_DENIED,"sftp server : %s",status->errormsg); }
sftp_leave_function(); status_msg_free(status);
err=-1; sftp_leave_function();
} else return err;
file->eof=1; case SSH_FXP_DATA:
status_msg_free(status); datastring = buffer_get_ssh_string(msg->payload);
sftp_leave_function(); sftp_message_free(msg);
return err?err:0; if (datastring == NULL) {
case SSH_FXP_DATA: ssh_set_error(sftp->session, SSH_FATAL,
datastring=buffer_get_ssh_string(msg->payload); "Received invalid DATA packet from sftp server");
sftp_message_free(msg); sftp_leave_function();
if(!datastring){ return SSH_ERROR;
ssh_set_error(sftp->session,SSH_FATAL,"Received invalid DATA packet from sftp server"); }
sftp_leave_function(); if (string_len(datastring) > size) {
return -1; ssh_set_error(sftp->session, SSH_FATAL,
} "Received a too big DATA packet from sftp server: "
if(string_len(datastring)>size){ "%zu and asked for %u",
ssh_set_error(sftp->session, SSH_FATAL, string_len(datastring), size);
"Received a too big DATA packet from sftp server: %zu and asked for %u", string_free(datastring);
string_len(datastring),size); sftp_leave_function();
free(datastring); return SSH_ERROR;
sftp_leave_function(); }
return SSH_ERROR; len = string_len(datastring);
} //handle->offset+=len;
len=string_len(datastring); /* We already have set the offset previously. All we can do is warn that the expected len
//handle->offset+=len; * and effective lengths are different */
/* We already have set the offset previously. All we can do is warn that the expected len memcpy(data, datastring->string, len);
* and effective lengths are different */ string_free(datastring);
memcpy(data,datastring->string,len); sftp_leave_function();
free(datastring); return len;
sftp_leave_function(); default:
return len; ssh_set_error(sftp->session,SSH_FATAL,"Received message %d during read!",msg->packet_type);
default: sftp_message_free(msg);
ssh_set_error(sftp->session,SSH_FATAL,"Received message %d during read!",msg->packet_type); sftp_leave_function();
sftp_message_free(msg); return SSH_ERROR;
sftp_leave_function(); }
return SSH_ERROR;
} sftp_leave_function();
sftp_leave_function(); return SSH_ERROR;
} }
ssize_t sftp_write(SFTP_FILE *file, const void *buf, size_t count){ ssize_t sftp_write(SFTP_FILE *file, const void *buf, size_t count){