From 24e4b8c937745ccd6855ce6e3d92c36a6f262c28 Mon Sep 17 00:00:00 2001
From: speidy <speidy@gmail.com>
Date: Wed, 25 Sep 2013 18:07:20 +0300
Subject: [PATCH] libxrdp: work on RDP negotiation part

---
 libxrdp/xrdp_iso.c | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/libxrdp/xrdp_iso.c b/libxrdp/xrdp_iso.c
index bd6c106e..99920702 100644
--- a/libxrdp/xrdp_iso.c
+++ b/libxrdp/xrdp_iso.c
@@ -59,30 +59,39 @@ xrdp_iso_recv_rdpnegreq(struct xrdp_iso *self, struct stream *s, int *requestedP
 
     *requestedProtocol = 0;
 
+    DEBUG(("     in xrdp_iso_recv_rdpnegreq"));
+
     in_uint8(s, type);
     if (type != RDP_NEG_REQ)
     {
+        DEBUG(("       xrdp_iso_recv_rdpnegreq: type: %x",type));
         return 1;
     }
 
     in_uint8(s, flags);
-    if (type != 0x0)
+    if (flags != 0x0)
     {
+        DEBUG(("       xrdp_iso_recv_rdpnegreq: flags: %x",flags));
         return 1;
     }
 
-    in_uint16_be(s, len);
-    if (len != 0x8) // fixed length
+    in_uint16_le(s, len);
+    if (len != 8) // fixed length
     {
+        DEBUG(("       xrdp_iso_recv_rdpnegreq: length: %x",len));
         return 1;
     }
 
-    in_uint32_be(s, *requestedProtocol);
-    if (requestedProtocol != PROTOCOL_RDP || PROTOCOL_SSL || PROTOCOL_HYBRID || PROTOCOL_HYBRID_EX)
-    {
-        return 1;
-    }
+    in_uint32_le(s, *requestedProtocol);
 
+    //TODO: think of protocol verification logic
+//    if (requestedProtocol != PROTOCOL_RDP || PROTOCOL_SSL || PROTOCOL_HYBRID || PROTOCOL_HYBRID_EX)
+//    {
+//        DEBUG(("       xrdp_iso_recv_rdpnegreq: wrong requestedProtocol: %x",requestedProtocol));
+//        return 1;
+//    }
+
+    DEBUG(("     out xrdp_iso_recv_rdpnegreq"));
     return 0;
 }
 /*****************************************************************************/