Skip to content

Update SFTP status callback to output once per second #779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JacobBarthelmeh merged 8 commits into from
Feb 26, 2025
Merged

Update SFTP status callback to output once per second #779

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ca3595e
Update myStatusCb to output once per second
devin-ai-integration[bot] Feb 18, 2025
b45a510
Reset status output timer when starting new file transfer
devin-ai-integration[bot] Feb 18, 2025
4e91d65
Fix Zephyr build by guarding lastOutputTime with WOLFSSH_NO_TIMESTAMP
devin-ai-integration[bot] Feb 18, 2025
4ce9710
Move elapsedTime declaration to function scope
devin-ai-integration[bot] Feb 21, 2025
67a381c
Fix timeout check to use elapsed time instead of current time
devin-ai-integration[bot] Feb 21, 2025
f5a32fe
Use elapsed time in timeout error message for consistency
devin-ai-integration[bot] Feb 21, 2025
8c1cbe0
Move elapsedTime inside WOLFSSH_NO_TIMESTAMP guard
devin-ai-integration[bot] Feb 24, 2025
05d9a22
Move currentTime outside WOLFSSH_NO_TIMESTAMP guard
devin-ai-integration[bot] Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions examples/sftpclient/sftpclient.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,19 +148,28 @@ static void err_msg(const char* s)

static void myStatusCb(WOLFSSH* sshIn, word32* bytes, char* name)
{
#ifndef WOLFSSH_NO_TIMESTAMP
static word32 lastOutputTime = 0;
#endif
word32 currentTime;
char buf[80];
word64 longBytes = ((word64)bytes[1] << 32) | bytes[0];

#ifndef WOLFSSH_NO_TIMESTAMP
currentTime = current_time(0);
if (currentTime == lastOutputTime) {
return;
}
lastOutputTime = currentTime;
if (WSTRNCMP(currentFile, name, WSTRLEN(name)) != 0) {
startTime = current_time(1);
lastOutputTime = 0; /* Reset timer for new file transfer */
WMEMSET(currentFile, 0, WOLFSSH_MAX_FILENAME);
WSTRNCPY(currentFile, name, WOLFSSH_MAX_FILENAME);
}
currentTime = current_time(0) - startTime;
word32 elapsedTime = currentTime - startTime;
Comment thread
JacobBarthelmeh marked this conversation as resolved.
Outdated
WSNPRINTF(buf, sizeof(buf), "Processed %8llu\t bytes in %d seconds\r",
(unsigned long long)longBytes, currentTime);
(unsigned long long)longBytes, elapsedTime);
#ifndef WOLFSSH_NO_SFTP_TIMEOUT
if (currentTime > TIMEOUT_VALUE) {
WSNPRINTF(buf, sizeof(buf), "\nProcess timed out at %d seconds, "
Expand Down