WolfSSL
/
wolfssh
mirror of https://github.com/wolfSSL/wolfssh.git
1
0
Fork 0
Code Issues Releases Wiki Activity

examples/portfwd: always retry the buffered send 

The send at the end of the loop only ran when select() reported a
readable descriptor, but appBuffer can hold data across iterations.
Mask appFd out of the read set while the buffer is full, and fall
through the select() timeout to the send.

Issue: F-7207
pull/1144/head
John Safranek 2026-07-31 14:26:59 -07:00 committed by philljj
parent 8916d4f6e2
commit 90e76fde5d
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
examples/portfwd/portfwd.c
View File

@ -690,17 +690,23 @@ THREAD_RETURN WOLFSSH_THREAD portfwd_worker(void* args)
rxFds = templateFds;
errFds = templateFds;
/* A readable appFd with a full buffer would spin select(). Mask the
* read set only, so errors are still noticed. */
if (appFdSet && appBufferUsed == appBufferSz)
FD_CLR(appFd, &rxFds);
to.tv_sec = 1;
to.tv_usec = 0;
ret = select(nFds, &rxFds, NULL, &errFds, &to);
if (ret < 0)
err_sys("select failed\n");
if (ret == 0) {
/* Fall through rather than continue, a short send leaves a tail
* owed another attempt. select() cleared the sets. */
ret = wolfSSH_SendIgnore(ssh, NULL, 0);
if (ret != WS_SUCCESS)
err_sys("Couldn't send an ignore message.");
continue;
}
else if (ret < 0)
err_sys("select failed\n");
if ((appFdSet && FD_ISSET(appFd, &errFds)) ||
FD_ISSET(sshFd, &errFds) ||
@ -709,8 +715,7 @@ THREAD_RETURN WOLFSSH_THREAD portfwd_worker(void* args)
err_sys("some socket had an error");
}
/* Skip the read when the buffer is full, a zero length recv() returns
* 0 and would be mistaken for the peer closing. The buffer drains at
* the bottom of the loop. */
* 0 and would be mistaken for the peer closing. */
if (appFdSet && appBufferUsed < appBufferSz &&
FD_ISSET(appFd, &rxFds)) {
int rxd;