summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2014-07-13 15:58:57 -0700
committerJay Sorg <jay.sorg@gmail.com>2014-07-13 15:58:57 -0700
commit4ded149eb59e7bc75eb33c3cd91a521c37e4befc (patch)
tree99556e2f2481c7ac4410c41f7f6ab56612952ad2
parent90790e49d3ea3c5089d07a98ea9b7eb950f8dc29 (diff)
parent194ad781ba4e5939de815466d6ae5393daf7b86c (diff)
downloadxrdp-proprietary-4ded149eb59e7bc75eb33c3cd91a521c37e4befc.tar.gz
xrdp-proprietary-4ded149eb59e7bc75eb33c3cd91a521c37e4befc.zip
Merge branch 'devel' of github.com:neutrinolabs/xrdp into devel
-rw-r--r--libxrdp/xrdp_iso.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libxrdp/xrdp_iso.c b/libxrdp/xrdp_iso.c
index 35274266..633dc5a9 100644
--- 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)
{