diff options
| author | Pavel Roskin <plroskin@gmail.com> | 2016-06-21 16:30:15 -0700 |
|---|---|---|
| committer | Pavel Roskin <plroskin@gmail.com> | 2016-06-21 16:30:15 -0700 |
| commit | be1d034f91a998ecbcd6a4d06c88b6ca79aff901 (patch) | |
| tree | 121041b99a776085a7064301e3cb20b3abc762c7 | |
| parent | a77ae440a782b5b11048e9aa35adfa7a60f1a4e4 (diff) | |
| download | xrdp-proprietary-be1d034f91a998ecbcd6a4d06c88b6ca79aff901.tar.gz xrdp-proprietary-be1d034f91a998ecbcd6a4d06c88b6ca79aff901.zip | |
Report pid and listening address/port for xrdp and xrdp-sesman
For xrdp-sesman, don't report that the daemon is listening to a port if
it fails to attach to that port. Don't use LOG_LEVEL_ALWAYS for startup
message, it's not a critical error.
| -rw-r--r-- | sesman/sesman.c | 9 | ||||
| -rw-r--r-- | xrdp/xrdp.c | 1 | ||||
| -rw-r--r-- | xrdp/xrdp_listen.c | 2 |
3 files changed, 7 insertions, 5 deletions
diff --git a/sesman/sesman.c b/sesman/sesman.c index 64728376..828524fa 100644 --- a/sesman/sesman.c +++ b/sesman/sesman.c @@ -49,9 +49,6 @@ sesman_main_loop(void) tbus sck_obj; tbus robjs[8]; - /*main program loop*/ - log_message(LOG_LEVEL_INFO, "listening..."); - g_sck = g_tcp_socket(); if (g_sck < 0) { @@ -68,6 +65,8 @@ sesman_main_loop(void) if (error == 0) { + log_message(LOG_LEVEL_INFO, "listening to port %s on %s", + g_cfg->listen_port, g_cfg->listen_address); sck_obj = g_create_wait_obj_from_socket(g_sck, 0); cont = 1; @@ -359,8 +358,8 @@ main(int argc, char **argv) } /* start program main loop */ - log_message(LOG_LEVEL_ALWAYS, - "starting sesman with pid %d", g_pid); + log_message(LOG_LEVEL_INFO, + "starting xrdp-sesman with pid %d", g_pid); /* make sure the /tmp/.X11-unix directory exist */ if (!g_directory_exist("/tmp/.X11-unix")) diff --git a/xrdp/xrdp.c b/xrdp/xrdp.c index 740b0e1c..b55a90cc 100644 --- a/xrdp/xrdp.c +++ b/xrdp/xrdp.c @@ -597,6 +597,7 @@ main(int argc, char **argv) g_sync_mutex = tc_mutex_create(); g_sync1_mutex = tc_mutex_create(); pid = g_getpid(); + log_message(LOG_LEVEL_INFO, "starting xrdp with pid %d", pid); g_snprintf(text, 255, "xrdp_%8.8x_main_term", pid); g_term_event = g_create_wait_obj(text); diff --git a/xrdp/xrdp_listen.c b/xrdp/xrdp_listen.c index b2b19ca2..4e9a58c6 100644 --- a/xrdp/xrdp_listen.c +++ b/xrdp/xrdp_listen.c @@ -370,6 +370,8 @@ xrdp_listen_main_loop(struct xrdp_listen *self) if (error == 0) { + log_message(LOG_LEVEL_INFO, "listening to port %s on %s", + port, address); if (tcp_nodelay) { if (g_tcp_set_no_delay(self->listen_trans->sck)) |