WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

alter setting of ssh->error with SFTP get and return value

pull/487/head
JacobBarthelmeh 2023-01-18 09:27:47 -08:00
parent cb4a50a764
commit f8b46ce1e3
2 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/sftpclient/sftpclient.c
View File

@ -1013,7 +1013,7 @@ static int doCmds(func_args* args)
do { do {
ret = wolfSSH_SFTP_Get(ssh, pt, to, resume, &myStatusCb); ret = wolfSSH_SFTP_Get(ssh, pt, to, resume, &myStatusCb);
if (ret != WS_SUCCESS) { if (ret != WS_SUCCESS && ret == WS_FATAL_ERROR) {
ret = wolfSSH_get_error(ssh); ret = wolfSSH_get_error(ssh);
} }
} while (ret == WS_WANT_READ || ret == WS_WANT_WRITE || } while (ret == WS_WANT_READ || ret == WS_WANT_WRITE ||
@ -1523,7 +1523,7 @@ static int doAutopilot(int cmd, char* local, char* remote)
} }
err = wolfSSH_get_error(ssh); err = wolfSSH_get_error(ssh);
} while ((err == WS_WANT_READ || err == WS_WANT_WRITE || } while ((err == WS_WANT_READ || err == WS_WANT_WRITE ||
err == WS_CHAN_RXD) && ret != WS_SUCCESS); err == WS_CHAN_RXD) && ret == WS_FATAL_ERROR);
if (ret != WS_SUCCESS) { if (ret != WS_SUCCESS) {
if (cmd == AUTOPILOT_PUT) { if (cmd == AUTOPILOT_PUT) {

19
src/wolfsftp.c
View File

@ -5302,12 +5302,6 @@ static int wolfSSH_SFTP_DoStatus(WOLFSSH* ssh, word32 reqId,
} }
wolfSSH_SFTP_buffer_seek(buffer, 0, localIdx); wolfSSH_SFTP_buffer_seek(buffer, 0, localIdx);
if (status != WOLFSSH_FTP_OK &&
ssh->error != WS_WANT_READ && ssh->error != WS_WANT_WRITE) {
/* set ssh error as the SFTP status not being ok */
ssh->error = WS_SFTP_STATUS_NOT_OK;
}
return status; return status;
} }
@ -5885,7 +5879,7 @@ static int wolfSSH_SFTP_GetHandle(WOLFSSH* ssh, byte* handle, word32* handleSz)
if (ret == WOLFSSH_FTP_OK) if (ret == WOLFSSH_FTP_OK)
ret = WS_SUCCESS; ret = WS_SUCCESS;
else else
ret = WS_FATAL_ERROR; ret = WS_SFTP_STATUS_NOT_OK;
state->state = STATE_GET_HANDLE_CLEANUP; state->state = STATE_GET_HANDLE_CLEANUP;
continue; continue;
@ -6279,7 +6273,7 @@ static int SFTP_STAT(WOLFSSH* ssh, char* dir, WS_SFTP_FILEATRB* atr, byte type)
if (ret == WOLFSSH_FTP_PERMISSION) { if (ret == WOLFSSH_FTP_PERMISSION) {
return WS_PERMISSIONS; return WS_PERMISSIONS;
} }
return WS_FATAL_ERROR; return WS_SFTP_STATUS_NOT_OK;
} }
} }
else { else {
@ -6813,8 +6807,7 @@ int wolfSSH_SFTP_SendWritePacket(WOLFSSH* ssh, byte* handle, word32 handleSz,
} }
else if (status != WOLFSSH_FTP_OK) { else if (status != WOLFSSH_FTP_OK) {
/* @TODO better error value description i.e permissions */ /* @TODO better error value description i.e permissions */
ssh->error = WS_SFTP_STATUS_NOT_OK; ret = WS_SFTP_STATUS_NOT_OK;
ret = WS_FATAL_ERROR;
} }
if (ret >= WS_SUCCESS) if (ret >= WS_SUCCESS)
ret = sentSzSave; ret = sentSzSave;
@ -7655,8 +7648,7 @@ int wolfSSH_SFTP_Rename(WOLFSSH* ssh, const char* old, const char* nw)
ret = WS_FATAL_ERROR; ret = WS_FATAL_ERROR;
} }
else if (ret != WOLFSSH_FTP_OK) { else if (ret != WOLFSSH_FTP_OK) {
ssh->error = WS_SFTP_STATUS_NOT_OK; ret = WS_SFTP_STATUS_NOT_OK;
ret = WS_FATAL_ERROR;
} }
state->state = STATE_RENAME_CLEANUP; state->state = STATE_RENAME_CLEANUP;
NO_BREAK; NO_BREAK;
@ -8011,6 +8003,9 @@ void wolfSSH_SFTP_Interrupt(WOLFSSH* ssh)
* loop with bytes written. * loop with bytes written.
* *
* returns WS_SUCCESS on success * returns WS_SUCCESS on success
* returns WS_FATAL_ERROR on low level error or SSH level error
* call wolfSSH_get_error(ssh) to try to get SSH error
* other reuturn values are error states during the SFTP get process
*/ */
int wolfSSH_SFTP_Get(WOLFSSH* ssh, char* from, int wolfSSH_SFTP_Get(WOLFSSH* ssh, char* from,
char* to, byte resume, WS_STATUS_CB* statusCb) char* to, byte resume, WS_STATUS_CB* statusCb)