Merge pull request #398 from ejohnstown/status

Echoserver SFTP status update

Author: dgarske

examples/echoserver/echoserver.c

@@ -1156,11 +1156,10 @@ static int sftp_worker(thread_ctx_t* threadCtx)
         else
             error = WS_FATAL_ERROR;
 
-        if (error == WS_WANT_READ || error == WS_WANT_WRITE)
-            ret = WS_WANT_READ;
-
-        if (error == WS_CHAN_RXD)
-            ret = WS_CHAN_RXD;
+        if (error == WS_WANT_READ || error == WS_WANT_WRITE ||
+            error == WS_CHAN_RXD || error == WS_REKEYING ||
+            error == WS_WINDOW_FULL)
+            ret = error;
 
         if (ret == WS_FATAL_ERROR && error == 0) {
             WOLFSSH_CHANNEL* channel =

src/wolfsftp.c

@@ -1474,7 +1474,11 @@ int wolfSSH_SFTP_read(WOLFSSH* ssh)
                     if (wolfSSH_SFTP_buffer_idx(&state->buffer)
                             < wolfSSH_SFTP_buffer_size(&state->buffer)) {
                         ret = wolfSSH_worker(ssh, NULL);
-                        if (ret != WS_SUCCESS && ssh->error == WS_WANT_READ) {
+                        if (ret != WS_SUCCESS &&
+                                (ssh->error == WS_WANT_READ ||
+                                 ssh->error == WS_REKEYING ||
+                                 ssh->error == WS_CHAN_RXD ||
+                                 ssh->error == WS_WINDOW_FULL)) {
                             /* was something there to read, try again */
                             state->toSend = 2;
                             return WS_FATAL_ERROR;