diff options
| -rw-r--r-- | src/scp.c | 30 |
1 files changed, 19 insertions, 11 deletions
@@ -405,8 +405,8 @@ int ssh_scp_response(ssh_scp scp, char **response){ */ int ssh_scp_write(ssh_scp scp, const void *buffer, size_t len){ int w; - //int r; - //uint8_t code; + int r; + uint8_t code; if(scp==NULL) return SSH_ERROR; if(scp->state != SSH_SCP_WRITE_WRITING){ @@ -425,19 +425,27 @@ int ssh_scp_write(ssh_scp scp, const void *buffer, size_t len){ //return=channel_get_exit_status(scp->channel); return SSH_ERROR; } - /* Check if we arrived at end of file */ - if(scp->processed == scp->filelen) { -/* r=channel_read(scp->channel,&code,1,0); - if(r==SSH_ERROR){ - scp->state=SSH_SCP_ERROR; + /* Far end sometimes send a status message, which we need to read + * and handle */ + r = ssh_channel_poll(scp->channel,0); + if(r > 0){ + r = ssh_channel_read(scp->channel, &code, 1, 0); + if(r == SSH_ERROR){ return SSH_ERROR; } - if(code != 0){ - ssh_set_error(scp->session,SSH_FATAL, "scp status code %ud not valid", code); - scp->state=SSH_SCP_ERROR; + if(code == 1 || code == 2){ + ssh_set_error(scp->session,SSH_REQUEST_DENIED, "SCP: Error: status code %i received", code); + return SSH_ERROR; + } + } + /* Check if we arrived at end of file */ + if(scp->processed == scp->filelen) { + code = 0; + w = ssh_channel_write(scp->channel, &code, 1); + if(w == SSH_ERROR){ + scp->state = SSH_SCP_ERROR; return SSH_ERROR; } -*/ scp->processed=scp->filelen=0; scp->state=SSH_SCP_WRITE_INITED; } |