diff options
| author | Jay Sorg <jay.sorg@gmail.com> | 2017-11-06 16:06:36 -0800 |
|---|---|---|
| committer | jsorg71 <jay.sorg@gmail.com> | 2017-11-07 18:20:45 -0800 |
| commit | 26507644e38906dee9095de29c92d0170c6da92f (patch) | |
| tree | 9253309324433dc08ce71c928456e1de2aa5cd16 /xrdp | |
| parent | 50bd624cc49d7409f6f73b65aeae4cabdec3e7ee (diff) | |
| download | xrdp-proprietary-26507644e38906dee9095de29c92d0170c6da92f.tar.gz xrdp-proprietary-26507644e38906dee9095de29c92d0170c6da92f.zip | |
vsock, move some defines
Diffstat (limited to 'xrdp')
| -rw-r--r-- | xrdp/xrdp_listen.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/xrdp/xrdp_listen.c b/xrdp/xrdp_listen.c index ddfa5b59..259e9e98 100644 --- a/xrdp/xrdp_listen.c +++ b/xrdp/xrdp_listen.c @@ -206,7 +206,6 @@ xrdp_listen_get_port_address(char *port, int port_bytes, } } } -#if defined(XRDP_ENABLE_VSOCK) if (g_strcasecmp(val, "use_vsock") == 0) { val = (char *)list_get_item(values, index); @@ -215,7 +214,6 @@ xrdp_listen_get_port_address(char *port, int port_bytes, *mode = TRANS_MODE_VSOCK; } } -#endif if (g_strcasecmp(val, "address") == 0) { val = (char *)list_get_item(values, index); @@ -381,13 +379,11 @@ xrdp_listen_main_loop(struct xrdp_listen *self) /* not valid with UDS */ tcp_nodelay = 0; } -#if defined(XRDP_ENABLE_VSOCK) else if (self->listen_trans->mode == TRANS_MODE_VSOCK) { /* not valid with VSOCK */ tcp_nodelay = 0; } -#endif /* Create socket */ error = trans_listen_address(self->listen_trans, port, address); @@ -568,6 +564,13 @@ xrdp_listen_main_loop(struct xrdp_listen *self) { log_message(LOG_LEVEL_ERROR,"xrdp_listen_main_loop: listen error, possible port " "already in use"); +#if !defined(XRDP_ENABLE_VSOCK) + if (self->listen_trans->mode == TRANS_MODE_VSOCK) + { + log_message(LOG_LEVEL_ERROR,"xrdp_listen_main_loop: listen error, " + "vsock support not compiled and config requested"); + } +#endif } self->status = -1; |