Merge pull request #667 from ejohnstown/sftp-fix

JacobBarthelmeh · web-flow · commit 902cff345f6d · 2024-03-19T00:21:38.000+07:00
SFTP Fix
diff --git a/examples/echoserver/echoserver.c b/examples/echoserver/echoserver.c
@@ -1196,11 +1196,8 @@ static int sftp_worker(thread_ctx_t* threadCtx)
         }
         else if (selected == WS_SELECT_TIMEOUT) {
             timeout = TEST_SFTP_TIMEOUT_LONG;
-            continue;
         }
-
-        if (ret == WS_WANT_READ || ret == WS_WANT_WRITE ||
-                selected == WS_SELECT_RECV_READY) {
+        else if (selected == WS_SELECT_RECV_READY) {
             ret = wolfSSH_worker(ssh, NULL);
             error = wolfSSH_get_error(ssh);
             if (ret == WS_REKEYING) {
@@ -1213,7 +1210,6 @@ static int sftp_worker(thread_ctx_t* threadCtx)
                 error == WS_WINDOW_FULL) {
                 timeout = TEST_SFTP_TIMEOUT;
                 ret = error;
-                continue;
             }
 
             if (error == WS_EOF) {

Original file line number	Diff line number	Diff line change
`@@ -1196,11 +1196,8 @@ static int sftp_worker(thread_ctx_t* threadCtx)`
`1196`	`1196`	`}`
`1197`	`1197`	`else if (selected == WS_SELECT_TIMEOUT) {`
`1198`	`1198`	`timeout = TEST_SFTP_TIMEOUT_LONG;`
`1199`		`- continue;`
`1200`	`1199`	`}`
`1201`		`-`
`1202`		`- if (ret == WS_WANT_READ \|\| ret == WS_WANT_WRITE \|\|`
`1203`		`- selected == WS_SELECT_RECV_READY) {`
	`1200`	`+ else if (selected == WS_SELECT_RECV_READY) {`
`1204`	`1201`	`ret = wolfSSH_worker(ssh, NULL);`
`1205`	`1202`	`error = wolfSSH_get_error(ssh);`
`1206`	`1203`	`if (ret == WS_REKEYING) {`
`@@ -1213,7 +1210,6 @@ static int sftp_worker(thread_ctx_t* threadCtx)`
`1213`	`1210`	`error == WS_WINDOW_FULL) {`
`1214`	`1211`	`timeout = TEST_SFTP_TIMEOUT;`
`1215`	`1212`	`ret = error;`
`1216`		`- continue;`
`1217`	`1213`	`}`
`1218`	`1214`
`1219`	`1215`	`if (error == WS_EOF) {`