From 148afd11700aedcd23cee8a6dc2196f94a8fc7b6 Mon Sep 17 00:00:00 2001 From: Pavel Roskin Date: Sat, 18 Mar 2017 10:15:50 -0700 Subject: [PATCH] Rename file_loc.h to xrdp_sockets.h, install it Include xrdp_sockets.h directly, not through headers. --- common/Makefile.am | 4 ++-- common/{file_loc.h => xrdp_sockets.h} | 6 +++--- libxrdp/libxrdp.h | 1 - sesman/chansrv/chansrv.c | 2 +- sesman/chansrv/pulse/module-xrdp-sink.c | 2 +- sesman/chansrv/pulse/module-xrdp-source.c | 2 +- sesman/chansrv/sound.c | 2 +- sesman/sesman.h | 1 - sesman/session.c | 1 + sesman/tools/dis.c | 2 +- xrdp/xrdp.h | 1 - xrdp/xrdp_mm.c | 1 + xrdpapi/xrdpapi.c | 2 +- 13 files changed, 13 insertions(+), 14 deletions(-) rename common/{file_loc.h => xrdp_sockets.h} (91%) diff --git a/common/Makefile.am b/common/Makefile.am index dab9d524..bfccca90 100644 --- a/common/Makefile.am +++ b/common/Makefile.am @@ -9,7 +9,8 @@ EXTRA_DIST = pixman-region.c include_HEADERS = \ xrdp_client_info.h \ xrdp_constants.h \ - xrdp_rail.h + xrdp_rail.h \ + xrdp_sockets.h AM_CPPFLAGS = \ -DXRDP_CFG_PATH=\"${sysconfdir}/xrdp\" \ @@ -36,7 +37,6 @@ libcommon_la_SOURCES = \ fifo.h \ file.c \ file.h \ - file_loc.h \ list.c \ list.h \ list16.c \ diff --git a/common/file_loc.h b/common/xrdp_sockets.h similarity index 91% rename from common/file_loc.h rename to common/xrdp_sockets.h index 45178964..92be08ae 100644 --- a/common/file_loc.h +++ b/common/xrdp_sockets.h @@ -15,11 +15,11 @@ * See the License for the specific language governing permissions and * limitations under the License. * - * default file locations for log, config, etc + * names of UNIX sockets for inter-process communication */ -#if !defined(FILE_LOC_H) -#define FILE_LOC_H +#if !defined(XRDP_SOCKETS_H) +#define XRDP_SOCKETS_H #define XRDP_CHANSRV_STR XRDP_SOCKET_PATH "/xrdp_chansrv_socket_%d" #define CHANSRV_PORT_OUT_STR XRDP_SOCKET_PATH "/xrdp_chansrv_audio_out_socket_%d" diff --git a/libxrdp/libxrdp.h b/libxrdp/libxrdp.h index 1e0f7c96..0ac5f635 100644 --- a/libxrdp/libxrdp.h +++ b/libxrdp/libxrdp.h @@ -31,7 +31,6 @@ #include "list.h" #include "file.h" #include "libxrdpinc.h" -#include "file_loc.h" #include "xrdp_client_info.h" diff --git a/sesman/chansrv/chansrv.c b/sesman/chansrv/chansrv.c index 6734b8dd..49b11448 100644 --- a/sesman/chansrv/chansrv.c +++ b/sesman/chansrv/chansrv.c @@ -32,12 +32,12 @@ #include "devredir.h" #include "list.h" #include "file.h" -#include "file_loc.h" #include "log.h" #include "rail.h" #include "xcommon.h" #include "chansrv_fuse.h" #include "drdynvc.h" +#include "xrdp_sockets.h" static struct trans *g_lis_trans = 0; static struct trans *g_con_trans = 0; diff --git a/sesman/chansrv/pulse/module-xrdp-sink.c b/sesman/chansrv/pulse/module-xrdp-sink.c index d8c56d1e..3e51940d 100644 --- a/sesman/chansrv/pulse/module-xrdp-sink.c +++ b/sesman/chansrv/pulse/module-xrdp-sink.c @@ -68,7 +68,7 @@ typedef bool pa_bool_t; #endif #include "module-xrdp-sink-symdef.h" -#include "../../../common/file_loc.h" +#include "../../../common/xrdp_sockets.h" PA_MODULE_AUTHOR("Jay Sorg"); PA_MODULE_DESCRIPTION("xrdp sink"); diff --git a/sesman/chansrv/pulse/module-xrdp-source.c b/sesman/chansrv/pulse/module-xrdp-source.c index 22d82bfc..6aa73ecd 100644 --- a/sesman/chansrv/pulse/module-xrdp-source.c +++ b/sesman/chansrv/pulse/module-xrdp-source.c @@ -55,7 +55,7 @@ typedef bool pa_bool_t; #endif #include "module-xrdp-source-symdef.h" -#include "../../../common/file_loc.h" +#include "../../../common/xrdp_sockets.h" PA_MODULE_AUTHOR("Laxmikant Rashinkar"); PA_MODULE_DESCRIPTION("xrdp source"); diff --git a/sesman/chansrv/sound.c b/sesman/chansrv/sound.c index 2958e123..a647b4b6 100644 --- a/sesman/chansrv/sound.c +++ b/sesman/chansrv/sound.c @@ -31,7 +31,7 @@ #include "thread_calls.h" #include "defines.h" #include "fifo.h" -#include "file_loc.h" +#include "xrdp_sockets.h" #include "chansrv_common.h" #if defined(XRDP_OPUS) diff --git a/sesman/sesman.h b/sesman/sesman.h index 576a28e8..eb0dc21f 100644 --- a/sesman/sesman.h +++ b/sesman/sesman.h @@ -31,7 +31,6 @@ #include "parse.h" #include "os_calls.h" #include "log.h" -#include "file_loc.h" #include "env.h" #include "auth.h" #include "config.h" diff --git a/sesman/session.c b/sesman/session.c index aefcd258..0b8bb6ac 100644 --- a/sesman/session.c +++ b/sesman/session.c @@ -40,6 +40,7 @@ #include "sesman.h" #include "libscp_types.h" #include "xauth.h" +#include "xrdp_sockets.h" #ifndef PR_SET_NO_NEW_PRIVS #define PR_SET_NO_NEW_PRIVS 38 diff --git a/sesman/tools/dis.c b/sesman/tools/dis.c index 61f2bea2..408027ca 100644 --- a/sesman/tools/dis.c +++ b/sesman/tools/dis.c @@ -27,7 +27,7 @@ #include #include -#include "file_loc.h" +#include "xrdp_sockets.h" int main(int argc, char **argv) { diff --git a/xrdp/xrdp.h b/xrdp/xrdp.h index fa65219e..82e8a578 100644 --- a/xrdp/xrdp.h +++ b/xrdp/xrdp.h @@ -32,7 +32,6 @@ #include "ssl_calls.h" #include "thread_calls.h" #include "file.h" -#include "file_loc.h" #include "xrdp_client_info.h" #include "log.h" diff --git a/xrdp/xrdp_mm.c b/xrdp/xrdp_mm.c index 74f54dbe..ba4227c2 100644 --- a/xrdp/xrdp_mm.c +++ b/xrdp/xrdp_mm.c @@ -35,6 +35,7 @@ #endif /* USE_NOPAM */ #include "xrdp_encoder.h" +#include "xrdp_sockets.h" #define LLOG_LEVEL 1 #define LLOGLN(_level, _args) \ diff --git a/xrdpapi/xrdpapi.c b/xrdpapi/xrdpapi.c index d5666aa0..e6242bec 100644 --- a/xrdpapi/xrdpapi.c +++ b/xrdpapi/xrdpapi.c @@ -39,7 +39,7 @@ #include #include -#include "file_loc.h" +#include "xrdp_sockets.h" #include "xrdpapi.h" struct wts_obj