From 6a22968b8746d49208d078696706cd9e7efa861e Mon Sep 17 00:00:00 2001 From: Chris Conlon Date: Mon, 9 Apr 2018 16:24:32 -0600 Subject: [PATCH] enable compilation of example server by default --- examples/include.am | 1 + examples/server/include.am | 14 +++++++------- examples/server/server.c | 1 + 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/examples/include.am b/examples/include.am index 5bf75ee..e79244e 100644 --- a/examples/include.am +++ b/examples/include.am @@ -3,4 +3,5 @@ # All paths should be given relative to the root include examples/client/include.am +include examples/server/include.am include examples/echoserver/include.am diff --git a/examples/server/include.am b/examples/server/include.am index c59baee..c9bd89e 100644 --- a/examples/server/include.am +++ b/examples/server/include.am @@ -1,12 +1,12 @@ # vim:ft=automake # All paths should be given relative to the root -#noinst_PROGRAMS += examples/server/server -#examples_server_server_SOURCES = examples/server/server.c -#examples_server_server_LDADD = src/libwolfssh.la -#examples_server_server_DEPENDENCIES = src/libwolfssh.la -# -#dist_example_DATA+= examples/server/server.c -#DISTCLEANFILES+= examples/server/.libs/server +noinst_PROGRAMS += examples/server/server +examples_server_server_SOURCES = examples/server/server.c +examples_server_server_LDADD = src/libwolfssh.la +examples_server_server_DEPENDENCIES = src/libwolfssh.la + +dist_example_DATA+= examples/server/server.c +DISTCLEANFILES+= examples/server/.libs/server EXTRA_DIST+= examples/server/server.c diff --git a/examples/server/server.c b/examples/server/server.c index afec647..46abcb2 100644 --- a/examples/server/server.c +++ b/examples/server/server.c @@ -162,6 +162,7 @@ static THREAD_RETURN WOLFSSH_THREAD server_worker(void* vArgs) free(buf); } + wolfSSH_stream_exit(threadCtx->ssh, 0); WCLOSESOCKET(threadCtx->fd); wolfSSH_free(threadCtx->ssh); free(threadCtx);