--- sourceforge.net/trunk/rdesktop/rdp.c	2000/08/15 10:23:24	10
+++ sourceforge.net/trunk/rdesktop/rdp.c	2003/04/16 08:19:15	365
@@ -1,7 +1,7 @@
-/*
+/* -*- c-basic-offset: 8 -*-
    rdesktop: A Remote Desktop Protocol client.
    Protocol services - RDP layer
-   Copyright (C) Matthew Chapman 1999-2000
+   Copyright (C) Matthew Chapman 1999-2002
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -22,39 +22,23 @@
 
 extern uint16 mcs_userid;
 extern char username[16];
+extern BOOL bitmap_compression;
 extern BOOL orders;
+extern BOOL encryption;
+extern BOOL desktop_save;
+extern BOOL use_rdp5;
+extern uint16 server_rdp_version;
 
-unsigned char *next_packet;
+uint8 *next_packet;
 uint32 rdp_shareid;
 
-/* Initialise an RDP packet */
-static STREAM rdp_init(int maxlen)
-{
-	STREAM s;
-
-	s = sec_init(SEC_ENCRYPT, maxlen + 6);
-	s_push_layer(s, rdp_hdr, 6);
-
-	return s;
-}
-
-/* Send an RDP packet */
-static void rdp_send(STREAM s, uint8 pdu_type)
-{
-	uint16 length;
-
-	s_pop_layer(s, rdp_hdr);
-	length = s->end - s->p;
-
-	out_uint16_le(s, length);
-	out_uint16_le(s, (pdu_type | 0x10)); /* Version 1 */
-	out_uint16_le(s, (mcs_userid + 1001));
-
-	sec_send(s, SEC_ENCRYPT);
-}
+#if WITH_DEBUG
+static uint32 packetno;
+#endif
 
 /* Receive an RDP packet */
-static STREAM rdp_recv(uint8 *type)
+static STREAM
+rdp_recv(uint8 * type)
 {
 	static STREAM rdp_s;
 	uint16 length, pdu_type;
@@ -73,33 +57,41 @@
 	}
 
 	in_uint16_le(rdp_s, length);
+	/* 32k packets are really 8, keepalive fix */
+	if (length == 0x8000)
+	{
+		next_packet += 8;
+		*type = 0;
+		return rdp_s;
+	}
 	in_uint16_le(rdp_s, pdu_type);
-	in_uint8s(rdp_s, 2); /* userid */
-
-	next_packet += length;
+	in_uint8s(rdp_s, 2);	/* userid */
 	*type = pdu_type & 0xf;
 
-#if RDP_DEBUG
-	DEBUG("RDP packet (type %x):\n", *type);
-	hexdump(rdp_s->p, length);
-#endif
+#if WITH_DEBUG
+	DEBUG(("RDP packet #%d, (type %x)\n", ++packetno, *type));
+	//      hexdump(next_packet, length);
+#endif /*  */
 
+	next_packet += length;
 	return rdp_s;
 }
 
 /* Initialise an RDP data packet */
-static STREAM rdp_init_data(int maxlen)
+static STREAM
+rdp_init_data(int maxlen)
 {
 	STREAM s;
 
-	s = sec_init(SEC_ENCRYPT, maxlen + 18);
+	s = sec_init(encryption ? SEC_ENCRYPT : 0, maxlen + 18);
 	s_push_layer(s, rdp_hdr, 18);
 
 	return s;
 }
 
 /* Send an RDP data packet */
-static void rdp_send_data(STREAM s, uint8 data_pdu_type)
+static void
+rdp_send_data(STREAM s, uint8 data_pdu_type)
 {
 	uint16 length;
 
@@ -111,18 +103,19 @@
 	out_uint16_le(s, (mcs_userid + 1001));
 
 	out_uint32_le(s, rdp_shareid);
-	out_uint8(s, 0);  /* pad */
-	out_uint8(s, 1);  /* streamid */
-	out_uint16(s, (length - 14));
+	out_uint8(s, 0);	/* pad */
+	out_uint8(s, 1);	/* streamid */
+	out_uint16_le(s, (length - 14));
 	out_uint8(s, data_pdu_type);
-	out_uint8(s, 0);  /* compress_type */
-	out_uint16(s, 0); /* compress_len */
+	out_uint8(s, 0);	/* compress_type */
+	out_uint16(s, 0);	/* compress_len */
 
-	sec_send(s, SEC_ENCRYPT);
+	sec_send(s, encryption ? SEC_ENCRYPT : 0);
 }
 
 /* Output a string in Unicode */
-void rdp_out_unistr(STREAM s, char *string, int len)
+void
+rdp_out_unistr(STREAM s, char *string, int len)
 {
 	int i = 0, j = 0;
 
@@ -138,60 +131,127 @@
 }
 
 /* Parse a logon info packet */
-static void rdp_send_logon_info(uint32 flags, char *domain, char *user,
-				char *password, char *program, char *directory)
-{
-	int len_domain    = 2 * strlen(domain);
-	int len_user      = 2 * strlen(user);
-	int len_password  = 2 * strlen(password);
-	int len_program   = 2 * strlen(program);
+static void
+rdp_send_logon_info(uint32 flags, char *domain, char *user,
+		    char *password, char *program, char *directory)
+{
+	int len_domain = 2 * strlen(domain);
+	int len_user = 2 * strlen(user);
+	int len_password = 2 * strlen(password);
+	int len_program = 2 * strlen(program);
 	int len_directory = 2 * strlen(directory);
-	uint32 sec_flags = SEC_LOGON_INFO | SEC_ENCRYPT;
+	uint32 sec_flags = encryption ? (SEC_LOGON_INFO | SEC_ENCRYPT) : SEC_LOGON_INFO;
 	STREAM s;
 
-	s = sec_init(sec_flags, 18 + len_domain + len_user + len_password
-					+ len_program + len_directory + 10);
+	if (1 == server_rdp_version)
+	{
+		DEBUG_RDP5(("Sending RDP4-style Logon packet\n"));
+
+		s = sec_init(sec_flags, 18 + len_domain + len_user + len_password
+			     + len_program + len_directory + 10);
 
-	out_uint32(s, 0);
-	out_uint32_le(s, flags);
-	out_uint16_le(s, len_domain);
-	out_uint16_le(s, len_user);
-	out_uint16_le(s, len_password);
-	out_uint16_le(s, len_program);
-	out_uint16_le(s, len_directory);
-	rdp_out_unistr(s, domain,    len_domain);
-	rdp_out_unistr(s, user,      len_user);
-	rdp_out_unistr(s, password,  len_password);
-	rdp_out_unistr(s, program,   len_program);
-	rdp_out_unistr(s, directory, len_directory);
+		out_uint32(s, 0);
+		out_uint32_le(s, flags);
+		out_uint16_le(s, len_domain);
+		out_uint16_le(s, len_user);
+		out_uint16_le(s, len_password);
+		out_uint16_le(s, len_program);
+		out_uint16_le(s, len_directory);
+		rdp_out_unistr(s, domain, len_domain);
+		rdp_out_unistr(s, user, len_user);
+		rdp_out_unistr(s, password, len_password);
+		rdp_out_unistr(s, program, len_program);
+		rdp_out_unistr(s, directory, len_directory);
+	}
+	else
+	{
+		DEBUG_RDP5(("Sending RDP5-style Logon packet\n"));
+		s = sec_init(sec_flags, 12 + (flags & RDP_LOGON_AUTO ? 2 : 0) + 6 + (flags & RDP_LOGON_AUTO ? len_password : 0) + len_domain + len_user + 4 + len_program + len_directory + 30 + 2 + 60 + 32 + 20 + 32 + 20);	/* Phew! */
 
+		out_uint32(s, 0);
+		out_uint32_le(s, flags);
+		out_uint16_le(s, len_domain);
+		out_uint16_le(s, len_user);
+		if (flags & RDP_LOGON_AUTO)
+		{
+			out_uint16_le(s, len_password);
+		}
+		out_uint16(s, 0);	/* Seems to be length of a 512 byte blob with
+					   completely unknown data, but hopefully we'll do
+					   with a 0 length block as well */
+		out_uint16_le(s, len_program);
+		out_uint16_le(s, len_directory);
+		if (flags & RDP_LOGON_AUTO)
+		{
+			rdp_out_unistr(s, password, len_password);
+		}
+		rdp_out_unistr(s, domain, len_domain);
+		rdp_out_unistr(s, user, len_user);
+		out_uint16(s, 0);
+		out_uint16(s, 0);
+		if (0 < len_program)
+			rdp_out_unistr(s, program, len_program);
+		if (0 < len_directory)
+			rdp_out_unistr(s, directory, len_directory);
+		out_uint8s(s, 30);	/* Some kind of client data - let's see if the server
+					   handles zeros well.. */
+		out_uint16_le(s, 60);
+		rdp_out_unistr(s, "C:\\WINNT\\System32\\mstscax.dll", 58);
+		out_uint32_be(s, 0x88ffffff);
+		rdp_out_unistr(s, "GTB, normaltid", 2 * strlen("GTB, normaltid") - 2);
+		out_uint8s(s, 30 - 2 * strlen("GTP, normaltid"));
+
+		out_uint32_le(s, 0x0a0000);
+		out_uint32_le(s, 0x050000);
+		out_uint32_le(s, 2);
+		out_uint32(s, 0);
+		out_uint32_le(s, 0xffffffc4);
+		out_uint32_le(s, 0xfffffffe);
+		out_uint32_le(s, 0x0f);
+		out_uint32(s, 0);
+
+		rdp_out_unistr(s, "GTB, sommartid", 2 * strlen("GTB, sommartid") - 1);
+		out_uint8s(s, 30 - 2 * strlen("GTP, sommartid"));
+
+		out_uint32_le(s, 0x030000);
+		out_uint32_le(s, 0x050000);
+		out_uint32_le(s, 2);
+		out_uint32(s, 0);
+		out_uint32_le(s, 0xffffffc4);
+		out_uint32_le(s, 0xfffffffe);
+		out_uint32_le(s, 0x0f);
+		out_uint32(s, 0);
+
+	}
 	s_mark_end(s);
 	sec_send(s, sec_flags);
 }
 
 /* Send a control PDU */
-static void rdp_send_control(uint16 action)
+static void
+rdp_send_control(uint16 action)
 {
 	STREAM s;
 
 	s = rdp_init_data(8);
 
 	out_uint16_le(s, action);
-	out_uint16(s, 0); /* userid */
-	out_uint32(s, 0); /* control id */
+	out_uint16(s, 0);	/* userid */
+	out_uint32(s, 0);	/* control id */
 
 	s_mark_end(s);
 	rdp_send_data(s, RDP_DATA_PDU_CONTROL);
 }
 
 /* Send a synchronisation PDU */
-static void rdp_send_synchronise()
+static void
+rdp_send_synchronise(void)
 {
 	STREAM s;
 
 	s = rdp_init_data(4);
 
-	out_uint16_le(s, 1); /* type */
+	out_uint16_le(s, 1);	/* type */
 	out_uint16_le(s, 1002);
 
 	s_mark_end(s);
@@ -199,15 +259,15 @@
 }
 
 /* Send a single input event */
-void rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags,
-		    uint16 param1, uint16 param2)
+void
+rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, uint16 param1, uint16 param2)
 {
 	STREAM s;
 
 	s = rdp_init_data(16);
 
-	out_uint16_le(s, 1); /* number of events */
-	out_uint16(s, 0);    /* pad */
+	out_uint16_le(s, 1);	/* number of events */
+	out_uint16(s, 0);	/* pad */
 
 	out_uint32_le(s, time);
 	out_uint16_le(s, message_type);
@@ -220,7 +280,8 @@
 }
 
 /* Send an (empty) font information PDU */
-static void rdp_send_fonts(uint16 seq)
+static void
+rdp_send_fonts(uint16 seq)
 {
 	STREAM s;
 
@@ -236,17 +297,25 @@
 }
 
 /* Output general capability set */
-static void rdp_out_general_caps(STREAM s)
+static void
+rdp_out_general_caps(STREAM s)
 {
 	out_uint16_le(s, RDP_CAPSET_GENERAL);
 	out_uint16_le(s, RDP_CAPLEN_GENERAL);
 
 	out_uint16_le(s, 1);	/* OS major type */
 	out_uint16_le(s, 3);	/* OS minor type */
-	out_uint16_le(s, 0x200); /* Protocol version */
+	out_uint16_le(s, 0x200);	/* Protocol version */
 	out_uint16(s, 0);	/* Pad */
 	out_uint16(s, 0);	/* Compression types */
-	out_uint16(s, 0);	/* Pad */
+	out_uint16_le(s, use_rdp5 ? 0x40d : 0);
+	/* Pad, according to T.128. 0x40d seems to 
+	   trigger
+	   the server to start sending RDP5 packets. 
+	   However, the value is 0x1d04 with W2KTSK and
+	   NT4MS. Hmm.. Anyway, thankyou, Microsoft,
+	   for sending such information in a padding 
+	   field.. */
 	out_uint16(s, 0);	/* Update capability */
 	out_uint16(s, 0);	/* Remote unshare capability */
 	out_uint16(s, 0);	/* Compression level */
@@ -254,32 +323,46 @@
 }
 
 /* Output bitmap capability set */
-static void rdp_out_bitmap_caps(STREAM s)
+static void
+rdp_out_bitmap_caps(STREAM s)
 {
 	out_uint16_le(s, RDP_CAPSET_BITMAP);
 	out_uint16_le(s, RDP_CAPLEN_BITMAP);
 
 	out_uint16_le(s, 8);	/* Preferred BPP */
-	out_uint16(s, 1);	/* Receive 1 BPP */
-	out_uint16(s, 1);	/* Receive 4 BPP */
+	out_uint16_le(s, 1);	/* Receive 1 BPP */
+	out_uint16_le(s, 1);	/* Receive 4 BPP */
 	out_uint16_le(s, 1);	/* Receive 8 BPP */
 	out_uint16_le(s, 800);	/* Desktop width */
 	out_uint16_le(s, 600);	/* Desktop height */
 	out_uint16(s, 0);	/* Pad */
 	out_uint16(s, 0);	/* Allow resize */
-	out_uint16_le(s, 1);	/* Support compression */
+	out_uint16_le(s, bitmap_compression ? 1 : 0);	/* Support compression */
 	out_uint16(s, 0);	/* Unknown */
 	out_uint16_le(s, 1);	/* Unknown */
 	out_uint16(s, 0);	/* Pad */
 }
 
 /* Output order capability set */
-static void rdp_out_order_caps(STREAM s)
+static void
+rdp_out_order_caps(STREAM s)
 {
 	uint8 order_caps[32];
 
-	memset(order_caps, orders, 32);
 
+	memset(order_caps, 0, 32);
+	order_caps[0] = 1;	/* dest blt */
+	order_caps[1] = 1;	/* pat blt */
+	order_caps[2] = 1;	/* screen blt */
+	order_caps[3] = 1;	/* required for memblt? */
+	order_caps[8] = 1;	/* line */
+	order_caps[9] = 1;	/* line */
+	order_caps[10] = 1;	/* rect */
+	order_caps[11] = (desktop_save == False ? 0 : 1);	/* desksave */
+	order_caps[13] = 1;	/* memblt */
+	order_caps[14] = 1;	/* triblt */
+	order_caps[22] = 1;	/* polyline */
+	order_caps[27] = 1;	/* text2 */
 	out_uint16_le(s, RDP_CAPSET_ORDER);
 	out_uint16_le(s, RDP_CAPLEN_ORDER);
 
@@ -289,32 +372,34 @@
 	out_uint16(s, 0);	/* Pad */
 	out_uint16_le(s, 1);	/* Max order level */
 	out_uint16_le(s, 0x147);	/* Number of fonts */
-	out_uint16_le(s, 0x2a);		/* Capability flags */
+	out_uint16_le(s, 0x2a);	/* Capability flags */
 	out_uint8p(s, order_caps, 32);	/* Orders supported */
 	out_uint16_le(s, 0x6a1);	/* Text capability flags */
 	out_uint8s(s, 6);	/* Pad */
-	out_uint32(s, 0x38400);	/* Desktop cache size */
+	out_uint32_le(s, desktop_save == False ? 0 : 0x38400);	/* Desktop cache size */
 	out_uint32(s, 0);	/* Unknown */
-	out_uint32(s, 0x4e4);	/* Unknown */
+	out_uint32_le(s, 0x4e4);	/* Unknown */
 }
 
 /* Output bitmap cache capability set */
-static void rdp_out_bmpcache_caps(STREAM s)
+static void
+rdp_out_bmpcache_caps(STREAM s)
 {
 	out_uint16_le(s, RDP_CAPSET_BMPCACHE);
 	out_uint16_le(s, RDP_CAPLEN_BMPCACHE);
 
-	out_uint8s(s, 24); /* unused */
-	out_uint16_le(s, 0x258); /* entries */
-	out_uint16_le(s, 0x100); /* max cell size */
-	out_uint16_le(s, 0x12c); /* entries */
-	out_uint16_le(s, 0x400); /* max cell size */
-	out_uint16_le(s, 0x106); /* entries */
-	out_uint16_le(s, 0x1000); /* max cell size */
+	out_uint8s(s, 24);	/* unused */
+	out_uint16_le(s, 0x258);	/* entries */
+	out_uint16_le(s, 0x100);	/* max cell size */
+	out_uint16_le(s, 0x12c);	/* entries */
+	out_uint16_le(s, 0x400);	/* max cell size */
+	out_uint16_le(s, 0x106);	/* entries */
+	out_uint16_le(s, 0x1000);	/* max cell size */
 }
 
 /* Output control capability set */
-static void rdp_out_control_caps(STREAM s)
+static void
+rdp_out_control_caps(STREAM s)
 {
 	out_uint16_le(s, RDP_CAPSET_CONTROL);
 	out_uint16_le(s, RDP_CAPLEN_CONTROL);
@@ -326,7 +411,8 @@
 }
 
 /* Output activation capability set */
-static void rdp_out_activate_caps(STREAM s)
+static void
+rdp_out_activate_caps(STREAM s)
 {
 	out_uint16_le(s, RDP_CAPSET_ACTIVATE);
 	out_uint16_le(s, RDP_CAPLEN_ACTIVATE);
@@ -338,7 +424,8 @@
 }
 
 /* Output pointer capability set */
-static void rdp_out_pointer_caps(STREAM s)
+static void
+rdp_out_pointer_caps(STREAM s)
 {
 	out_uint16_le(s, RDP_CAPSET_POINTER);
 	out_uint16_le(s, RDP_CAPLEN_POINTER);
@@ -348,7 +435,8 @@
 }
 
 /* Output share capability set */
-static void rdp_out_share_caps(STREAM s)
+static void
+rdp_out_share_caps(STREAM s)
 {
 	out_uint16_le(s, RDP_CAPSET_SHARE);
 	out_uint16_le(s, RDP_CAPLEN_SHARE);
@@ -358,7 +446,8 @@
 }
 
 /* Output colour cache capability set */
-static void rdp_out_colcache_caps(STREAM s)
+static void
+rdp_out_colcache_caps(STREAM s)
 {
 	out_uint16_le(s, RDP_CAPSET_COLCACHE);
 	out_uint16_le(s, RDP_CAPLEN_COLCACHE);
@@ -368,46 +457,64 @@
 }
 
 static uint8 canned_caps[] = {
-0x01,0x00,0x00,0x00,0x09,0x04,0x00,0x00,0x04,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x08,0x00,0x01,
-0x00,0x00,0x00,0x0E,0x00,0x08,0x00,0x01,0x00,0x00,0x00,0x10,0x00,0x34,0x00,0xFE,
-0x00,0x04,0x00,0xFE,0x00,0x04,0x00,0xFE,0x00,0x08,0x00,0xFE,0x00,0x08,0x00,0xFE,
-0x00,0x10,0x00,0xFE,0x00,0x20,0x00,0xFE,0x00,0x40,0x00,0xFE,0x00,0x80,0x00,0xFE,
-0x00,0x00,0x01,0x40,0x00,0x00,0x08,0x00,0x01,0x00,0x01,0x02,0x00,0x00,0x00
+	0x01, 0x00, 0x00, 0x00, 0x09, 0x04, 0x00, 0x00, 0x04,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00,
+	0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+	0x0C, 0x00, 0x08, 0x00, 0x01,
+	0x00, 0x00, 0x00, 0x0E, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00,
+	0x10, 0x00, 0x34, 0x00, 0xFE,
+	0x00, 0x04, 0x00, 0xFE, 0x00, 0x04, 0x00, 0xFE, 0x00, 0x08, 0x00,
+	0xFE, 0x00, 0x08, 0x00, 0xFE,
+	0x00, 0x10, 0x00, 0xFE, 0x00, 0x20, 0x00, 0xFE, 0x00, 0x40, 0x00,
+	0xFE, 0x00, 0x80, 0x00, 0xFE,
+	0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x08, 0x00, 0x01, 0x00, 0x01,
+	0x02, 0x00, 0x00, 0x00
 };
 
-/* Output unknown capability set */
-static void rdp_out_unknown_caps(STREAM s)
+/* Output unknown capability sets (number 13, 12, 14 and 16) */
+static void
+rdp_out_unknown_caps(STREAM s)
 {
 	out_uint16_le(s, RDP_CAPSET_UNKNOWN);
 	out_uint16_le(s, 0x58);
-	
-	out_uint8p(s, canned_caps, RDP_CAPLEN_UNKNOWN-4);
+
+	out_uint8p(s, canned_caps, RDP_CAPLEN_UNKNOWN - 4);
 }
 
+#define RDP5_FLAG 0x0030
 /* Send a confirm active PDU */
-static void rdp_send_confirm_active()
+static void
+rdp_send_confirm_active(void)
 {
 	STREAM s;
-	uint16 caplen = RDP_CAPLEN_GENERAL + RDP_CAPLEN_BITMAP + RDP_CAPLEN_ORDER
-		+ RDP_CAPLEN_BMPCACHE + RDP_CAPLEN_COLCACHE + RDP_CAPLEN_ACTIVATE
-		+ RDP_CAPLEN_CONTROL + RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE
-		+ RDP_CAPLEN_UNKNOWN;
+	uint32 sec_flags = encryption ? (RDP5_FLAG | SEC_ENCRYPT) : RDP5_FLAG;
+	uint16 caplen =
+		RDP_CAPLEN_GENERAL + RDP_CAPLEN_BITMAP + RDP_CAPLEN_ORDER +
+		RDP_CAPLEN_BMPCACHE + RDP_CAPLEN_COLCACHE +
+		RDP_CAPLEN_ACTIVATE + RDP_CAPLEN_CONTROL +
+		RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE + RDP_CAPLEN_UNKNOWN + 4 /* w2k fix, why? */ ;
 
-	s = rdp_init(14 + caplen + sizeof(RDP_SOURCE));
+	s = sec_init(sec_flags, 6 + 14 + caplen + sizeof(RDP_SOURCE));
+
+	out_uint16_le(s, 2 + 14 + caplen + sizeof(RDP_SOURCE));
+	out_uint16_le(s, (RDP_PDU_CONFIRM_ACTIVE | 0x10));	/* Version 1 */
+	out_uint16_le(s, (mcs_userid + 1001));
 
 	out_uint32_le(s, rdp_shareid);
-	out_uint16_le(s, 0x3ea); /* userid */
+	out_uint16_le(s, 0x3ea);	/* userid */
 	out_uint16_le(s, sizeof(RDP_SOURCE));
 	out_uint16_le(s, caplen);
 
 	out_uint8p(s, RDP_SOURCE, sizeof(RDP_SOURCE));
-	out_uint16_le(s, 0xd); /* num_caps */
-	out_uint8s(s, 2);     /* pad */
+	out_uint16_le(s, 0xd);	/* num_caps */
+	out_uint8s(s, 2);	/* pad */
 
 	rdp_out_general_caps(s);
 	rdp_out_bitmap_caps(s);
@@ -421,40 +528,84 @@
 	rdp_out_unknown_caps(s);
 
 	s_mark_end(s);
-	rdp_send(s, RDP_PDU_CONFIRM_ACTIVE);
+	sec_send(s, sec_flags);
 }
 
 /* Respond to a demand active PDU */
-static void process_demand_active(STREAM s)
+static void
+process_demand_active(STREAM s)
 {
 	uint8 type;
 
 	in_uint32_le(s, rdp_shareid);
 
-	DEBUG("DEMAND_ACTIVE(id=0x%x)\n", rdp_shareid);
+	DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", rdp_shareid));
 
 	rdp_send_confirm_active();
 	rdp_send_synchronise();
 	rdp_send_control(RDP_CTL_COOPERATE);
 	rdp_send_control(RDP_CTL_REQUEST_CONTROL);
-	rdp_recv(&type); // RDP_PDU_SYNCHRONIZE
-	rdp_recv(&type); // RDP_CTL_COOPERATE
-	rdp_recv(&type); // RDP_CTL_GRANT_CONTROL
+	rdp_recv(&type);	/* RDP_PDU_SYNCHRONIZE */
+	rdp_recv(&type);	/* RDP_CTL_COOPERATE */
+	rdp_recv(&type);	/* RDP_CTL_GRANT_CONTROL */
 	rdp_send_input(0, RDP_INPUT_SYNCHRONIZE, 0, 0, 0);
 	rdp_send_fonts(1);
 	rdp_send_fonts(2);
-	rdp_recv(&type); // RDP_PDU_UNKNOWN 0x28
+	rdp_recv(&type);	/* RDP_PDU_UNKNOWN 0x28 */
 	reset_order_state();
 }
 
+/* Process a null system pointer PDU */
+void
+process_null_system_pointer_pdu(STREAM s)
+{
+	// FIXME: We should probably set another cursor here, 
+	// like the X window system base cursor or something.
+	ui_set_cursor(cache_get_cursor(0));
+}
+
+/* Process a colour pointer PDU */
+void
+process_colour_pointer_pdu(STREAM s)
+{
+	uint16 x, y, width, height, cache_idx, masklen, datalen;
+	uint8 *mask, *data;
+	HCURSOR cursor;
+
+	in_uint16_le(s, cache_idx);
+	in_uint16_le(s, x);
+	in_uint16_le(s, y);
+	in_uint16_le(s, width);
+	in_uint16_le(s, height);
+	in_uint16_le(s, masklen);
+	in_uint16_le(s, datalen);
+	in_uint8p(s, data, datalen);
+	in_uint8p(s, mask, masklen);
+	cursor = ui_create_cursor(x, y, width, height, mask, data);
+	ui_set_cursor(cursor);
+	cache_put_cursor(cache_idx, cursor);
+}
+
+/* Process a cached pointer PDU */
+void
+process_cached_pointer_pdu(STREAM s)
+{
+	uint16 cache_idx;
+
+	in_uint16_le(s, cache_idx);
+	ui_set_cursor(cache_get_cursor(cache_idx));
+}
+
+
 /* Process a pointer PDU */
-static void process_pointer_pdu(STREAM s)
+static void
+process_pointer_pdu(STREAM s)
 {
 	uint16 message_type;
 	uint16 x, y;
 
 	in_uint16_le(s, message_type);
-	in_uint8s(s, 2); /* pad */
+	in_uint8s(s, 2);	/* pad */
 
 	switch (message_type)
 	{
@@ -465,18 +616,27 @@
 				ui_move_pointer(x, y);
 			break;
 
+		case RDP_POINTER_COLOR:
+			process_colour_pointer_pdu(s);
+			break;
+
+		case RDP_POINTER_CACHED:
+			process_cached_pointer_pdu(s);
+			break;
+
 		default:
-			DEBUG("Pointer message 0x%x\n", message_type);
+			DEBUG(("Pointer message 0x%x\n", message_type));
 	}
 }
 
 /* Process bitmap updates */
-static void process_bitmap_updates(STREAM s)
+void
+process_bitmap_updates(STREAM s)
 {
 	uint16 num_updates;
 	uint16 left, top, right, bottom, width, height;
-	uint16 cx, cy, bpp, compress, bufsize, size;
-	uint8 *data, *rawdata;
+	uint16 cx, cy, bpp, Bpp, compress, bufsize, size;
+	uint8 *data, *bmpdata;
 	int i;
 
 	in_uint16_le(s, num_updates);
@@ -490,64 +650,102 @@
 		in_uint16_le(s, width);
 		in_uint16_le(s, height);
 		in_uint16_le(s, bpp);
+		Bpp = (bpp + 7) / 8;
 		in_uint16_le(s, compress);
 		in_uint16_le(s, bufsize);
 
 		cx = right - left + 1;
 		cy = bottom - top + 1;
 
-		DEBUG("UPDATE(l=%d,t=%d,r=%d,b=%d,w=%d,h=%d,cmp=%d)\n",
-			left, top, right, bottom, width, height, compress);
+		DEBUG(("BITMAP_UPDATE(l=%d,t=%d,r=%d,b=%d,w=%d,h=%d,Bpp=%d,cmp=%d)\n",
+		       left, top, right, bottom, width, height, Bpp, compress));
 
 		if (!compress)
 		{
-			in_uint8p(s, data, bufsize);
-			ui_paint_bitmap(left, top, cx, cy, width, height, data);
-			return;
+			int y;
+			bmpdata = xmalloc(width * height * Bpp);
+			for (y = 0; y < height; y++)
+			{
+				in_uint8a(s, &bmpdata[(height - y - 1) * (width * Bpp)],
+					  width * Bpp);
+			}
+			ui_paint_bitmap(left, top, cx, cy, width, height, bmpdata);
+			xfree(bmpdata);
+			continue;
 		}
 
-		in_uint8s(s, 2); /* pad */
-		in_uint16_le(s, size);
-		in_uint8s(s, 4); /* line_size, final_size */
-		in_uint8p(s, data, size);
 
-		rawdata = xmalloc(width * height);
-		if (bitmap_decompress(rawdata, width, height, data, size))
+		if (compress & 0x400)
+		{
+			size = bufsize;
+		}
+		else
 		{
-			ui_paint_bitmap(left, top, cx, cy, width, height,
-					rawdata);
+			in_uint8s(s, 2);	/* pad */
+			in_uint16_le(s, size);
+			in_uint8s(s, 4);	/* line_size, final_size */
+		}
+		in_uint8p(s, data, size);
+		bmpdata = xmalloc(width * height * Bpp);
+		if (bitmap_decompress(bmpdata, width, height, data, size, Bpp))
+		{
+			ui_paint_bitmap(left, top, cx, cy, width, height, bmpdata);
+		}
+		else
+		{
+			DEBUG_RDP5(("Failed to decompress data\n"));
 		}
 
-		xfree(rawdata);
+		xfree(bmpdata);
 	}
 }
 
 /* Process a palette update */
-static void process_palette(STREAM s)
+void
+process_palette(STREAM s)
 {
-	HCOLOURMAP hmap;
+	COLOURENTRY *entry;
 	COLOURMAP map;
+	HCOLOURMAP hmap;
+	int i;
 
-	in_uint8s(s, 2); /* pad */
-        in_uint16_le(s, map.ncolours);
-	in_uint8s(s, 2); /* pad */
-        in_uint8p(s, (uint8 *)map.colours, (map.ncolours * 3));
+	in_uint8s(s, 2);	/* pad */
+	in_uint16_le(s, map.ncolours);
+	in_uint8s(s, 2);	/* pad */
+
+	map.colours = xmalloc(3 * map.ncolours);
+
+	DEBUG(("PALETTE(c=%d)\n", map.ncolours));
+
+	for (i = 0; i < map.ncolours; i++)
+	{
+		entry = &map.colours[i];
+		in_uint8(s, entry->red);
+		in_uint8(s, entry->green);
+		in_uint8(s, entry->blue);
+	}
 
 	hmap = ui_create_colourmap(&map);
 	ui_set_colourmap(hmap);
+
+	xfree(map.colours);
 }
 
 /* Process an update PDU */
-static void process_update_pdu(STREAM s)
+static void
+process_update_pdu(STREAM s)
 {
-	uint16 update_type;
+	uint16 update_type, count;
 
 	in_uint16_le(s, update_type);
 
 	switch (update_type)
 	{
 		case RDP_UPDATE_ORDERS:
-			process_orders(s);
+			in_uint8s(s, 2);	/* pad */
+			in_uint16_le(s, count);
+			in_uint8s(s, 2);	/* pad */
+			process_orders(s, count);
 			break;
 
 		case RDP_UPDATE_BITMAP:
@@ -562,19 +760,20 @@
 			break;
 
 		default:
-			NOTIMP("update %d\n", update_type);
+			unimpl("update %d\n", update_type);
 	}
 
 }
 
 /* Process data PDU */
-static void process_data_pdu(STREAM s)
+static void
+process_data_pdu(STREAM s)
 {
 	uint8 data_pdu_type;
 
-	in_uint8s(s, 8); /* shareid, pad, streamid, length */
+	in_uint8s(s, 8);	/* shareid, pad, streamid, length */
 	in_uint8(s, data_pdu_type);
-	in_uint8s(s, 3); /* compress_type, compress_len */
+	in_uint8s(s, 3);	/* compress_type, compress_len */
 
 	switch (data_pdu_type)
 	{
@@ -591,16 +790,18 @@
 			break;
 
 		case RDP_DATA_PDU_LOGON:
+			DEBUG(("Received Logon PDU\n"));
 			/* User logged on */
 			break;
 
 		default:
-			NOTIMP("data PDU %d\n", data_pdu_type);
+			unimpl("data PDU %d\n", data_pdu_type);
 	}
 }
 
 /* Process incoming packets */
-void rdp_main_loop()
+void
+rdp_main_loop(void)
 {
 	uint8 type;
 	STREAM s;
@@ -620,25 +821,30 @@
 				process_data_pdu(s);
 				break;
 
+			case 0:
+				break;
+
 			default:
-				NOTIMP("PDU %d\n", type);
+				unimpl("PDU %d\n", type);
 		}
 	}
 }
 
 /* Establish a connection up to the RDP layer */
-BOOL rdp_connect(char *server)
+BOOL
+rdp_connect(char *server, uint32 flags, char *domain, char *password,
+	    char *command, char *directory)
 {
-	if (!sec_connect(server))
+	if (!sec_connect(server, username))
 		return False;
 
-	rdp_send_logon_info(0x33, "", username, "", "", "");
+	rdp_send_logon_info(flags, domain, username, password, command, directory);
 	return True;
 }
 
 /* Disconnect from the RDP layer */
-void rdp_disconnect()
+void
+rdp_disconnect(void)
 {
 	sec_disconnect();
 }
-