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

minor fastpath changes

Browse Source
This commit is contained in:
Jay Sorg 2014-03-05 12:38:17 -08:00
parent 98c9b8b692
commit fe042b0c61
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libxrdp/libxrdp.c
View File

@ -205,8 +205,18 @@ libxrdp_process_data(struct xrdp_session *session, struct stream *s)
code = 0; code = 0;
if (do_read) if (do_read)
{
if (s == 0)
{ {
s = libxrdp_force_read(session->trans); s = libxrdp_force_read(session->trans);
}
else
{
if ((s->next_packet == 0) || (s->next_packet >= s->end))
{
s = libxrdp_force_read(session->trans);
}
}
if (s == 0) if (s == 0)
{ {
g_writeln("libxrdp_process_data: libxrdp_force_read failed"); g_writeln("libxrdp_process_data: libxrdp_force_read failed");
@ -281,8 +291,7 @@ libxrdp_process_data(struct xrdp_session *session, struct stream *s)
if (cont) if (cont)
{ {
cont = (s->next_packet != 0) && cont = (s->next_packet != 0) && (s->next_packet < s->end);
(s->next_packet < s->end);
} }
} }

4
libxrdp/xrdp_rdp.c
View File

@ -304,13 +304,14 @@ xrdp_rdp_recv(struct xrdp_rdp *self, struct stream *s, int *code)
if (s->next_packet == 0 || s->next_packet >= s->end) if (s->next_packet == 0 || s->next_packet >= s->end)
{ {
/* check for fastpath first */ /* check for fastpath first */
header = (const tui8 *) (self->session->trans->in_s->p); header = (const tui8 *) (s->p);
if ((header[0] != 0x3) && (header[0] != 0x3c)) if ((header[0] != 0x3) && (header[0] != 0x3c))
{ {
if (xrdp_sec_recv_fastpath(self->sec_layer, s) != 0) if (xrdp_sec_recv_fastpath(self->sec_layer, s) != 0)
{ {
return 1; return 1;
} }
s->next_packet = 0;
*code = 2; // special code for fastpath input *code = 2; // special code for fastpath input
DEBUG(("out (fastpath) xrdp_rdp_recv")); DEBUG(("out (fastpath) xrdp_rdp_recv"));
return 0; return 0;
@ -387,6 +388,7 @@ xrdp_rdp_recv(struct xrdp_rdp *self, struct stream *s, int *code)
return 0; return 0;
} }
} }
/*****************************************************************************/ /*****************************************************************************/
int APP_CC int APP_CC
xrdp_rdp_send(struct xrdp_rdp *self, struct stream *s, int pdu_type) xrdp_rdp_send(struct xrdp_rdp *self, struct stream *s, int pdu_type)