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

Merge pull request #712 from ejohnstown/echo-refresh 

Echoserver Refresh
pull/714/head
JacobBarthelmeh 2024-06-21 09:25:51 -06:00 committed by GitHub
parent 93853aead0 63a3068dc7
commit 523c8908d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -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_SCP],[test "x$ENABLED_SCP" = "xyes"])
AM_CONDITIONAL([BUILD_SFTP],[test "x$ENABLED_SFTP" = "xyes"]) AM_CONDITIONAL([BUILD_SFTP],[test "x$ENABLED_SFTP" = "xyes"])
AM_CONDITIONAL([BUILD_FWD],[test "x$ENABLED_FWD" = "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_SHELL],[test "x$ENABLED_SHELL" = "xyes"])
AM_CONDITIONAL([BUILD_AGENT],[test "x$ENABLED_AGENT" = "xyes"]) AM_CONDITIONAL([BUILD_AGENT],[test "x$ENABLED_AGENT" = "xyes"])
AM_CONDITIONAL([BUILD_SSHD],[test "x$ENABLED_SSHD" = "xyes"]) AM_CONDITIONAL([BUILD_SSHD],[test "x$ENABLED_SSHD" = "xyes"])

19
examples/echoserver/echoserver.c
View File

@ -864,6 +864,25 @@ static int ssh_worker(thread_ctx_t* threadCtx)
ChildRunning = 1; ChildRunning = 1;
#endif #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) { while (ChildRunning) {
fd_set readFds; fd_set readFds;
WS_SOCKET_T maxFd; WS_SOCKET_T maxFd;

2
examples/echoserver/include.am
View File

@ -7,5 +7,5 @@ examples_echoserver_echoserver_SOURCES = examples/echoserver/echoserver.c \
examples/echoserver/echoserver.h examples/echoserver/echoserver.h
examples_echoserver_echoserver_LDADD = src/libwolfssh.la examples_echoserver_echoserver_LDADD = src/libwolfssh.la
examples_echoserver_echoserver_DEPENDENCIES = 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 endif

9
tests/include.am
View File

@ -18,6 +18,9 @@ endif
if BUILD_SFTP if BUILD_SFTP
tests_unit_test_CPPFLAGS += -DWOLFSSH_SFTP tests_unit_test_CPPFLAGS += -DWOLFSSH_SFTP
endif endif
if BUILD_TERM
tests_unit_test_CPPFLAGS += -DWOLFSSH_TERM
endif
if BUILD_SHELL if BUILD_SHELL
tests_unit_test_CPPFLAGS += -DWOLFSSH_SHELL tests_unit_test_CPPFLAGS += -DWOLFSSH_SHELL
endif endif
@ -45,6 +48,9 @@ endif
if BUILD_SFTP if BUILD_SFTP
tests_api_test_CPPFLAGS += -DWOLFSSH_SFTP tests_api_test_CPPFLAGS += -DWOLFSSH_SFTP
endif endif
if BUILD_TERM
tests_api_test_CPPFLAGS += -DWOLFSSH_TERM
endif
if BUILD_SHELL if BUILD_SHELL
tests_api_test_CPPFLAGS += -DWOLFSSH_SHELL tests_api_test_CPPFLAGS += -DWOLFSSH_SHELL
endif endif
@ -77,6 +83,9 @@ endif
if BUILD_SFTP if BUILD_SFTP
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_SFTP tests_testsuite_test_CPPFLAGS += -DWOLFSSH_SFTP
endif endif
if BUILD_TERM
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_TERM
endif
if BUILD_SHELL if BUILD_SHELL
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_SHELL tests_testsuite_test_CPPFLAGS += -DWOLFSSH_SHELL
endif endif