diff options
| author | Koichiro IWAO <meta@vmeta.jp> | 2017-05-08 11:57:04 +0900 |
|---|---|---|
| committer | metalefty <meta@vmeta.jp> | 2017-05-16 10:41:06 +0900 |
| commit | c7f8e360fdb83976fde7e197c39fe4d52038be5a (patch) | |
| tree | 61252b7b9438c037b9c78007552d58b130ae8e30 /common | |
| parent | 2c96908ea500880c71d3593dd2b2b5b5275bdbf5 (diff) | |
| download | xrdp-proprietary-c7f8e360fdb83976fde7e197c39fe4d52038be5a.tar.gz xrdp-proprietary-c7f8e360fdb83976fde7e197c39fe4d52038be5a.zip | |
common: separate sockets macros into basename and fullpath
since sometimes socket directory is obtained from environment variable.
Diffstat (limited to 'common')
| -rw-r--r-- | common/xrdp_sockets.h | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/common/xrdp_sockets.h b/common/xrdp_sockets.h index 92be08ae..1a625ef7 100644 --- a/common/xrdp_sockets.h +++ b/common/xrdp_sockets.h @@ -21,11 +21,20 @@ #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" -#define CHANSRV_PORT_IN_STR XRDP_SOCKET_PATH "/xrdp_chansrv_audio_in_socket_%d" -#define CHANSRV_API_STR XRDP_SOCKET_PATH "/xrdpapi_%d" -#define XRDP_X11RDP_STR XRDP_SOCKET_PATH "/xrdp_display_%d" -#define XRDP_DISCONNECT_STR XRDP_SOCKET_PATH "/xrdp_disconnect_display_%d" +/* basename of socket files */ +#define XRDP_CHANSRV_BASE_STR "xrdp_chansrv_socket_%d" +#define CHANSRV_PORT_OUT_BASE_STR "xrdp_chansrv_audio_out_socket_%d" +#define CHANSRV_PORT_IN_BASE_STR "xrdp_chansrv_audio_in_socket_%d" +#define CHANSRV_API_BASE_STR "xrdpapi_%d" +#define XRDP_X11RDP_BASE_STR "xrdp_display_%d" +#define XRDP_DISCONNECT_BASE_STR "xrdp_disconnect_display_%d" + +/* fullpath of sockets */ +#define XRDP_CHANSRV_STR XRDP_SOCKET_PATH "/" XRDP_CHANSRV_BASE_STR +#define CHANSRV_PORT_OUT_STR XRDP_SOCKET_PATH "/" CHANSRV_PORT_OUT_BASE_STR +#define CHANSRV_PORT_IN_STR XRDP_SOCKET_PATH "/" CHANSRV_PORT_IN_BASE_STR +#define CHANSRV_API_STR XRDP_SOCKET_PATH "/" CHANSRV_API_BASE_STR +#define XRDP_X11RDP_STR XRDP_SOCKET_PATH "/" XRDP_X11RDP_BASE_STR +#define XRDP_DISCONNECT_STR XRDP_SOCKET_PATH "/" XRDP_DISCONNECT_BASE_STR #endif |