mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for PDU_TYPE_DEMAND_ACTIVE 0001, got 0007 error

Browse Source
This commit is contained in:
Daryl Poe 2013-04-05 12:53:22 -06:00
parent 28547bece7
commit 551cb22975
3 changed files with 31 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
libfreerdp/core/capabilities.c
View File

@ -3222,19 +3222,12 @@ BOOL rdp_read_capability_sets(wStream* s, rdpSettings* settings, UINT16 numberCa
return TRUE; return TRUE;
} }
BOOL rdp_recv_demand_active(rdpRdp* rdp, wStream* s) BOOL rdp_recv_get_active_header(rdpRdp* rdp, wStream* s, UINT16* pChannelId)
{ {
UINT16 length; UINT16 length;
UINT16 channelId;
UINT16 pduType;
UINT16 pduLength;
UINT16 pduSource;
UINT16 numberCapabilities;
UINT16 lengthSourceDescriptor;
UINT16 lengthCombinedCapabilities;
UINT16 securityFlags; UINT16 securityFlags;
if (!rdp_read_header(rdp, s, &length, &channelId)) if (!rdp_read_header(rdp, s, &length, pChannelId))
return FALSE; return FALSE;
if (rdp->disconnect) if (rdp->disconnect)
@ -3255,12 +3248,31 @@ BOOL rdp_recv_demand_active(rdpRdp* rdp, wStream* s)
} }
} }
if (channelId != MCS_GLOBAL_CHANNEL_ID) if (*pChannelId != MCS_GLOBAL_CHANNEL_ID)
{ {
fprintf(stderr, "expected MCS_GLOBAL_CHANNEL_ID %04x, got %04x\n", MCS_GLOBAL_CHANNEL_ID, channelId); fprintf(stderr, "expected MCS_GLOBAL_CHANNEL_ID %04x, got %04x\n", MCS_GLOBAL_CHANNEL_ID, *pChannelId);
return FALSE; return FALSE;
} }
return TRUE;
}
BOOL rdp_recv_demand_active(rdpRdp* rdp, wStream* s)
{
UINT16 channelId;
UINT16 pduType;
UINT16 pduLength;
UINT16 pduSource;
UINT16 numberCapabilities;
UINT16 lengthSourceDescriptor;
UINT16 lengthCombinedCapabilities;
if (!rdp_recv_get_active_header(rdp, s, &channelId))
return FALSE;
if (rdp->disconnect)
return TRUE;
if (!rdp_read_share_control_header(s, &pduLength, &pduType, &pduSource)) if (!rdp_read_share_control_header(s, &pduLength, &pduType, &pduSource))
{ {
fprintf(stderr, "rdp_read_share_control_header failed\n"); fprintf(stderr, "rdp_read_share_control_header failed\n");
@ -3375,7 +3387,6 @@ BOOL rdp_send_demand_active(rdpRdp* rdp)
BOOL rdp_recv_confirm_active(rdpRdp* rdp, wStream* s) BOOL rdp_recv_confirm_active(rdpRdp* rdp, wStream* s)
{ {
UINT16 length;
UINT16 channelId; UINT16 channelId;
UINT16 pduType; UINT16 pduType;
UINT16 pduLength; UINT16 pduLength;
@ -3383,27 +3394,8 @@ BOOL rdp_recv_confirm_active(rdpRdp* rdp, wStream* s)
UINT16 lengthSourceDescriptor; UINT16 lengthSourceDescriptor;
UINT16 lengthCombinedCapabilities; UINT16 lengthCombinedCapabilities;
UINT16 numberCapabilities; UINT16 numberCapabilities;
UINT16 securityFlags;
if (!rdp_read_header(rdp, s, &length, &channelId)) if (!rdp_recv_get_active_header(rdp, s, &channelId))
return FALSE;
if (rdp->settings->DisableEncryption)
{
if (!rdp_read_security_header(s, &securityFlags))
return FALSE;
if (securityFlags & SEC_ENCRYPT)
{
if (!rdp_decrypt(rdp, s, length - 4, securityFlags))
{
fprintf(stderr, "rdp_decrypt failed\n");
return FALSE;
}
}
}
if (channelId != MCS_GLOBAL_CHANNEL_ID)
return FALSE; return FALSE;
if (!rdp_read_share_control_header(s, &pduLength, &pduType, &pduSource)) if (!rdp_read_share_control_header(s, &pduLength, &pduType, &pduSource))

1
libfreerdp/core/capabilities.h
View File

@ -165,6 +165,7 @@
#define CLW_ENTROPY_RLGR1 0x01 #define CLW_ENTROPY_RLGR1 0x01
#define CLW_ENTROPY_RLGR3 0x04 #define CLW_ENTROPY_RLGR3 0x04
BOOL rdp_recv_get_active_header(rdpRdp* rdp, wStream* s, UINT16* pChannelId);
BOOL rdp_recv_demand_active(rdpRdp* rdp, wStream* s); BOOL rdp_recv_demand_active(rdpRdp* rdp, wStream* s);
void rdp_write_demand_active(wStream* s, rdpSettings* settings); void rdp_write_demand_active(wStream* s, rdpSettings* settings);
BOOL rdp_send_demand_active(rdpRdp* rdp); BOOL rdp_send_demand_active(rdpRdp* rdp);

7
libfreerdp/core/connection.c
View File

@ -529,8 +529,13 @@ BOOL rdp_client_connect_demand_active(rdpRdp* rdp, wStream* s)
if (!rdp_recv_demand_active(rdp, s)) if (!rdp_recv_demand_active(rdp, s))
{ {
UINT16 channelId;
stream_set_mark(s, mark); stream_set_mark(s, mark);
stream_seek(s, RDP_PACKET_HEADER_MAX_LENGTH); rdp_recv_get_active_header(rdp, s, &channelId);
/* Was stream_seek(s, RDP_PACKET_HEADER_MAX_LENGTH);
* but the headers aren't always that length,
* so that could result in a bad offset.
*/
if (rdp_recv_out_of_sequence_pdu(rdp, s) != TRUE) if (rdp_recv_out_of_sequence_pdu(rdp, s) != TRUE)
return FALSE; return FALSE;