jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xrdp: don't show connection log unless there is a problem

Browse Source
This commit is contained in:
Jay Sorg 2014-05-18 23:12:14 -07:00
parent 954ed3d681
commit 20124043a6
3 changed files with 29 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xrdp/xrdp.h
View File

@ -137,6 +137,8 @@ callback(long id, int msg, long param1, long param2, long param3, long param4);
int APP_CC int APP_CC
xrdp_wm_delete_all_childs(struct xrdp_wm* self); xrdp_wm_delete_all_childs(struct xrdp_wm* self);
int APP_CC int APP_CC
xrdp_wm_show_log(struct xrdp_wm *self);
int APP_CC
xrdp_wm_log_msg(struct xrdp_wm* self, char* msg); xrdp_wm_log_msg(struct xrdp_wm* self, char* msg);
int APP_CC int APP_CC
xrdp_wm_get_wait_objs(struct xrdp_wm* self, tbus* robjs, int* rc, xrdp_wm_get_wait_objs(struct xrdp_wm* self, tbus* robjs, int* rc,

16
xrdp/xrdp_mm.c
View File

@ -68,8 +68,7 @@ xrdp_mm_sync_load(long param1, long param2)
static void APP_CC static void APP_CC
xrdp_mm_module_cleanup(struct xrdp_mm *self) xrdp_mm_module_cleanup(struct xrdp_mm *self)
{ {
log_message(LOG_LEVEL_DEBUG,"xrdp_mm_module_cleanup"); log_message(LOG_LEVEL_DEBUG, "xrdp_mm_module_cleanup");
if (self->mod != 0) if (self->mod != 0)
{ {
if (self->mod_exit != 0) if (self->mod_exit != 0)
@ -92,6 +91,14 @@ xrdp_mm_module_cleanup(struct xrdp_mm *self)
self->mod_exit = 0; self->mod_exit = 0;
self->mod = 0; self->mod = 0;
self->mod_handle = 0; self->mod_handle = 0;
if (self->wm->hide_log_window)
{
/* make sure autologin is off */
self->wm->session->client_info->rdp_autologin = 0;
xrdp_wm_set_login_mode(self->wm, 0); /* reset session */
}
} }
/*****************************************************************************/ /*****************************************************************************/
@ -526,6 +533,10 @@ xrdp_mm_setup_mod2(struct xrdp_mm *self)
{ {
rv = 0; /* connect success */ rv = 0; /* connect success */
} }
else
{
xrdp_wm_show_log(self->wm);
}
} }
if (rv == 0) if (rv == 0)
@ -1176,6 +1187,7 @@ xrdp_mm_process_login_response(struct xrdp_mm *self, struct stream *s)
"login failed"); "login failed");
log_message(LOG_LEVEL_INFO,"xrdp_mm_process_login_response: " log_message(LOG_LEVEL_INFO,"xrdp_mm_process_login_response: "
"login failed"); "login failed");
xrdp_wm_show_log(self->wm);
} }
cleanup_sesman_connection(self); cleanup_sesman_connection(self);

17
xrdp/xrdp_wm.c
View File

@ -1825,7 +1825,7 @@ void add_string_to_logwindow(char *msg, struct list *log)
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
xrdp_wm_log_msg(struct xrdp_wm *self, char *msg) xrdp_wm_show_log(struct xrdp_wm *self)
{ {
struct xrdp_bitmap *but; struct xrdp_bitmap *but;
int w; int w;
@ -1835,11 +1835,12 @@ xrdp_wm_log_msg(struct xrdp_wm *self, char *msg)
if (self->hide_log_window) if (self->hide_log_window)
{ {
/* make sure autologin is off */
self->session->client_info->rdp_autologin = 0;
xrdp_wm_set_login_mode(self, 0); /* reset session */
return 0; return 0;
} }
add_string_to_logwindow(msg, self->log);
if (self->log_wnd == 0) if (self->log_wnd == 0)
{ {
w = DEFAULT_WND_LOG_W; w = DEFAULT_WND_LOG_W;
@ -1886,7 +1887,15 @@ xrdp_wm_log_msg(struct xrdp_wm *self, char *msg)
xrdp_wm_set_focused(self, self->log_wnd); xrdp_wm_set_focused(self, self->log_wnd);
xrdp_bitmap_invalidate(self->log_wnd, 0); xrdp_bitmap_invalidate(self->log_wnd, 0);
g_sleep(100);
return 0;
}
/*****************************************************************************/
int APP_CC
xrdp_wm_log_msg(struct xrdp_wm *self, char *msg)
{
add_string_to_logwindow(msg, self->log);
return 0; return 0;
} }