From 683864349440ab0b90193df5bc6d1a863056ab36 Mon Sep 17 00:00:00 2001 From: matt335672 <30179339+matt335672@users.noreply.github.com> Date: Wed, 11 May 2022 13:39:41 +0100 Subject: [PATCH] Log connected client version --- libxrdp/xrdp_sec.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c index 1795dcff..bde7d3fa 100644 --- a/libxrdp/xrdp_sec.c +++ b/libxrdp/xrdp_sec.c @@ -1944,6 +1944,7 @@ xrdp_sec_send_fastpath(struct xrdp_sec *self, struct stream *s) static int xrdp_sec_process_mcs_data_CS_CORE(struct xrdp_sec *self, struct stream *s) { + int version; int colorDepth; int postBeta2ColorDepth; int highColorDepth; @@ -1951,8 +1952,10 @@ xrdp_sec_process_mcs_data_CS_CORE(struct xrdp_sec *self, struct stream *s) int earlyCapabilityFlags; char clientName[INFO_CLIENT_NAME_BYTES / 2] = { '\0' }; + UNUSED_VAR(version); + /* TS_UD_CS_CORE requiered fields */ - in_uint8s(s, 4); /* version */ + in_uint32_le(s, version); in_uint16_le(s, self->rdp_layer->client_info.display_sizes.session_width); in_uint16_le(s, self->rdp_layer->client_info.display_sizes.session_height); in_uint16_le(s, colorDepth); @@ -1975,12 +1978,13 @@ xrdp_sec_process_mcs_data_CS_CORE(struct xrdp_sec *self, struct stream *s) in_uint8s(s, 4); /* keyboardFunctionKey */ in_uint8s(s, 64); /* imeFileName */ LOG_DEVEL(LOG_LEVEL_TRACE, "Received [MS-RDPBCGR] TS_UD_CS_CORE " - " version (ignored), desktopWidth %d, " + " version %08x, desktopWidth %d, " "desktopHeight %d, colorDepth %s, SASSequence (ingored), " "keyboardLayout (ignored), clientBuild (ignored), " "clientName %s, keyboardType (ignored), " "keyboardSubType (ignored), keyboardFunctionKey (ignored), " - "imeFileName (ignroed)", + "imeFileName (ignored)", + version, self->rdp_layer->client_info.display_sizes.session_width, self->rdp_layer->client_info.display_sizes.session_height, (colorDepth == 0xca00 ? "RNS_UD_COLOR_4BPP" :