refactor SFTP to use NoticeError

Author: JacobBarthelmeh

examples/sftpclient/sftpclient.c

@@ -1101,7 +1101,7 @@ static int doCmds(func_args* args)
 /* alternate main loop for the autopilot get/receive */
 static int doAutopilot(int cmd, char* local, char* remote)
 {
-    int err;
+    int err = 0;
     int ret = WS_SUCCESS;
     char fullpath[128] = ".";
     WS_SFTPNAME* name  = NULL;
@@ -1138,6 +1138,12 @@ static int doAutopilot(int cmd, char* local, char* remote)
     }
 
     do {
+        if (err == WS_REKEYING) { /* handle rekeying state */
+            do {
+                ret = wolfSSH_worker(ssh, NULL);
+            } while (ret == WS_REKEYING);
+        }
+
         if (cmd == AUTOPILOT_PUT) {
             ret = wolfSSH_SFTP_Put(ssh, local, fullpath, 0, NULL);
         }
@@ -1146,7 +1152,8 @@ static int doAutopilot(int cmd, char* local, char* remote)
         }
         err = wolfSSH_get_error(ssh);
     } while ((err == WS_WANT_READ || err == WS_WANT_WRITE ||
-                err == WS_CHAN_RXD) && ret == WS_FATAL_ERROR);
+                err == WS_CHAN_RXD || err == WS_REKEYING) &&
+		    ret == WS_FATAL_ERROR);
 
     if (ret != WS_SUCCESS) {
         if (cmd == AUTOPILOT_PUT) {

src/ssh.c

@@ -1169,7 +1169,7 @@ int wolfSSH_stream_send(WOLFSSH* ssh, byte* buf, word32 bufSz)
 
     if (ssh->isKeying) {
         ssh->error = WS_REKEYING;
-        return WS_REKEYING;
+        return WS_FATAL_ERROR;
     }
 
     bytesTxd = SendChannelData(ssh, ssh->channelList->channel, buf, bufSz);

src/wolfsftp.c

@@ -1400,8 +1400,13 @@ int wolfSSH_SFTP_read(WOLFSSH* ssh)
             ret = wolfSSH_SFTP_buffer_read(ssh, &state->buffer,
                     state->buffer.sz);
             if (ret < 0) {
-                if (ssh->error != WS_WANT_READ && ssh->error != WS_WANT_WRITE)
-                        wolfSSH_SFTP_ClearState(ssh, STATE_ID_RECV);
+                if (NoticeError(ssh)) {
+                    /* keep state for returning to */
+                    ret = WS_FATAL_ERROR;
+                }
+                else {
+                    wolfSSH_SFTP_ClearState(ssh, STATE_ID_RECV);
+                }
                 return ret;
             }
 
@@ -7246,8 +7251,7 @@ int wolfSSH_SFTP_SendWritePacket(WOLFSSH* ssh, byte* handle, word32 handleSz,
                 /* send header and type specific data */
                 ret = wolfSSH_SFTP_buffer_send(ssh, &state->buffer);
                 if (ret < 0) {
-                    if (ssh->error == WS_WANT_READ ||
-                            ssh->error == WS_WANT_WRITE) {
+                    if (NoticeError(ssh)) {
                         return WS_FATAL_ERROR;
                     }
                     state->state = STATE_SEND_WRITE_CLEANUP;
@@ -7259,12 +7263,8 @@ int wolfSSH_SFTP_SendWritePacket(WOLFSSH* ssh, byte* handle, word32 handleSz,
             case STATE_SEND_WRITE_SEND_BODY:
                 WLOG(WS_LOG_SFTP, "SFTP SEND_WRITE STATE: SEND_BODY");
                 state->sentSz = wolfSSH_stream_send(ssh, in, inSz);
-                if (state->sentSz == WS_WINDOW_FULL ||
-                        state->sentSz == WS_REKEYING ||
-                        state->sentSz == WS_WANT_READ ||
-                        state->sentSz == WS_WANT_WRITE) {
-                    ret = wolfSSH_worker(ssh, NULL);
-                    continue; /* skip past rest and send more */
+                if (NoticeError(ssh)) {
+                    return WS_FATAL_ERROR;
                 }
                 if (state->sentSz <= 0) {
                     ssh->error = state->sentSz;
@@ -7290,8 +7290,7 @@ int wolfSSH_SFTP_SendWritePacket(WOLFSSH* ssh, byte* handle, word32 handleSz,
                 state->maxSz = SFTP_GetHeader(ssh, &state->reqId, &type,
                         &state->buffer);
                 if (state->maxSz <= 0) {
-                    if (ssh->error == WS_WANT_READ ||
-                            ssh->error == WS_WANT_WRITE) {
+                    if (NoticeError(ssh)) {
                         return WS_FATAL_ERROR;
                     }
                     ssh->error = WS_SFTP_BAD_HEADER;
@@ -8954,10 +8953,9 @@ int wolfSSH_SFTP_Put(WOLFSSH* ssh, char* from, char* to, byte resume,
                             state->handle, state->handleSz, state->pOfst,
                             state->r, state->rSz);
                     if (sz <= 0) {
-                        if (ssh->error == WS_WANT_READ ||
-                                ssh->error == WS_WANT_WRITE ||
-                                ssh->error == WS_WINDOW_FULL)
+                        if (NoticeError(ssh)) {
                             return WS_FATAL_ERROR;
+			}
                     }
                     else {
                         AddAssign64(state->pOfst, sz);