From 75bff736a655eea16e0856cc591fb5514cd8ad65 Mon Sep 17 00:00:00 2001 From: speidy Date: Wed, 5 Mar 2014 05:46:46 +0200 Subject: [PATCH] libxrdp: xrdp_fastpath_recv cleanup --- libxrdp/xrdp_fastpath.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/libxrdp/xrdp_fastpath.c b/libxrdp/xrdp_fastpath.c index 572b5a98..2fa88ac6 100644 --- a/libxrdp/xrdp_fastpath.c +++ b/libxrdp/xrdp_fastpath.c @@ -59,33 +59,22 @@ xrdp_fastpath_recv(struct xrdp_fastpath *self, struct stream *s) int fp_hdr; int len = 0; int byte; - int hdr_len = 2; /* fastpath header length - can be 2 or 3 bytes long, depends on length */ DEBUG((" in xrdp_fastpath_recv")); in_uint8(s, fp_hdr); /* fpInputHeader (1 byte) */ - g_writeln("xrdp_fastpath_recv: header= 0x%8.8x", fp_hdr); self->numEvents = (fp_hdr & 0x3C) >> 2; self->secFlags = (fp_hdr & 0xC0) >> 6; - // receive fastpath first length packet - in_uint8(s, byte); /* length 1 */ + in_uint8(s, byte); /* length 1 (1 byte) */ if (byte & 0x80) { byte &= ~(0x80); len = (byte << 8); - // receive fastpath second length packet - in_uint8(s, byte); /* length 2 */ - hdr_len++; + in_uint8(s, byte); /* length 2 (1 byte) */ len += byte; } - else - { - len = byte; - } - -// g_writeln("len= %d , numEvents= %d, secFlags= %d, bytesleft: %d", len, self->numEvents, self->secFlags, (s->p - s->data)); DEBUG((" out xrdp_fastpath_recv"));