Skip to content
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.

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

Echoserver Refresh #712

Merged
merged 2 commits into from
Jun 21, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ AM_CONDITIONAL([BUILD_KEYGEN],[test "x$ENABLED_KEYGEN" = "xyes"])
AM_CONDITIONAL([BUILD_SCP],[test "x$ENABLED_SCP" = "xyes"])
AM_CONDITIONAL([BUILD_SFTP],[test "x$ENABLED_SFTP" = "xyes"])
AM_CONDITIONAL([BUILD_FWD],[test "x$ENABLED_FWD" = "xyes"])
AM_CONDITIONAL([BUILD_TERM],[test "x$ENABLED_TERM" = "xyes"])
AM_CONDITIONAL([BUILD_TERM],[test "x$ENABLED_PTERM" = "xyes"])
AM_CONDITIONAL([BUILD_SHELL],[test "x$ENABLED_SHELL" = "xyes"])
AM_CONDITIONAL([BUILD_AGENT],[test "x$ENABLED_AGENT" = "xyes"])
AM_CONDITIONAL([BUILD_SSHD],[test "x$ENABLED_SSHD" = "xyes"])
Expand Down
19 changes: 19 additions & 0 deletions examples/echoserver/echoserver.c
Original file line number Diff line number Diff line change
Expand Up @@ -864,6 +864,25 @@ static int ssh_worker(thread_ctx_t* threadCtx)
ChildRunning = 1;
#endif

#if defined(WOLFSSH_TERM) && defined(WOLFSSH_SHELL)
/* set initial size of terminal based on saved size */
#if defined(HAVE_SYS_IOCTL_H)
wolfSSH_DoModes(ssh->modes, ssh->modesSz, childFd);
{
struct winsize s = {0};

s.ws_col = ssh->widthChar;
s.ws_row = ssh->heightRows;
s.ws_xpixel = ssh->widthPixels;
s.ws_ypixel = ssh->heightPixels;

ioctl(childFd, TIOCSWINSZ, &s);
}
#endif /* HAVE_SYS_IOCTL_H */

wolfSSH_SetTerminalResizeCtx(ssh, (void*)&childFd);
#endif /* WOLFSSH_TERM && WOLFSSH_SHELL */

while (ChildRunning) {
fd_set readFds;
WS_SOCKET_T maxFd;
Expand Down
2 changes: 1 addition & 1 deletion examples/echoserver/include.am
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ examples_echoserver_echoserver_SOURCES = examples/echoserver/echoserver.c \
examples/echoserver/echoserver.h
examples_echoserver_echoserver_LDADD = src/libwolfssh.la
examples_echoserver_echoserver_DEPENDENCIES = src/libwolfssh.la
examples_echoserver_echoserver_CFLAGS = $(AM_CFLAGS)
examples_echoserver_echoserver_CFLAGS = $(AM_CFLAGS) ${AM_CPPFLAGS}
endif
9 changes: 9 additions & 0 deletions tests/include.am
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ endif
if BUILD_SFTP
tests_unit_test_CPPFLAGS += -DWOLFSSH_SFTP
endif
if BUILD_TERM
tests_unit_test_CPPFLAGS += -DWOLFSSH_TERM
endif
if BUILD_SHELL
tests_unit_test_CPPFLAGS += -DWOLFSSH_SHELL
endif
Expand Down Expand Up @@ -45,6 +48,9 @@ endif
if BUILD_SFTP
tests_api_test_CPPFLAGS += -DWOLFSSH_SFTP
endif
if BUILD_TERM
tests_api_test_CPPFLAGS += -DWOLFSSH_TERM
endif
if BUILD_SHELL
tests_api_test_CPPFLAGS += -DWOLFSSH_SHELL
endif
Expand Down Expand Up @@ -77,6 +83,9 @@ endif
if BUILD_SFTP
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_SFTP
endif
if BUILD_TERM
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_TERM
endif
if BUILD_SHELL
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_SHELL
endif
Expand Down
Loading