From 672ef936495f7e588caf9f86fe471e222e5066d5 Mon Sep 17 00:00:00 2001 From: John Safranek Date: Thu, 8 Aug 2024 18:06:21 -0700 Subject: [PATCH] Merge pull request #719 from JacobBarthelmeh/cat cat of large file with ssh shell --- apps/wolfsshd/test/sshd_window_full_test.sh | 1 + apps/wolfsshd/wolfsshd.c | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/wolfsshd/test/sshd_window_full_test.sh b/apps/wolfsshd/test/sshd_window_full_test.sh index dd915d7a..285500a6 100755 --- a/apps/wolfsshd/test/sshd_window_full_test.sh +++ b/apps/wolfsshd/test/sshd_window_full_test.sh @@ -47,6 +47,7 @@ echo "$TEST_CLIENT -q -c \"cd $PWD; $TEST_CLIENT -q -c \"cat $PWD/random-test.tx $TEST_CLIENT -q -c "cd $PWD; $TEST_CLIENT -q -c \"cat $PWD/random-test.txt\" -u $USER -i $PRIVATE_KEY -j $PUBLIC_KEY -h $TEST_HOST -p $TEST_PORT" -u $USER -i $PRIVATE_KEY -j $PUBLIC_KEY -h $TEST_HOST -p $TEST_PORT > random-test-result.txt ls -la random-test* +$TEST_CLIENT -c "cd $PWD; $TEST_CLIENT -c \"cat $PWD/random-test.txt\" -u $USER -i $PRIVATE_KEY -j $PUBLIC_KEY -h $TEST_HOST -p $TEST_PORT" -u $USER -i $PRIVATE_KEY -j $PUBLIC_KEY -h $TEST_HOST -p $TEST_PORT > random-test-result.txt diff random-test.txt random-test-result.txt RESULT=$? diff --git a/apps/wolfsshd/wolfsshd.c b/apps/wolfsshd/wolfsshd.c index 24cbaefd..75c526a6 100644 --- a/apps/wolfsshd/wolfsshd.c +++ b/apps/wolfsshd/wolfsshd.c @@ -1524,7 +1524,7 @@ static int SHELL_Subsystem(WOLFSSHD_CONNECTION* conn, WOLFSSH* ssh, continue; } else if (cnt_w == WS_WANT_WRITE) { - windowFull = 1; + wantWrite = 1; continue; } else { @@ -1568,7 +1568,7 @@ static int SHELL_Subsystem(WOLFSSHD_CONNECTION* conn, WOLFSSH* ssh, continue; } else if (cnt_w == WS_WANT_WRITE) { - windowFull = 1; + wantWrite = 1; continue; } else if (cnt_w < 0)