Skip to content

Add client-side remote port forwarding #1066

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 3 commits into from
Jul 23, 2026
Merged

Add client-side remote port forwarding #1066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
445e4ed
Add client-side remote port forwarding
ejohnstown Jun 24, 2026
e4fb787
Fix echoserver remote-forward listener accept
ejohnstown Jul 22, 2026
9856dd6
Add reverse forwarding phases to fwd.test
ejohnstown Jul 22, 2026
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
32 changes: 24 additions & 8 deletions examples/echoserver/echoserver.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -531,6 +531,19 @@ static int wolfSSH_FwdDefaultActions(WS_FwdCbAction action, void* vCtx,
ret = -1;
}

#ifndef USE_WINDOWS_API
if (ret == 0) {
/* A forward torn down with a connection open leaves this port in
* TIME_WAIT, which would fail the next bind. tcp_listen() sets
* this for the other listeners; do the same here. */
int on = 1;
if (setsockopt(appCtx->listenFd, SOL_SOCKET, SO_REUSEADDR,
&on, (socklen_t)sizeof(on)) < 0) {
ret = -1;
}
}
#endif

if (ret == 0) {

WMEMSET(&addr, 0, sizeof addr);
Expand Down Expand Up @@ -873,7 +886,6 @@ static int ssh_worker(thread_ctx_t* threadCtx)
#endif
#ifdef WOLFSSH_FWD
WS_SOCKET_T fwdFd = -1;
WS_SOCKET_T fwdListenFd = threadCtx->fwdCtx.listenFd;
word32 fwdBufferIdx = 0;
#endif

Expand Down Expand Up @@ -955,10 +967,13 @@ static int ssh_worker(thread_ctx_t* threadCtx)
}
#endif /* WOLFSSH_AGENT */
#ifdef WOLFSSH_FWD
if (threadCtx->fwdCtx.state == APP_STATE_LISTEN) {
FD_SET(fwdListenFd, &readFds);
if (fwdListenFd > maxFd)
maxFd = fwdListenFd;
/* The fwd callback creates this listener mid-loop; re-read it
* each pass rather than caching it. */
if (threadCtx->fwdCtx.state == APP_STATE_LISTEN
&& threadCtx->fwdCtx.listenFd >= 0) {
FD_SET(threadCtx->fwdCtx.listenFd, &readFds);
if (threadCtx->fwdCtx.listenFd > maxFd)
maxFd = threadCtx->fwdCtx.listenFd;
}
if (fwdFd >= 0
&& threadCtx->fwdCtx.state == APP_STATE_CONNECTED) {
Expand Down Expand Up @@ -1250,12 +1265,13 @@ static int ssh_worker(thread_ctx_t* threadCtx)
}
}
}
if (threadCtx->fwdCtx.state == APP_STATE_LISTEN) {
if (FD_ISSET(fwdListenFd, &readFds)) {
if (threadCtx->fwdCtx.state == APP_STATE_LISTEN
&& threadCtx->fwdCtx.listenFd >= 0) {
if (FD_ISSET(threadCtx->fwdCtx.listenFd, &readFds)) {
#ifdef SHELL_DEBUG
printf("accepting fwd connection\n");
#endif
fwdFd = accept(fwdListenFd, NULL, NULL);
fwdFd = accept(threadCtx->fwdCtx.listenFd, NULL, NULL);
if (fwdFd == -1) {
rc = errno;
if (rc != SOCKET_EWOULDBLOCK) {
Expand Down
Loading
Loading