diff options
Diffstat (limited to 'libxrdp')
| -rw-r--r-- | libxrdp/Makefile.am | 2 | ||||
| -rw-r--r-- | libxrdp/libxrdp.c | 2 | ||||
| -rw-r--r-- | libxrdp/xrdp_mcs.c | 2 | ||||
| -rw-r--r-- | libxrdp/xrdp_orders.c | 1 | ||||
| -rw-r--r-- | libxrdp/xrdp_rdp.c | 6 |
5 files changed, 9 insertions, 4 deletions
diff --git a/libxrdp/Makefile.am b/libxrdp/Makefile.am index 11d1d836..0bf6f2e2 100644 --- a/libxrdp/Makefile.am +++ b/libxrdp/Makefile.am @@ -13,7 +13,7 @@ endif if XRDP_FREERDP1 EXTRA_DEFINES += -DXRDP_FREERDP1 -EXTRA_LIBS += -lfreerdp-codec -lfreerdp-utils +EXTRA_LIBS += $(FREERDP_LIBS) endif if XRDP_JPEG diff --git a/libxrdp/libxrdp.c b/libxrdp/libxrdp.c index a391b93b..d4c9d372 100644 --- a/libxrdp/libxrdp.c +++ b/libxrdp/libxrdp.c @@ -744,6 +744,7 @@ libxrdp_query_channel(struct xrdp_session *session, int index, if (index < 0 || index >= count) { + DEBUG(("libxrdp_query_channel - Channel out of range %d", index)); return 1; } @@ -760,6 +761,7 @@ libxrdp_query_channel(struct xrdp_session *session, int index, if (channel_name != 0) { g_strncpy(channel_name, channel_item->name, 8); + DEBUG(("libxrdp_query_channel - Channel %d name %s", index, channel_name)); } if (channel_flags != 0) diff --git a/libxrdp/xrdp_mcs.c b/libxrdp/xrdp_mcs.c index a2793960..77c0d10d 100644 --- a/libxrdp/xrdp_mcs.c +++ b/libxrdp/xrdp_mcs.c @@ -144,9 +144,9 @@ xrdp_mcs_recv(struct xrdp_mcs *self, struct stream *s, int *chan) /* this is channels getting added from the client */ if (appid == MCS_CJRQ) { - g_writeln("channel join request received"); in_uint16_be(s, userid); in_uint16_be(s, chanid); + g_writeln("channel join request received %d:%d", userid, chanid); DEBUG(("xrdp_mcs_recv adding channel %4.4x", chanid)); if (xrdp_mcs_send_cjcf(self, userid, chanid) != 0) diff --git a/libxrdp/xrdp_orders.c b/libxrdp/xrdp_orders.c index a76ecaea..bb95aa71 100644 --- a/libxrdp/xrdp_orders.c +++ b/libxrdp/xrdp_orders.c @@ -2449,6 +2449,7 @@ xrdp_orders_send_create_os_surface(struct xrdp_orders *self, int id, order_flags |= 1 << 2; /* type RDP_ORDER_ALTSEC_CREATE_OFFSCR_BITMAP */ out_uint8(self->out_s, order_flags); cache_id = id & 0x7fff; + LLOGLN(10, ("xrdp_orders_send_create_os_surface: cache_id %d", cache_id)); flags = cache_id; if (num_del_list > 0) diff --git a/libxrdp/xrdp_rdp.c b/libxrdp/xrdp_rdp.c index bf0f8f4e..44a7ac57 100644 --- a/libxrdp/xrdp_rdp.c +++ b/libxrdp/xrdp_rdp.c @@ -77,12 +77,14 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info) values = list_create(); values->auto_free = 1; g_snprintf(cfg_file, 255, "%s/xrdp.ini", XRDP_CFG_PATH); + DEBUG(("cfg_file %s", cfg_file)); file_by_name_read_section(cfg_file, "globals", items, values); for (index = 0; index < items->count; index++) { item = (char *)list_get_item(items, index); value = (char *)list_get_item(values, index); + DEBUG(("item %s value %s", item, value)); if (g_strcasecmp(item, "bitmap_cache") == 0) { @@ -193,7 +195,7 @@ xrdp_rdp_detect_cpu(void) if (edx & (1 << 26)) { - DEBUG("SSE2 detected"); + DEBUG(("SSE2 detected")); cpu_opt |= CPU_SSE2; } @@ -452,7 +454,7 @@ xrdp_rdp_send_data(struct xrdp_rdp *self, struct stream *s, } else { - g_writeln("mppc_encode not ok"); + g_writeln("mppc_encode not ok: type %d flags %d", mppc_enc->protocol_type, mppc_enc->flags); } } |