From 16fe9a021a573eb7160abc721a588b9c8acb321c Mon Sep 17 00:00:00 2001 From: Alexandre Quesnel <131881+aquesnel@users.noreply.github.com> Date: Fri, 26 Mar 2021 01:31:54 +0000 Subject: [PATCH] Moving gtcp_proxy and tcp_proxy to the tools/devel directory --- .gitignore | 2 +- Makefile.am | 3 ++- README.md | 10 +++++++++- configure.ac | 4 +++- tests/Makefile.am | 4 +--- tools/Makefile.am | 3 +++ tools/devel/Makefile.am | 6 ++++++ {tests => tools/devel}/gtcp_proxy/Makefile | 0 {tests => tools/devel}/gtcp_proxy/README.txt | 0 {tests => tools/devel}/gtcp_proxy/gtcp-proxy.c | 0 {tests => tools/devel}/gtcp_proxy/gtcp.c | 0 {tests => tools/devel}/gtcp_proxy/gtcp.h | 0 {tests => tools/devel}/gtcp_proxy/hexdump.c | 0 {tests => tools/devel}/tcp_proxy/Makefile.am | 0 {tests => tools/devel}/tcp_proxy/main.c | 0 15 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 tools/Makefile.am create mode 100644 tools/devel/Makefile.am rename {tests => tools/devel}/gtcp_proxy/Makefile (100%) rename {tests => tools/devel}/gtcp_proxy/README.txt (100%) rename {tests => tools/devel}/gtcp_proxy/gtcp-proxy.c (100%) rename {tests => tools/devel}/gtcp_proxy/gtcp.c (100%) rename {tests => tools/devel}/gtcp_proxy/gtcp.h (100%) rename {tests => tools/devel}/gtcp_proxy/hexdump.c (100%) rename {tests => tools/devel}/tcp_proxy/Makefile.am (100%) rename {tests => tools/devel}/tcp_proxy/main.c (100%) diff --git a/.gitignore b/.gitignore index d67e3a22..4df75090 100644 --- a/.gitignore +++ b/.gitignore @@ -44,7 +44,7 @@ sesman/sesman.ini stamp-h1 test-driver tests/memtest/memtest -tests/tcp_proxy/tcp_proxy +tools/devel/tcp_proxy/tcp_proxy *.trs xrdp/xrdp xrdp/xrdp.ini diff --git a/Makefile.am b/Makefile.am index 7db0ce27..67139fae 100644 --- a/Makefile.am +++ b/Makefile.am @@ -64,7 +64,8 @@ SUBDIRS = \ xrdpapi \ pkgconfig \ $(XRDPVRDIR) \ - tests + tests \ + tools distclean-local: -rm -f xrdp_configure_options.h diff --git a/README.md b/README.md index 42436ac7..fa2e445a 100644 --- a/README.md +++ b/README.md @@ -128,9 +128,17 @@ xrdp ├── mc ·········· media center module ├── neutrinordp · RDP client module for proxying RDP connections using NeutrinoRDP ├── pkgconfig ··· pkg-config configuration -├── sesman ······ session manager for xrdp +├── scripts ····· build scripts +├┬─ sesman ······ session manager for xrdp +|├── chansrv ···· channel server for xrdp +|├── libscp ····· authorization library +|└── tools ······ session management tools for sys admins ├── tcutils ····· QT based utility program for thin clients ├── tests ······· tests for the code +├┬─ tools ······· tools +|└┬─ devel ······ development tools +| ├── gtcp_proxy GTK app that forwards TCP connections to a remote host +| └── tcp_proxy · CLI app that forwards TCP connections to a remote host ├── vnc ········· VNC client module for xrdp ├── vrplayer ···· QT player redirecting video/audio to clients over xrdpvr channel ├── xrdp ········ main server code diff --git a/configure.ac b/configure.ac index e58441df..c4a4d51f 100644 --- a/configure.ac +++ b/configure.ac @@ -399,7 +399,9 @@ AC_CONFIG_FILES([ sesman/tools/Makefile tests/Makefile tests/memtest/Makefile - tests/tcp_proxy/Makefile + tools/Makefile + tools/devel/Makefile + tools/devel/tcp_proxy/Makefile vnc/Makefile xrdpapi/Makefile xrdp/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index 4ea4b584..727cf3c9 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,8 +1,6 @@ EXTRA_DIST = \ - gtcp_proxy \ readme.txt SUBDIRS = \ - memtest \ - tcp_proxy + memtest diff --git a/tools/Makefile.am b/tools/Makefile.am new file mode 100644 index 00000000..c4f7c462 --- /dev/null +++ b/tools/Makefile.am @@ -0,0 +1,3 @@ + +SUBDIRS = \ + devel diff --git a/tools/devel/Makefile.am b/tools/devel/Makefile.am new file mode 100644 index 00000000..f8226a73 --- /dev/null +++ b/tools/devel/Makefile.am @@ -0,0 +1,6 @@ + +EXTRA_DIST = \ + gtcp_proxy + +SUBDIRS = \ + tcp_proxy diff --git a/tests/gtcp_proxy/Makefile b/tools/devel/gtcp_proxy/Makefile similarity index 100% rename from tests/gtcp_proxy/Makefile rename to tools/devel/gtcp_proxy/Makefile diff --git a/tests/gtcp_proxy/README.txt b/tools/devel/gtcp_proxy/README.txt similarity index 100% rename from tests/gtcp_proxy/README.txt rename to tools/devel/gtcp_proxy/README.txt diff --git a/tests/gtcp_proxy/gtcp-proxy.c b/tools/devel/gtcp_proxy/gtcp-proxy.c similarity index 100% rename from tests/gtcp_proxy/gtcp-proxy.c rename to tools/devel/gtcp_proxy/gtcp-proxy.c diff --git a/tests/gtcp_proxy/gtcp.c b/tools/devel/gtcp_proxy/gtcp.c similarity index 100% rename from tests/gtcp_proxy/gtcp.c rename to tools/devel/gtcp_proxy/gtcp.c diff --git a/tests/gtcp_proxy/gtcp.h b/tools/devel/gtcp_proxy/gtcp.h similarity index 100% rename from tests/gtcp_proxy/gtcp.h rename to tools/devel/gtcp_proxy/gtcp.h diff --git a/tests/gtcp_proxy/hexdump.c b/tools/devel/gtcp_proxy/hexdump.c similarity index 100% rename from tests/gtcp_proxy/hexdump.c rename to tools/devel/gtcp_proxy/hexdump.c diff --git a/tests/tcp_proxy/Makefile.am b/tools/devel/tcp_proxy/Makefile.am similarity index 100% rename from tests/tcp_proxy/Makefile.am rename to tools/devel/tcp_proxy/Makefile.am diff --git a/tests/tcp_proxy/main.c b/tools/devel/tcp_proxy/main.c similarity index 100% rename from tests/tcp_proxy/main.c rename to tools/devel/tcp_proxy/main.c