diff options
| author | Pavel Roskin <plroskin@gmail.com> | 2017-03-14 21:45:50 -0700 |
|---|---|---|
| committer | jsorg71 <jay.sorg@gmail.com> | 2017-03-17 22:25:05 -0700 |
| commit | 58c9cb43e9e83a6f5cc8a13cd84aa67cce8cacd5 (patch) | |
| tree | 4440da8a15401e221175c4b6d3df6c44253e3f2e /sesman/chansrv | |
| parent | fc2572f60b574cf5bc45f1c7b58698681f39ac50 (diff) | |
| download | xrdp-proprietary-58c9cb43e9e83a6f5cc8a13cd84aa67cce8cacd5.tar.gz xrdp-proprietary-58c9cb43e9e83a6f5cc8a13cd84aa67cce8cacd5.zip | |
Make socket directory configurable, don't hardcode /tmp/.xrdp
Use XRDP_SOCKET_PATH in file_loc.h
Don't define any non-socket paths in file_loc.h, they should come from
the makefiles.
Define all paths unconditionally, they should not be defined elsewhere.
Pass XRDP_SOCKET_PATH as environment variable to the backends.
Diffstat (limited to 'sesman/chansrv')
| -rw-r--r-- | sesman/chansrv/Makefile.am | 1 | ||||
| -rw-r--r-- | sesman/chansrv/pulse/module-xrdp-sink.c | 2 | ||||
| -rw-r--r-- | sesman/chansrv/pulse/module-xrdp-source.c | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/sesman/chansrv/Makefile.am b/sesman/chansrv/Makefile.am index 05ca50f5..1df6c762 100644 --- a/sesman/chansrv/Makefile.am +++ b/sesman/chansrv/Makefile.am @@ -9,6 +9,7 @@ AM_CPPFLAGS = \ -DXRDP_SBIN_PATH=\"${sbindir}\" \ -DXRDP_SHARE_PATH=\"${datadir}/xrdp\" \ -DXRDP_PID_PATH=\"${localstatedir}/run\" \ + -DXRDP_SOCKET_PATH=\"${socketdir}\" \ -I$(top_srcdir)/common if XRDP_DEBUG diff --git a/sesman/chansrv/pulse/module-xrdp-sink.c b/sesman/chansrv/pulse/module-xrdp-sink.c index 3e4756eb..f7f98b05 100644 --- a/sesman/chansrv/pulse/module-xrdp-sink.c +++ b/sesman/chansrv/pulse/module-xrdp-sink.c @@ -68,6 +68,7 @@ typedef bool pa_bool_t; #endif #include "module-xrdp-sink-symdef.h" +#include "../common/file_loc.h" PA_MODULE_AUTHOR("Jay Sorg"); PA_MODULE_DESCRIPTION("xrdp sink"); @@ -84,7 +85,6 @@ PA_MODULE_USAGE( #define DEFAULT_SINK_NAME "xrdp-sink" #define BLOCK_USEC 30000 //#define BLOCK_USEC (PA_USEC_PER_SEC * 2) -#define CHANSRV_PORT_STR "/tmp/.xrdp/xrdp_chansrv_audio_out_socket_%d" struct userdata { pa_core *core; diff --git a/sesman/chansrv/pulse/module-xrdp-source.c b/sesman/chansrv/pulse/module-xrdp-source.c index 78124f9d..25cc8e4d 100644 --- a/sesman/chansrv/pulse/module-xrdp-source.c +++ b/sesman/chansrv/pulse/module-xrdp-source.c @@ -55,6 +55,7 @@ typedef bool pa_bool_t; #endif #include "module-xrdp-source-symdef.h" +#include "../common/file_loc.h" PA_MODULE_AUTHOR("Laxmikant Rashinkar"); PA_MODULE_DESCRIPTION("xrdp source"); @@ -72,7 +73,6 @@ PA_MODULE_USAGE( #define DEFAULT_SOURCE_NAME "xrdp-source" #define DEFAULT_LATENCY_TIME 10 #define MAX_LATENCY_USEC 1000 -#define CHANSRV_PORT_STR "/tmp/.xrdp/xrdp_chansrv_audio_in_socket_%d" struct userdata { pa_core *core; |