lib/libssh
1
0
Fork 0
mirror of https://git.libssh.org/projects/libssh.git synced 2025-12-02 01:17:52 +03:00
Code Activity

Improve sftp_handle_close().

Browse Source 
git-svn-id: svn+ssh://svn.berlios.de/svnroot/repos/libssh/trunk@598 7dcaeef0-15fb-0310-b436-a5af3365683c
This commit is contained in:
Andreas Schneider
2009-04-23 15:08:34 +00:00
parent baee8c17b5
commit 5d689c2d29
1 changed files with 54 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
libssh/sftp.c
View File

@@ -1255,43 +1255,59 @@ void sftp_attributes_free(SFTP_ATTRIBUTES *file){
} }
static int sftp_handle_close(SFTP_SESSION *sftp, STRING *handle) { static int sftp_handle_close(SFTP_SESSION *sftp, STRING *handle) {
SFTP_MESSAGE *msg=NULL;
STATUS_MESSAGE *status; STATUS_MESSAGE *status;
int id=sftp_get_new_id(sftp); SFTP_MESSAGE *msg = NULL;
int err=0; BUFFER *buffer = NULL;
BUFFER *buffer=buffer_new(); u32 id;
buffer_add_u32(buffer,id);
buffer_add_ssh_string(buffer,handle); buffer = buffer_new();
sftp_packet_write(sftp,SSH_FXP_CLOSE,buffer); if (buffer == NULL) {
return -1;
}
id = sftp_get_new_id(sftp);
if (buffer_add_u32(buffer, id) < 0 ||
buffer_add_ssh_string(buffer, handle) < 0 ||
sftp_packet_write(sftp, SSH_FXP_CLOSE ,buffer) < 0) {
buffer_free(buffer); buffer_free(buffer);
while(!msg){ return -1;
if(sftp_read_and_dispatch(sftp)) }
buffer_free(buffer);
while (msg == NULL) {
if (sftp_read_and_dispatch(sftp) < 0) {
/* something nasty has happened */ /* something nasty has happened */
return -1; return -1;
}
msg = sftp_dequeue(sftp,id); msg = sftp_dequeue(sftp,id);
} }
switch (msg->packet_type) { 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_OK: case SSH_FX_OK:
status_msg_free(status); status_msg_free(status);
return err; return 0;
break; break;
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;
default: default:
ssh_set_error(sftp->session,SSH_FATAL,"Received message %d during sftp_handle_close!",msg->packet_type); ssh_set_error(sftp->session, SSH_FATAL,
"Received message %d during sftp_handle_close!", msg->packet_type);
sftp_message_free(msg); sftp_message_free(msg);
} }
return -1; return -1;
} }