mirrors
/
xrdp
mirror of https://github.com/neutrinolabs/xrdp
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libxrdp: delete NLA header detection for now, TLS is working now with 

mstsc
This commit is contained in:
speidy 2014-11-21 03:17:45 +02:00
parent c159505980
commit 52cac06092
2 changed files with 3 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
libxrdp/libxrdp.c
View File

@ -89,33 +89,6 @@ libxrdp_get_pdu_bytes(const char *aheader)
/* TPKT */ /* TPKT */
rv = (header[2] << 8) | header[3]; rv = (header[2] << 8) | header[3];
} }
else if (header[0] == 0x30)
{
/* TSRequest (NLA) */
if (header[1] & 0x80)
{
if ((header[1] & ~(0x80)) == 1)
{
rv = header[2];
rv += 3;
}
else if ((header[1] & ~(0x80)) == 2)
{
rv = (header[2] << 8) | header[3];
rv += 4;
}
else
{
g_writeln("libxrdp_get_pdu_bytes: error TSRequest!");
return -1;
}
}
else
{
rv = header[1];
rv += 2;
}
}
else else
{ {
/* Fast-Path */ /* Fast-Path */

6
libxrdp/xrdp_rdp.c
View File

@ -155,7 +155,7 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info)
} }
else else
{ {
log_message(LOG_LEVEL_ALWAYS,"Warning: Your configured fastpath level is" log_message(LOG_LEVEL_ALWAYS,"Warning: Your configured fastpath level is "
"undefined, fastpath will not be used"); "undefined, fastpath will not be used");
client_info->use_fast_path = 0; client_info->use_fast_path = 0;
} }
@ -176,7 +176,7 @@ xrdp_rdp_read_config(struct xrdp_client_info *client_info)
} }
else else
{ {
log_message(LOG_LEVEL_ALWAYS,"Warning: Your configured security layer is" log_message(LOG_LEVEL_ALWAYS,"Warning: Your configured security layer is "
"undefined, xrdp will negotiate client compatible"); "undefined, xrdp will negotiate client compatible");
client_info->security_layer = PROTOCOL_SSL | PROTOCOL_HYBRID | PROTOCOL_HYBRID_EX; client_info->security_layer = PROTOCOL_SSL | PROTOCOL_HYBRID | PROTOCOL_HYBRID_EX;
} }
@ -369,7 +369,7 @@ xrdp_rdp_recv(struct xrdp_rdp *self, struct stream *s, int *code)
{ {
/* check for fastpath first */ /* check for fastpath first */
header = (const tui8 *) (s->p); header = (const tui8 *) (s->p);
if ((header[0] != 0x3) && (header[0] != 0x3c)) if (header[0] != 0x3)
{ {
if (xrdp_sec_recv_fastpath(self->sec_layer, s) != 0) if (xrdp_sec_recv_fastpath(self->sec_layer, s) != 0)
{ {