kekePower/rdesktop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #236 from hean01-cendio/fastpath_cleanup

Browse Source 
Refactoring of slow and fastpath handling and rdp_recv()
This commit is contained in:
Karl Mikaelsson 2018-02-01 14:39:25 +01:00 committed by GitHub
commit 50edf775e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 123 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
constants.h
View File

@ -2,6 +2,7 @@
rdesktop: A Remote Desktop Protocol client. rdesktop: A Remote Desktop Protocol client.
Miscellaneous protocol constants Miscellaneous protocol constants
Copyright (C) Matthew Chapman 1999-2008 Copyright (C) Matthew Chapman 1999-2008
Copyright 2017-2018 Henrik Andersson <hean01@cendio.se> for Cendio AB
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -36,9 +37,6 @@
#define FASTPATH_OUTPUT_SECURE_CHECKSUM 0x1 #define FASTPATH_OUTPUT_SECURE_CHECKSUM 0x1
#define FASTPATH_OUTPUT_ENCRYPTED 0x2 #define FASTPATH_OUTPUT_ENCRYPTED 0x2
#define IS_FASTPATH(hdr) ((hdr & 0x03) == FASTPATH_OUTPUT_ACTION_FASTPATH)
#define IS_SLOWPATH(hdr) ((hdr) == FASTPATH_OUTPUT_ACTION_X224)
/* [MS-RDPBCGR] 2.2.9.1.2.1 */ /* [MS-RDPBCGR] 2.2.9.1.2.1 */
/* adjusted for position in updateHeader */ /* adjusted for position in updateHeader */
#define FASTPATH_UPDATETYPE_ORDERS 0x0 #define FASTPATH_UPDATETYPE_ORDERS 0x0

38
iso.c
View File

@ -3,7 +3,7 @@
Protocol services - ISO layer Protocol services - ISO layer
Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008
Copyright 2005-2011 Peter Astrand <astrand@cendio.se> for Cendio AB Copyright 2005-2011 Peter Astrand <astrand@cendio.se> for Cendio AB
Copyright 2012-2017 Henrik Andersson <hean01@cendio.se> for Cendio AB Copyright 2012-2018 Henrik Andersson <hean01@cendio.se> for Cendio AB
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -98,7 +98,7 @@ iso_send_connection_request(char *username, uint32 neg_proto)
/* Receive a message on the ISO layer, return code */ /* Receive a message on the ISO layer, return code */
static STREAM static STREAM
iso_recv_msg(uint8 * code, uint8 * rdpver) iso_recv_msg(uint8 * code, RD_BOOL *is_fastpath, uint8 *fastpath_hdr)
{ {
STREAM s; STREAM s;
uint16 length; uint16 length;
@ -107,16 +107,23 @@ iso_recv_msg(uint8 * code, uint8 * rdpver)
s = tcp_recv(NULL, 4); s = tcp_recv(NULL, 4);
if (s == NULL) if (s == NULL)
return NULL; return NULL;
in_uint8(s, version);
if (rdpver != NULL) in_uint8(s, version); /* T.123 version or Fastpath output header */
*rdpver = version;
if (IS_SLOWPATH(version)) /* detect if this is a slow or fast path PDU */
*fastpath_hdr = 0x00;
*is_fastpath = False;
if (version == T123_HEADER_VERSION)
{ {
in_uint8s(s, 1); /* reserved */ in_uint8s(s, 1); /* reserved */
in_uint16_be(s, length); /* length */ in_uint16_be(s, length); /* length */
} }
else else
{ {
/* if version is not an expected T.123 version eg. 3, then this
stream is a fast path pdu */
*is_fastpath = True;
*fastpath_hdr = version;
in_uint8(s, length); /* length1 */ in_uint8(s, length); /* length1 */
if (length & 0x80) if (length & 0x80)
{ {
@ -125,16 +132,20 @@ iso_recv_msg(uint8 * code, uint8 * rdpver)
next_be(s, length); next_be(s, length);
} }
} }
if (length < 4) if (length < 4)
{ {
logger(Protocol, Error, "iso_recv_msg(), bad packet header, length < 4"); logger(Protocol, Error, "iso_recv_msg(), bad packet header, length < 4");
return NULL; return NULL;
} }
s = tcp_recv(s, length - 4); s = tcp_recv(s, length - 4);
if (s == NULL) if (s == NULL)
return NULL; return NULL;
if (IS_FASTPATH(version))
if (*is_fastpath == True)
return s; return s;
in_uint8s(s, 1); /* hdrlen */ in_uint8s(s, 1); /* hdrlen */
in_uint8(s, *code); in_uint8(s, *code);
if (*code == ISO_PDU_DT) if (*code == ISO_PDU_DT)
@ -180,17 +191,18 @@ iso_send(STREAM s)
/* Receive ISO transport data packet */ /* Receive ISO transport data packet */
STREAM STREAM
iso_recv(uint8 * rdpver) iso_recv(RD_BOOL *is_fastpath, uint8 *fastpath_hdr)
{ {
STREAM s; STREAM s;
uint8 code = 0; uint8 code = 0;
s = iso_recv_msg(&code, rdpver); s = iso_recv_msg(&code, is_fastpath, fastpath_hdr);
if (s == NULL) if (s == NULL)
return NULL; return NULL;
if (rdpver != NULL)
if (IS_FASTPATH(*rdpver)) if (*is_fastpath == True)
return s; return s;
if (code != ISO_PDU_DT) if (code != ISO_PDU_DT)
{ {
logger(Protocol, Error, "iso_recv(), expected ISO_PDU_DT, got 0x%x", code); logger(Protocol, Error, "iso_recv(), expected ISO_PDU_DT, got 0x%x", code);
@ -208,6 +220,8 @@ iso_connect(char *server, char *username, char *domain, char *password,
STREAM s; STREAM s;
uint8 code; uint8 code;
uint32 neg_proto; uint32 neg_proto;
RD_BOOL is_fastpath;
uint8 fastpath_hdr;
g_negotiate_rdp_protocol = True; g_negotiate_rdp_protocol = True;
@ -236,7 +250,7 @@ iso_connect(char *server, char *username, char *domain, char *password,
iso_send_connection_request(username, neg_proto); iso_send_connection_request(username, neg_proto);
s = iso_recv_msg(&code, NULL); s = iso_recv_msg(&code, &is_fastpath, &fastpath_hdr);
if (s == NULL) if (s == NULL)
return False; return False;

28
mcs.c
View File

@ -3,6 +3,7 @@
Protocol services - Multipoint Communications Service Protocol services - Multipoint Communications Service
Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008
Copyright 2005-2011 Peter Astrand <astrand@cendio.se> for Cendio AB Copyright 2005-2011 Peter Astrand <astrand@cendio.se> for Cendio AB
Copyright 2018 Henrik Andersson <hean01@cendio.com> for Cendio AB
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -90,8 +91,12 @@ mcs_recv_connect_response(STREAM mcs_data)
uint8 result; uint8 result;
int length; int length;
STREAM s; STREAM s;
RD_BOOL is_fastpath;
uint8 fastpath_hdr;
logger(Protocol, Debug, "%s()", __func__); logger(Protocol, Debug, "%s()", __func__);
s = iso_recv(NULL); s = iso_recv(&is_fastpath, &fastpath_hdr);
if (s == NULL) if (s == NULL)
return False; return False;
@ -160,10 +165,14 @@ mcs_send_aurq(void)
static RD_BOOL static RD_BOOL
mcs_recv_aucf(uint16 * mcs_userid) mcs_recv_aucf(uint16 * mcs_userid)
{ {
RD_BOOL is_fastpath;
uint8 fastpath_hdr;
uint8 opcode, result; uint8 opcode, result;
STREAM s; STREAM s;
logger(Protocol, Debug, "%s()", __func__); logger(Protocol, Debug, "%s()", __func__);
s = iso_recv(NULL); s = iso_recv(&is_fastpath, &fastpath_hdr);
if (s == NULL) if (s == NULL)
return False; return False;
@ -209,10 +218,14 @@ mcs_send_cjrq(uint16 chanid)
static RD_BOOL static RD_BOOL
mcs_recv_cjcf(void) mcs_recv_cjcf(void)
{ {
RD_BOOL is_fastpath;
uint8 fastpath_hdr;
uint8 opcode, result; uint8 opcode, result;
STREAM s; STREAM s;
logger(Protocol, Debug, "%s()", __func__); logger(Protocol, Debug, "%s()", __func__);
s = iso_recv(NULL); s = iso_recv(&is_fastpath, &fastpath_hdr);
if (s == NULL) if (s == NULL)
return False; return False;
@ -303,17 +316,18 @@ mcs_send(STREAM s)
/* Receive an MCS transport data packet */ /* Receive an MCS transport data packet */
STREAM STREAM
mcs_recv(uint16 * channel, uint8 * rdpver) mcs_recv(uint16 * channel, RD_BOOL *is_fastpath, uint8 *fastpath_hdr)
{ {
uint8 opcode, appid, length; uint8 opcode, appid, length;
STREAM s; STREAM s;
s = iso_recv(rdpver); s = iso_recv(is_fastpath, fastpath_hdr);
if (s == NULL) if (s == NULL)
return NULL; return NULL;
if (rdpver != NULL)
if (*rdpver != 3) if (*is_fastpath == True)
return s; return s;
in_uint8(s, opcode); in_uint8(s, opcode);
appid = opcode >> 2; appid = opcode >> 2;
if (appid != MCS_SDIN) if (appid != MCS_SDIN)

6
proto.h
View File

@ -82,7 +82,7 @@ void ewmh_init(void);
/* iso.c */ /* iso.c */
STREAM iso_init(int length); STREAM iso_init(int length);
void iso_send(STREAM s); void iso_send(STREAM s);
STREAM iso_recv(uint8 * rdpver); STREAM iso_recv(RD_BOOL *is_fastpath, uint8 *fastpath_hdr);
RD_BOOL iso_connect(char *server, char *username, char *domain, char *password, RD_BOOL reconnect, RD_BOOL iso_connect(char *server, char *username, char *domain, char *password, RD_BOOL reconnect,
uint32 * selected_protocol); uint32 * selected_protocol);
void iso_disconnect(void); void iso_disconnect(void);
@ -95,7 +95,7 @@ void licence_process(STREAM s);
STREAM mcs_init(int length); STREAM mcs_init(int length);
void mcs_send_to_channel(STREAM s, uint16 channel); void mcs_send_to_channel(STREAM s, uint16 channel);
void mcs_send(STREAM s); void mcs_send(STREAM s);
STREAM mcs_recv(uint16 * channel, uint8 * rdpver); STREAM mcs_recv(uint16 * channel, RD_BOOL *is_fastpath, uint8 *fastpath_hdr);
RD_BOOL mcs_connect_start(char *server, char *username, char *domain, char *password, RD_BOOL mcs_connect_start(char *server, char *username, char *domain, char *password,
RD_BOOL reconnect, uint32 * selected_protocol); RD_BOOL reconnect, uint32 * selected_protocol);
RD_BOOL mcs_connect_finalize(STREAM s); RD_BOOL mcs_connect_finalize(STREAM s);
@ -199,7 +199,7 @@ STREAM sec_init(uint32 flags, int maxlen);
void sec_send_to_channel(STREAM s, uint32 flags, uint16 channel); void sec_send_to_channel(STREAM s, uint32 flags, uint16 channel);
void sec_send(STREAM s, uint32 flags); void sec_send(STREAM s, uint32 flags);
void sec_process_mcs_data(STREAM s); void sec_process_mcs_data(STREAM s);
STREAM sec_recv(uint8 * rdpver); STREAM sec_recv(RD_BOOL * is_fastpath);
RD_BOOL sec_connect(char *server, char *username, char *domain, char *password, RD_BOOL reconnect); RD_BOOL sec_connect(char *server, char *username, char *domain, char *password, RD_BOOL reconnect);
void sec_disconnect(void); void sec_disconnect(void);
void sec_reset_state(void); void sec_reset_state(void);

73
rdp.c
View File

@ -3,7 +3,7 @@
Protocol services - RDP layer Protocol services - RDP layer
Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008
Copyright 2003-2011 Peter Astrand <astrand@cendio.se> for Cendio AB Copyright 2003-2011 Peter Astrand <astrand@cendio.se> for Cendio AB
Copyright 2011-2017 Henrik Andersson <hean01@cendio.se> for Cendio AB Copyright 2011-2018 Henrik Andersson <hean01@cendio.se> for Cendio AB
Copyright 2017 Karl Mikaelsson <derfian@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 This program is free software: you can redistribute it and/or modify
@ -92,31 +92,61 @@ uint16 g_session_height;
static void rdp_out_unistr(STREAM s, char *string, int len); static void rdp_out_unistr(STREAM s, char *string, int len);
/* reads a TS_SHARECONTROLHEADER from stream, returns True of there is
a PDU available otherwise False */
static RD_BOOL
rdp_ts_in_share_control_header(STREAM s, uint8 *type, uint16 *length)
{
uint16 pdu_type;
uint16 pdu_source;
UNUSED(pdu_source);
in_uint16_le(s, *length); /* totalLength */
/* If the totalLength field equals 0x8000, then the Share
Control Header and any data that follows MAY be interpreted
as a T.128 FlowPDU as described in [T128] section 8.5 (the
ASN.1 structure definition is detailed in [T128] section
9.1) and MUST be ignored.
*/
if (*length == 0x8000)
{
/* skip over this message in stream */
g_next_packet += 8;
return False;
}
in_uint16_le(s, pdu_type); /* pduType */
in_uint16(s, pdu_source); /* pduSource */
*type = pdu_type & 0xf;
return True;
}
/* Receive an RDP packet */ /* Receive an RDP packet */
static STREAM static STREAM
rdp_recv(uint8 * type) rdp_recv(uint8 * type)
{ {
RD_BOOL is_fastpath;
static STREAM rdp_s; static STREAM rdp_s;
uint16 length, pdu_type; uint16 length;
uint8 rdpver;
while (1)
{
/* fill stream with data if needed for parsing a new packet */
if ((rdp_s == NULL) || (g_next_packet >= rdp_s->end) || (g_next_packet == NULL)) if ((rdp_s == NULL) || (g_next_packet >= rdp_s->end) || (g_next_packet == NULL))
{ {
rdp_s = sec_recv(&rdpver); rdp_s = sec_recv(&is_fastpath);
if (rdp_s == NULL) if (rdp_s == NULL)
return NULL; return NULL;
if (rdpver == 0xff)
{ if (is_fastpath == True)
g_next_packet = rdp_s->end;
*type = 0;
return rdp_s;
}
else if (rdpver != 3)
{ {
/* process_ts_fp_updates moves g_next_packet */ /* process_ts_fp_updates moves g_next_packet */
process_ts_fp_updates(rdp_s); process_ts_fp_updates(rdp_s);
*type = 0; continue;
return rdp_s;
} }
g_next_packet = rdp_s->p; g_next_packet = rdp_s->p;
@ -126,17 +156,12 @@ rdp_recv(uint8 * type)
rdp_s->p = g_next_packet; rdp_s->p = g_next_packet;
} }
in_uint16_le(rdp_s, length); /* parse a TS_SHARECONTROLHEADER */
/* 32k packets are really 8, keepalive fix */ if (rdp_ts_in_share_control_header(rdp_s, type, &length) == False)
if (length == 0x8000) continue;
{
g_next_packet += 8; break;
*type = 0;
return rdp_s;
} }
in_uint16_le(rdp_s, pdu_type);
in_uint8s(rdp_s, 2); /* userid */
*type = pdu_type & 0xf;
logger(Protocol, Debug, "rdp_recv(), RDP packet #%d, type 0x%x", ++g_packetno, *type); logger(Protocol, Debug, "rdp_recv(), RDP packet #%d, type 0x%x", ++g_packetno, *type);
@ -1899,8 +1924,6 @@ rdp_loop(RD_BOOL * deactivated, uint32 * ext_disc_reason)
process_data_pdu(s, ext_disc_reason); process_data_pdu(s, ext_disc_reason);
break; break;
case 0:
break;
default: default:
logger(Protocol, Warning, logger(Protocol, Warning,
"rdp_loop(), unhandled PDU type %d received", type); "rdp_loop(), unhandled PDU type %d received", type);

21
secure.c
View File

@ -3,7 +3,7 @@
Protocol services - RDP encryption and licensing Protocol services - RDP encryption and licensing
Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008 Copyright (C) Matthew Chapman <matthewc.unsw.edu.au> 1999-2008
Copyright 2005-2011 Peter Astrand <astrand@cendio.se> for Cendio AB Copyright 2005-2011 Peter Astrand <astrand@cendio.se> for Cendio AB
Copyright 2017 Henrik Andersson <hean01@cendio.se> for Cendio AB Copyright 2017-2018 Henrik Andersson <hean01@cendio.se> for Cendio AB
This program is free software: you can redistribute it and/or modify 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 it under the terms of the GNU General Public License as published by
@ -842,26 +842,27 @@ sec_process_mcs_data(STREAM s)
/* Receive secure transport packet */ /* Receive secure transport packet */
STREAM STREAM
sec_recv(uint8 * rdpver) sec_recv(RD_BOOL *is_fastpath)
{ {
uint8 fastpath_hdr;
uint16 sec_flags; uint16 sec_flags;
uint16 channel; uint16 channel;
STREAM s; STREAM s;
while ((s = mcs_recv(&channel, rdpver)) != NULL) while ((s = mcs_recv(&channel, is_fastpath, &fastpath_hdr)) != NULL)
{ {
if (rdpver != NULL) if (*is_fastpath == True)
{ {
if (*rdpver != 3) /* If fastpath packet is encrypted, read data
{ signature and decrypt */
if (*rdpver & 0x80) if (fastpath_hdr & FASTPATH_OUTPUT_ENCRYPTED)
{ {
in_uint8s(s, 8); /* signature */ in_uint8s(s, 8); /* signature */
sec_decrypt(s->p, s->end - s->p); sec_decrypt(s->p, s->end - s->p);
} }
return s; return s;
} }
}
if (g_encryption || (!g_licence_issued && !g_licence_error_result)) if (g_encryption || (!g_licence_issued && !g_licence_error_result))
{ {
/* TS_SECURITY_HEADER */ /* TS_SECURITY_HEADER */
@ -926,9 +927,7 @@ sec_recv(uint8 * rdpver)
if (channel != MCS_GLOBAL_CHANNEL) if (channel != MCS_GLOBAL_CHANNEL)
{ {
channel_process(s, channel); channel_process(s, channel);
if (rdpver != NULL) continue;
*rdpver = 0xff;
return s;
} }
return s; return s;