Decipher remaining capabilitysets sent from rdesktop
This commit is contained in:
Karl Mikaelsson
parent
9ca206bc08
commit
72f63d04ec
35
constants.h
35
constants.h
@ -324,9 +324,21 @@ enum RDP_INPUT_DEVICE
|
||||
#define RDP_CAPSET_COLCACHE 10
|
||||
#define RDP_CAPLEN_COLCACHE 0x08
|
||||
|
||||
#define RDP_CAPSET_SOUND 12
|
||||
#define RDP_CAPLEN_SOUND 8
|
||||
|
||||
#define RDP_CAPSET_INPUT 13
|
||||
#define RDP_CAPLEN_INPUT 88
|
||||
|
||||
#define RDP_CAPSET_FONT 14
|
||||
#define RDP_CAPLEN_FONT 8
|
||||
|
||||
#define RDP_CAPSET_BRUSHCACHE 15
|
||||
#define RDP_CAPLEN_BRUSHCACHE 0x08
|
||||
|
||||
#define RDP_CAPSET_GLYPHCACHE 16
|
||||
#define RDP_CAPLEN_GLYPHCACHE 52
|
||||
|
||||
#define RDP_CAPSET_BMPCACHE2 19
|
||||
#define RDP_CAPLEN_BMPCACHE2 0x28
|
||||
#define BMPCACHE2_FLAG_PERSIST ((uint32)1<<31)
|
||||
@ -670,3 +682,26 @@ enum RDP_PDU_REDIRECT_FLAGS
|
||||
#define TS_NEG_ELLIPSE_CB_INDEX 0x1A
|
||||
#define TS_NEG_INDEX_INDEX 0x1B
|
||||
|
||||
/* [MS-RDPBCGR] 2.2.7.1.6 */
|
||||
#define INPUT_FLAG_SCANCODES 0x0001
|
||||
#define INPUT_FLAG_MOUSEX 0x0004
|
||||
#define INPUT_FLAG_FASTPATH_INPUT 0x0008
|
||||
#define INPUT_FLAG_UNICODE 0x0010
|
||||
#define INPUT_FLAG_FASTPATH_INPUT2 0x0020
|
||||
#define INPUT_FLAG_UNUSED1 0x0040
|
||||
#define INPUT_FLAG_UNUSED2 0x0080
|
||||
#define TS_INPUT_FLAG_MOUSE_HWHEEL 0x0100
|
||||
#define TS_INPUT_FLAG_QOE_TIMESTAMPS 0x0200
|
||||
|
||||
/* [MS-RDPBCGR] 2.2.7.1.8 */
|
||||
#define GLYPH_SUPPORT_NONE 0x0000
|
||||
#define GLYPH_SUPPORT_PARTIAL 0x0001
|
||||
#define GLYPH_SUPPORT_FULL 0x0002
|
||||
#define GLYPH_SUPPORT_ENCODE 0x0003
|
||||
|
||||
/* [MS-RDPBCGR] 2.2.7.1.11 */
|
||||
#define SOUND_BEEPS_FLAG 0x0001
|
||||
|
||||
/* [MS-RDPBCGR] 2.2.7.2.5 */
|
||||
#define FONTSUPPORT_FONTLIST 0x0001
|
||||
|
||||
|
||||
114
rdp.c
114
rdp.c
@ -4,6 +4,7 @@
|
||||
Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008
|
||||
Copyright 2003-2011 Peter Astrand <astrand@cendio.se> for Cendio AB
|
||||
Copyright 2011-2017 Henrik Andersson <hean01@cendio.se> for Cendio AB
|
||||
Copyright 2017 Karl Mikaelsson <derfian@cendio.se> for Cendio AB
|
||||
|
||||
This program is free software: you can redistribute it and/or modify
|
||||
it under the terms of the GNU General Public License as published by
|
||||
@ -855,41 +856,82 @@ rdp_out_brushcache_caps(STREAM s)
|
||||
out_uint32_le(s, 1); /* cache type */
|
||||
}
|
||||
|
||||
static uint8 caps_0x0d[] = {
|
||||
0x01, 0x00, 0x00, 0x00, 0x09, 0x04, 0x00, 0x00,
|
||||
0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x0C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
|
||||
0x00, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
static uint8 caps_0x0c[] = { 0x01, 0x00, 0x00, 0x00 };
|
||||
|
||||
static uint8 caps_0x0e[] = { 0x01, 0x00, 0x00, 0x00 };
|
||||
|
||||
static uint8 caps_0x10[] = {
|
||||
0xFE, 0x00, 0x04, 0x00, 0xFE, 0x00, 0x04, 0x00,
|
||||
0xFE, 0x00, 0x08, 0x00, 0xFE, 0x00, 0x08, 0x00,
|
||||
0xFE, 0x00, 0x10, 0x00, 0xFE, 0x00, 0x20, 0x00,
|
||||
0xFE, 0x00, 0x40, 0x00, 0xFE, 0x00, 0x80, 0x00,
|
||||
0xFE, 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x08,
|
||||
0x00, 0x01, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00
|
||||
};
|
||||
|
||||
/* Output unknown capability sets */
|
||||
/* Output Input Capability Set */
|
||||
static void
|
||||
rdp_out_unknown_caps(STREAM s, uint16 id, uint16 length, uint8 * caps)
|
||||
rdp_out_ts_input_capabilityset(STREAM s)
|
||||
{
|
||||
out_uint16_le(s, id);
|
||||
out_uint16_le(s, length);
|
||||
uint16 inputflags = 0;
|
||||
inputflags |= INPUT_FLAG_SCANCODES;
|
||||
|
||||
out_uint8p(s, caps, length - 4);
|
||||
out_uint16_le(s, RDP_CAPSET_INPUT);
|
||||
out_uint16_le(s, RDP_CAPLEN_INPUT);
|
||||
|
||||
out_uint16_le(s, inputflags); /* inputFlags */
|
||||
out_uint16_le(s, 0); /* pad2OctetsA */
|
||||
out_uint32_le(s, 0x409); /* keyboardLayout */
|
||||
out_uint32_le(s, 0x4); /* keyboardType */
|
||||
out_uint32_le(s, 0); /* keyboardSubtype */
|
||||
out_uint32_le(s, 0xC); /* keyboardFunctionKey */
|
||||
out_utf16s_padded(s, "", 64, 0); /* imeFileName */
|
||||
}
|
||||
|
||||
/* Output Sound Capability Set */
|
||||
static void
|
||||
rdp_out_ts_sound_capabilityset(STREAM s)
|
||||
{
|
||||
uint16 soundflags = SOUND_BEEPS_FLAG;
|
||||
|
||||
out_uint16_le(s, RDP_CAPSET_SOUND);
|
||||
out_uint16_le(s, RDP_CAPLEN_SOUND);
|
||||
|
||||
out_uint16_le(s, soundflags); /* soundFlags */
|
||||
out_uint16_le(s, 0); /* pad2OctetsA */
|
||||
}
|
||||
|
||||
/* Output Font Capability Set */
|
||||
static void
|
||||
rdp_out_ts_font_capabilityset(STREAM s)
|
||||
{
|
||||
uint16 flags = FONTSUPPORT_FONTLIST;
|
||||
|
||||
out_uint16_le(s, RDP_CAPSET_FONT);
|
||||
out_uint16_le(s, RDP_CAPLEN_FONT);
|
||||
|
||||
out_uint16_le(s, flags); /* fontSupportFlags */
|
||||
out_uint16_le(s, 0); /* pad2octets */
|
||||
}
|
||||
|
||||
static void
|
||||
rdp_out_ts_cache_definition(STREAM s, uint16 entries, uint16 maxcellsize)
|
||||
{
|
||||
out_uint16_le(s, entries);
|
||||
out_uint16_le(s, maxcellsize);
|
||||
}
|
||||
|
||||
/* Output Glyph Cache Capability Set */
|
||||
static void
|
||||
rdp_out_ts_glyphcache_capabilityset(STREAM s)
|
||||
{
|
||||
uint16 supportlvl = GLYPH_SUPPORT_FULL;
|
||||
uint32 fragcache = 0x01000100;
|
||||
out_uint16_le(s, RDP_CAPSET_GLYPHCACHE);
|
||||
out_uint16_le(s, RDP_CAPLEN_GLYPHCACHE);
|
||||
|
||||
/* GlyphCache - 10 TS_CACHE_DEFINITION structures */
|
||||
rdp_out_ts_cache_definition(s, 254, 4);
|
||||
rdp_out_ts_cache_definition(s, 254, 4);
|
||||
rdp_out_ts_cache_definition(s, 254, 8);
|
||||
rdp_out_ts_cache_definition(s, 254, 8);
|
||||
rdp_out_ts_cache_definition(s, 254, 16);
|
||||
rdp_out_ts_cache_definition(s, 254, 32);
|
||||
rdp_out_ts_cache_definition(s, 254, 64);
|
||||
rdp_out_ts_cache_definition(s, 254, 128);
|
||||
rdp_out_ts_cache_definition(s, 254, 256);
|
||||
rdp_out_ts_cache_definition(s, 64, 2048);
|
||||
|
||||
out_uint32_le(s, fragcache); /* FragCache */
|
||||
out_uint16_le(s, supportlvl); /* GlyphSupportLevel */
|
||||
out_uint16_le(s, 0); /* pad2octets */
|
||||
}
|
||||
|
||||
#define RDP5_FLAG 0x0030
|
||||
@ -952,10 +994,10 @@ rdp_send_confirm_active(void)
|
||||
rdp_out_share_caps(s);
|
||||
rdp_out_brushcache_caps(s);
|
||||
|
||||
rdp_out_unknown_caps(s, 0x0d, 0x58, caps_0x0d); /* CAPSTYPE_INPUT */
|
||||
rdp_out_unknown_caps(s, 0x0c, 0x08, caps_0x0c); /* CAPSTYPE_SOUND */
|
||||
rdp_out_unknown_caps(s, 0x0e, 0x08, caps_0x0e); /* CAPSTYPE_FONT */
|
||||
rdp_out_unknown_caps(s, 0x10, 0x34, caps_0x10); /* CAPSTYPE_GLYPHCACHE */
|
||||
rdp_out_ts_input_capabilityset(s);
|
||||
rdp_out_ts_sound_capabilityset(s);
|
||||
rdp_out_ts_font_capabilityset(s);
|
||||
rdp_out_ts_glyphcache_capabilityset(s);
|
||||
|
||||
s_mark_end(s);
|
||||
sec_send(s, sec_flags);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user