Merge branch 'devel' of github.com:neutrinolabs/xrdp into devel

11 years ago · 4ded149eb5
parent 90790e49d3 194ad781ba
commit 4ded149eb5
1 changed files with 4 additions and 1 deletions
--- a/libxrdp/xrdp_iso.c
+++ b/libxrdp/xrdp_iso.c
@ -220,7 +220,7 @@ xrdp_iso_send_cc(struct xrdp_iso *self)

    len = (int) (s->end - holdp);
    len_indicator = (int) (s->end - len_indicator_ptr) - 1;
-    len_ptr[0] = len << 8;
+    len_ptr[0] = len >> 8;
    len_ptr[1] = len;
    len_indicator_ptr[0] = len_indicator;

@ -372,6 +372,9 @@ xrdp_iso_incoming(struct xrdp_iso *self)
        }
    }

+    /* set things for tls connection */
+
+
    /* send connection confirm back to client */
    if (xrdp_iso_send_cc(self) != 0)
    {