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

mstsc
10 years ago · 52cac06092
parent c159505980
commit 52cac06092
2 changed files with 3 additions and 30 deletions
--- a/libxrdp/libxrdp.c
+++ b/libxrdp/libxrdp.c
@ -89,33 +89,6 @@ libxrdp_get_pdu_bytes(const char *aheader)
        /* TPKT */
        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
    {
        /* Fast-Path */
--- a/libxrdp/xrdp_rdp.c
+++ b/libxrdp/xrdp_rdp.c
@ -369,7 +369,7 @@ xrdp_rdp_recv(struct xrdp_rdp *self, struct stream *s, int *code)
    {
        /* check for fastpath first */
        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)
            {