Skip to content

Fix retry loop in doAutopilot #993

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

Open
yosuke-wolfssl wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix retry loop in doAutopilot #993

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
56 changes: 45 additions & 11 deletions examples/sftpclient/sftpclient.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1291,6 +1291,33 @@ static int doCmds(func_args* args)
}


/* Resolve the CWD via RealPath (passing "." to get the current directory)
* and append the relative remote path into fullpath. WS_REKEYING and
* WS_WINDOW_FULL are intentionally excluded from the retry condition below;
* they require a wolfSSH_worker call that the caller's outer loop provides. */
static int doBuildRemotePath(const char* remote, char* fullpath, word32 fullpathSz,
WS_SFTPNAME** nameOut)
{
int err;

if (remote == NULL || fullpath == NULL || fullpathSz == 0 || nameOut == NULL)
return WS_BAD_ARGUMENT;
do {
*nameOut = wolfSSH_SFTP_RealPath(ssh, (char*)".");
err = wolfSSH_get_error(ssh);
} while (err == WS_WANT_READ || err == WS_WANT_WRITE);
if (*nameOut == NULL)
return (err == WS_SUCCESS) ? WS_FATAL_ERROR : err;
if (snprintf(fullpath, fullpathSz, "%s/%s", (*nameOut)->fName, remote)
>= (int)fullpathSz) {
wolfSSH_SFTPNAME_list_free(*nameOut);
*nameOut = NULL;
return WS_FATAL_ERROR;
}
return WS_SUCCESS;
}


/* alternate main loop for the autopilot get/receive */
static int doAutopilot(int cmd, char* local, char* remote)
{
Expand Down Expand Up @@ -1319,22 +1346,29 @@ static int doAutopilot(int cmd, char* local, char* remote)
WSTRNCPY(fullpath, remote, sizeof(fullpath) - 1);
}
else {
do {
name = wolfSSH_SFTP_RealPath(ssh, fullpath);
err = wolfSSH_get_error(ssh);
} while ((err == WS_WANT_READ || err == WS_WANT_WRITE) &&
ret != WS_SUCCESS);

snprintf(fullpath, sizeof(fullpath), "%s/%s",
name == NULL ? "." : name->fName,
remote);
err = doBuildRemotePath(remote, fullpath, sizeof(fullpath), &name);
if (err != WS_SUCCESS && err != WS_REKEYING && err != WS_WINDOW_FULL)
return WS_FATAL_ERROR;
}

do {
if (err == WS_REKEYING || err == WS_WINDOW_FULL) { /* handle rekeying state */
if (err == WS_REKEYING || err == WS_WINDOW_FULL) { /* handle rekeying and window-full state */
do {
ret = wolfSSH_worker(ssh, NULL);
} while (ret == WS_REKEYING);
} while (ret == WS_REKEYING || ret == WS_WINDOW_FULL ||
wolfSSH_get_error(ssh) == WS_REKEYING);

if (ret != WS_SUCCESS && ret != WS_CHAN_RXD &&
ret != WS_WANT_READ && ret != WS_WANT_WRITE)
break;

if (!remoteAbsPath && name == NULL) {
err = doBuildRemotePath(remote, fullpath, sizeof(fullpath), &name);
if (err != WS_SUCCESS) {
ret = WS_FATAL_ERROR;
continue; /* skip wolfSSH_get_error; outer loop retries on err from doBuildRemotePath */
}
}
}

if (cmd == AUTOPILOT_PUT) {
Expand Down
Loading