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

Merge pull request #913 from llyzs/llyzs

Browse Source 
libfreerdp-core: disable frame ack if server does not send the capability
This commit is contained in:
Marc-André Moreau 2013-01-19 16:38:01 -08:00
commit 888fcf8d47
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libfreerdp/core/capabilities.c
View File

@ -2303,6 +2303,10 @@ void rdp_write_confirm_active(STREAM* s, rdpSettings* settings)
rdp_write_frame_acknowledge_capability_set(s, settings); rdp_write_frame_acknowledge_capability_set(s, settings);
} }
} }
else
{
settings->FrameAcknowledge = 0;
}
if (settings->ReceivedCapabilities[CAPSET_TYPE_BITMAP_CACHE_V3_CODEC_ID]) if (settings->ReceivedCapabilities[CAPSET_TYPE_BITMAP_CACHE_V3_CODEC_ID])
{ {

9
libfreerdp/core/update.c
View File

@ -499,9 +499,12 @@ static void update_send_frame_acknowledge(rdpContext* context, UINT32 frameId)
STREAM* s; STREAM* s;
rdpRdp* rdp = context->rdp; rdpRdp* rdp = context->rdp;
s = rdp_data_pdu_init(rdp); if (rdp->settings->ReceivedCapabilities[CAPSET_TYPE_FRAME_ACKNOWLEDGE])
stream_write_UINT32(s, frameId); {
//rdp_send_data_pdu(rdp, s, DATA_PDU_TYPE_FRAME_ACKNOWLEDGE, rdp->mcs->user_id); s = rdp_data_pdu_init(rdp);
stream_write_UINT32(s, frameId);
rdp_send_data_pdu(rdp, s, DATA_PDU_TYPE_FRAME_ACKNOWLEDGE, rdp->mcs->user_id);
}
} }
static void update_send_synchronize(rdpContext* context) static void update_send_synchronize(rdpContext* context)