|
|
@ -2153,7 +2153,6 @@ xrdp_mm_check_wait_objs(struct xrdp_mm *self)
|
|
|
|
int cx;
|
|
|
|
int cx;
|
|
|
|
int cy;
|
|
|
|
int cy;
|
|
|
|
int use_frame_acks;
|
|
|
|
int use_frame_acks;
|
|
|
|
int ex;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (self == 0)
|
|
|
|
if (self == 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
@ -2281,13 +2280,15 @@ xrdp_mm_frame_ack(struct xrdp_mm *self, int frame_id)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
int ex;
|
|
|
|
int ex;
|
|
|
|
|
|
|
|
|
|
|
|
LLOGLN(10, ("xrdp_mm_frame_ack:"));
|
|
|
|
LLOGLN(10, ("xrdp_mm_frame_ack: incoming %d, client %d, server %d", frame_id,
|
|
|
|
|
|
|
|
self->encoder->frame_id_client, self->encoder->frame_id_server));
|
|
|
|
self->encoder->frame_id_client = frame_id;
|
|
|
|
self->encoder->frame_id_client = frame_id;
|
|
|
|
if (self->wm->client_info->use_frame_acks == 0)
|
|
|
|
if (self->wm->client_info->use_frame_acks == 0)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
return 1;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
ex = self->wm->client_info->max_unacknowledged_frame_count;
|
|
|
|
ex = self->wm->client_info->max_unacknowledged_frame_count;
|
|
|
|
|
|
|
|
/* make sure we won't have too many in-flight frames */
|
|
|
|
if (self->encoder->frame_id_client + ex >= self->encoder->frame_id_server)
|
|
|
|
if (self->encoder->frame_id_client + ex >= self->encoder->frame_id_server)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
if (self->encoder->frame_id_server > self->encoder->frame_id_server_sent)
|
|
|
|
if (self->encoder->frame_id_server > self->encoder->frame_id_server_sent)
|
|
|
|