jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xrdp: add some logging, remove unused var

Browse Source
This commit is contained in:
speidy 2016-12-29 03:31:53 -05:00
parent 1f930f252f
commit 70e9132ab1
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libxrdp/xrdp_caps.c
View File

@ -541,6 +541,8 @@ xrdp_caps_process_frame_ack(struct xrdp_rdp *self, struct stream *s, int len)
in_uint32_le(s, self->client_info.max_unacknowledged_frame_count); in_uint32_le(s, self->client_info.max_unacknowledged_frame_count);
if (self->client_info.max_unacknowledged_frame_count < 0) if (self->client_info.max_unacknowledged_frame_count < 0)
{ {
g_writeln(" invalid max_unacknowledged_frame_count value (%d), setting to 0",
self->client_info.max_unacknowledged_frame_count);
self->client_info.max_unacknowledged_frame_count = 0; self->client_info.max_unacknowledged_frame_count = 0;
} }
g_writeln(" max_unacknowledged_frame_count %d", self->client_info.max_unacknowledged_frame_count); g_writeln(" max_unacknowledged_frame_count %d", self->client_info.max_unacknowledged_frame_count);

5
xrdp/xrdp_mm.c
View File

@ -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)