--- sourceforge.net/trunk/rdesktop/rdp.c	2003/07/28 18:13:30	436
+++ sourceforge.net/trunk/rdesktop/rdp.c	2004/04/20 07:01:21	676
@@ -18,23 +18,25 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
+#include <time.h>
 #include "rdesktop.h"
 
 extern uint16 g_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;
-extern int server_bpp;
+extern char g_username[16];
+extern BOOL g_bitmap_compression;
+extern BOOL g_orders;
+extern BOOL g_encryption;
+extern BOOL g_desktop_save;
+extern BOOL g_use_rdp5;
+extern uint16 g_server_rdp_version;
+extern uint32 g_rdp5_performanceflags;
+extern int g_server_bpp;
 
-uint8 *next_packet;
-uint32 rdp_shareid;
+uint8 *g_next_packet;
+uint32 g_rdp_shareid;
 
 #if WITH_DEBUG
-static uint32 packetno;
+static uint32 g_packetno;
 #endif
 
 /* Receive an RDP packet */
@@ -44,24 +46,24 @@
 	static STREAM rdp_s;
 	uint16 length, pdu_type;
 
-	if ((rdp_s == NULL) || (next_packet >= rdp_s->end))
+	if ((rdp_s == NULL) || (g_next_packet >= rdp_s->end))
 	{
 		rdp_s = sec_recv();
 		if (rdp_s == NULL)
 			return NULL;
 
-		next_packet = rdp_s->p;
+		g_next_packet = rdp_s->p;
 	}
 	else
 	{
-		rdp_s->p = next_packet;
+		rdp_s->p = g_next_packet;
 	}
 
 	in_uint16_le(rdp_s, length);
 	/* 32k packets are really 8, keepalive fix */
 	if (length == 0x8000)
 	{
-		next_packet += 8;
+		g_next_packet += 8;
 		*type = 0;
 		return rdp_s;
 	}
@@ -70,11 +72,11 @@
 	*type = pdu_type & 0xf;
 
 #if WITH_DEBUG
-	DEBUG(("RDP packet #%d, (type %x)\n", ++packetno, *type));
-	//      hexdump(next_packet, length);
+	DEBUG(("RDP packet #%d, (type %x)\n", ++g_packetno, *type));
+	hexdump(g_next_packet, length);
 #endif /*  */
 
-	next_packet += length;
+	g_next_packet += length;
 	return rdp_s;
 }
 
@@ -84,7 +86,7 @@
 {
 	STREAM s;
 
-	s = sec_init(encryption ? SEC_ENCRYPT : 0, maxlen + 18);
+	s = sec_init(g_encryption ? SEC_ENCRYPT : 0, maxlen + 18);
 	s_push_layer(s, rdp_hdr, 18);
 
 	return s;
@@ -103,7 +105,7 @@
 	out_uint16_le(s, (RDP_PDU_DATA | 0x10));
 	out_uint16_le(s, (g_mcs_userid + 1001));
 
-	out_uint32_le(s, rdp_shareid);
+	out_uint32_le(s, g_rdp_shareid);
 	out_uint8(s, 0);	/* pad */
 	out_uint8(s, 1);	/* streamid */
 	out_uint16_le(s, (length - 14));
@@ -111,7 +113,7 @@
 	out_uint8(s, 0);	/* compress_type */
 	out_uint16(s, 0);	/* compress_len */
 
-	sec_send(s, encryption ? SEC_ENCRYPT : 0);
+	sec_send(s, g_encryption ? SEC_ENCRYPT : 0);
 }
 
 /* Output a string in Unicode */
@@ -131,23 +133,50 @@
 	s->p += len;
 }
 
+/* Input a string in Unicode
+ *
+ * Returns str_len of string
+ */
+int
+rdp_in_unistr(STREAM s, char *string, int uni_len)
+{
+	int i = 0;
+
+	while (i < uni_len / 2)
+	{
+		in_uint8a(s, &string[i++], 1);
+		in_uint8s(s, 1);
+	}
+
+	return i - 1;
+}
+
+
 /* Parse a logon info packet */
 static void
 rdp_send_logon_info(uint32 flags, char *domain, char *user,
 		    char *password, char *program, char *directory)
 {
+	char *ipaddr = tcp_get_address();
 	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);
-	int len_ip = 2 * strlen("127.0.0.1");
+	int len_ip = 2 * strlen(ipaddr);
 	int len_dll = 2 * strlen("C:\\WINNT\\System32\\mstscax.dll");
 	int packetlen = 0;
-	uint32 sec_flags = encryption ? (SEC_LOGON_INFO | SEC_ENCRYPT) : SEC_LOGON_INFO;
+	uint32 sec_flags = g_encryption ? (SEC_LOGON_INFO | SEC_ENCRYPT) : SEC_LOGON_INFO;
 	STREAM s;
+	time_t t = time(NULL);
+	time_t tzone;
 
-	if (!use_rdp5 || 1 == server_rdp_version)
+#if 0
+	// enable rdp compression
+	flags |= RDP_COMPRESSION;
+#endif
+
+	if (!g_use_rdp5 || 1 == g_server_rdp_version)
 	{
 		DEBUG_RDP5(("Sending RDP4-style Logon packet\n"));
 
@@ -171,33 +200,33 @@
 	{
 		flags |= RDP_LOGON_BLOB;
 		DEBUG_RDP5(("Sending RDP5-style Logon packet\n"));
-		packetlen = 4 +	// Unknown uint32
-			4 +	// flags
-			2 +	// len_domain
-			2 +	// len_user
-			(flags & RDP_LOGON_AUTO ? 2 : 0) +	// len_password
-			(flags & RDP_LOGON_BLOB ? 2 : 0) +	// Length of BLOB
-			2 +	// len_program
-			2 +	// len_directory
-			(0 < len_domain ? len_domain : 2) +	// domain
-			len_user + (flags & RDP_LOGON_AUTO ? len_password : 0) + 0 +	// We have no 512 byte BLOB. Perhaps we must?
-			(flags & RDP_LOGON_BLOB && !(flags & RDP_LOGON_AUTO) ? 2 : 0) +	// After the BLOB is a unknown int16. If there is a BLOB, that is.
-			(0 < len_program ? len_program : 2) + (0 < len_directory ? len_directory : 2) + 2 +	// Unknown (2)
-			2 +	// Client ip length
-			len_ip +	// Client ip
-			2 +	// DLL string length
-			len_dll +	// DLL string
-			2 +	// Unknown
-			2 +	// Unknown
-			64 +	// Time zone #0
-			2 +	// Unknown
-			64 +	// Time zone #1
-			32;	// Unknown
+		packetlen = 4 +	/* Unknown uint32 */
+			4 +	/* flags */
+			2 +	/* len_domain */
+			2 +	/* len_user */
+			(flags & RDP_LOGON_AUTO ? 2 : 0) +	/* len_password */
+			(flags & RDP_LOGON_BLOB ? 2 : 0) +	/* Length of BLOB */
+			2 +	/* len_program */
+			2 +	/* len_directory */
+			(0 < len_domain ? len_domain : 2) +	/* domain */
+			len_user + (flags & RDP_LOGON_AUTO ? len_password : 0) + 0 +	/* We have no 512 byte BLOB. Perhaps we must? */
+			(flags & RDP_LOGON_BLOB && !(flags & RDP_LOGON_AUTO) ? 2 : 0) +	/* After the BLOB is a unknown int16. If there is a BLOB, that is. */
+			(0 < len_program ? len_program : 2) + (0 < len_directory ? len_directory : 2) + 2 +	/* Unknown (2) */
+			2 +	/* Client ip length */
+			len_ip +	/* Client ip */
+			2 +	/* DLL string length */
+			len_dll +	/* DLL string */
+			2 +	/* Unknown */
+			2 +	/* Unknown */
+			64 +	/* Time zone #0 */
+			2 +	/* Unknown */
+			64 +	/* Time zone #1 */
+			32;	/* Unknown */
 
 		s = sec_init(sec_flags, packetlen);
 		DEBUG_RDP5(("Called sec_init with packetlen %d\n", packetlen));
 
-		out_uint32(s, 0);	// Unknown
+		out_uint32(s, 0);	/* Unknown */
 		out_uint32_le(s, flags);
 		out_uint16_le(s, len_domain);
 		out_uint16_le(s, len_user);
@@ -243,16 +272,17 @@
 			out_uint16_le(s, 0);
 		}
 		out_uint16_le(s, 2);
-		out_uint16_le(s, len_ip + 2);	// Length of client ip
-		rdp_out_unistr(s, "127.0.0.1", len_ip);
+		out_uint16_le(s, len_ip + 2);	/* Length of client ip */
+		rdp_out_unistr(s, ipaddr, len_ip);
 		out_uint16_le(s, len_dll + 2);
 		rdp_out_unistr(s, "C:\\WINNT\\System32\\mstscax.dll", len_dll);
-		out_uint16_le(s, 0xffc4);
-		out_uint16_le(s, 0xffff);
+
+		tzone = (mktime(gmtime(&t)) - mktime(localtime(&t))) / 60;
+		out_uint32_le(s, tzone);
+
 		rdp_out_unistr(s, "GTB, normaltid", 2 * strlen("GTB, normaltid"));
 		out_uint8s(s, 62 - 2 * strlen("GTB, normaltid"));
 
-
 		out_uint32_le(s, 0x0a0000);
 		out_uint32_le(s, 0x050000);
 		out_uint32_le(s, 3);
@@ -268,7 +298,7 @@
 		out_uint32(s, 0);
 		out_uint32_le(s, 0xffffffc4);
 		out_uint32_le(s, 0xfffffffe);
-		out_uint32_le(s, 0x0f);
+		out_uint32_le(s, g_rdp5_performanceflags);
 		out_uint32(s, 0);
 
 
@@ -358,7 +388,7 @@
 	out_uint16_le(s, 0x200);	/* Protocol version */
 	out_uint16(s, 0);	/* Pad */
 	out_uint16(s, 0);	/* Compression types */
-	out_uint16_le(s, use_rdp5 ? 0x40d : 0);
+	out_uint16_le(s, g_use_rdp5 ? 0x40d : 0);
 	/* Pad, according to T.128. 0x40d seems to 
 	   trigger
 	   the server to start sending RDP5 packets. 
@@ -379,7 +409,7 @@
 	out_uint16_le(s, RDP_CAPSET_BITMAP);
 	out_uint16_le(s, RDP_CAPLEN_BITMAP);
 
-	out_uint16_le(s, 8);	/* Preferred BPP */
+	out_uint16_le(s, g_server_bpp);	/* Preferred 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 */
@@ -387,7 +417,7 @@
 	out_uint16_le(s, 600);	/* Desktop height */
 	out_uint16(s, 0);	/* Pad */
 	out_uint16(s, 0);	/* Allow resize */
-	out_uint16_le(s, bitmap_compression ? 1 : 0);	/* Support compression */
+	out_uint16_le(s, g_bitmap_compression ? 1 : 0);	/* Support compression */
 	out_uint16(s, 0);	/* Unknown */
 	out_uint16_le(s, 1);	/* Unknown */
 	out_uint16(s, 0);	/* Pad */
@@ -408,7 +438,7 @@
 	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[11] = (g_desktop_save == False ? 0 : 1);	/* desksave */
 	order_caps[13] = 1;	/* memblt */
 	order_caps[14] = 1;	/* triblt */
 	order_caps[22] = 1;	/* polyline */
@@ -426,7 +456,7 @@
 	out_uint8p(s, order_caps, 32);	/* Orders supported */
 	out_uint16_le(s, 0x6a1);	/* Text capability flags */
 	out_uint8s(s, 6);	/* Pad */
-	out_uint32_le(s, desktop_save == False ? 0 : 0x38400);	/* Desktop cache size */
+	out_uint32_le(s, g_desktop_save == False ? 0 : 0x38400);	/* Desktop cache size */
 	out_uint32(s, 0);	/* Unknown */
 	out_uint32_le(s, 0x4e4);	/* Unknown */
 }
@@ -439,7 +469,7 @@
 	out_uint16_le(s, RDP_CAPSET_BMPCACHE);
 	out_uint16_le(s, RDP_CAPLEN_BMPCACHE);
 
-	Bpp = (server_bpp + 7) / 8;
+	Bpp = (g_server_bpp + 7) / 8;
 	out_uint8s(s, 24);	/* unused */
 	out_uint16_le(s, 0x258);	/* entries */
 	out_uint16_le(s, 0x100 * Bpp);	/* max cell size */
@@ -546,7 +576,7 @@
 rdp_send_confirm_active(void)
 {
 	STREAM s;
-	uint32 sec_flags = encryption ? (RDP5_FLAG | SEC_ENCRYPT) : RDP5_FLAG;
+	uint32 sec_flags = g_encryption ? (RDP5_FLAG | SEC_ENCRYPT) : RDP5_FLAG;
 	uint16 caplen =
 		RDP_CAPLEN_GENERAL + RDP_CAPLEN_BITMAP + RDP_CAPLEN_ORDER +
 		RDP_CAPLEN_BMPCACHE + RDP_CAPLEN_COLCACHE +
@@ -559,7 +589,7 @@
 	out_uint16_le(s, (RDP_PDU_CONFIRM_ACTIVE | 0x10));	/* Version 1 */
 	out_uint16_le(s, (g_mcs_userid + 1001));
 
-	out_uint32_le(s, rdp_shareid);
+	out_uint32_le(s, g_rdp_shareid);
 	out_uint16_le(s, 0x3ea);	/* userid */
 	out_uint16_le(s, sizeof(RDP_SOURCE));
 	out_uint16_le(s, caplen);
@@ -588,10 +618,37 @@
 process_demand_active(STREAM s)
 {
 	uint8 type;
+	uint16 i;
+	uint16 p_bpp;
 
-	in_uint32_le(s, rdp_shareid);
+	in_uint32_le(s, g_rdp_shareid);
 
-	DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", rdp_shareid));
+	/* scan for prefered bpp */
+	while (s_check_rem(s, 6))
+	{
+		in_uint16_le(s, i);
+		if (i == RDP_CAPSET_BITMAP)
+		{
+			in_uint16_le(s, i);
+			if (i == RDP_CAPLEN_BITMAP)
+			{
+				in_uint16_le(s, p_bpp);
+				if (p_bpp == 8 || p_bpp == 15 || p_bpp == 16 || p_bpp == 24)
+				{
+					if (p_bpp < g_server_bpp)
+					{
+						warning("Server limited colour depth to %d bits\n",
+							p_bpp);
+						g_server_bpp = p_bpp;
+					}
+					break;
+				}
+			}
+		}
+	}
+
+
+	DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", g_rdp_shareid));
 
 	rdp_send_confirm_active();
 	rdp_send_synchronise();
@@ -600,22 +657,13 @@
 	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_input(0, RDP_INPUT_SYNCHRONIZE, 0, ui_get_numlock_state(read_keyboard_state()), 0);
 	rdp_send_fonts(1);
 	rdp_send_fonts(2);
 	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)
@@ -648,6 +696,23 @@
 	ui_set_cursor(cache_get_cursor(cache_idx));
 }
 
+/* Process a system pointer PDU */
+void
+process_system_pointer_pdu(STREAM s)
+{
+	uint16 system_pointer_type;
+
+	in_uint16(s, system_pointer_type);
+	switch (system_pointer_type)
+	{
+		case RDP_NULL_POINTER:
+			ui_set_null_cursor();
+			break;
+
+		default:
+			unimpl("System pointer message 0x%x\n", system_pointer_type);
+	}
+}
 
 /* Process a pointer PDU */
 static void
@@ -676,8 +741,12 @@
 			process_cached_pointer_pdu(s);
 			break;
 
+		case RDP_POINTER_SYSTEM:
+			process_system_pointer_pdu(s);
+			break;
+
 		default:
-			DEBUG(("Pointer message 0x%x\n", message_type));
+			unimpl("Pointer message 0x%x\n", message_type);
 	}
 }
 
@@ -817,15 +886,61 @@
 
 }
 
+/* Process a disconnect PDU */
+void
+process_disconnect_pdu(STREAM s, uint32 * ext_disc_reason)
+{
+	in_uint32_le(s, *ext_disc_reason);
+
+	DEBUG(("Received disconnect PDU\n"));
+}
+
 /* Process data PDU */
-static void
-process_data_pdu(STREAM s)
+static BOOL
+process_data_pdu(STREAM s, uint32 * ext_disc_reason)
 {
 	uint8 data_pdu_type;
+	uint8 ctype;
+	uint16 clen;
+	int len;
+#if 0
+	int roff, rlen, ret;
+	static struct stream ns;
+	static signed char *dict = 0;
+#endif
 
-	in_uint8s(s, 8);	/* shareid, pad, streamid, length */
+	in_uint8s(s, 6);	/* shareid, pad, streamid */
+	in_uint16(s, len);
 	in_uint8(s, data_pdu_type);
-	in_uint8s(s, 3);	/* compress_type, compress_len */
+	in_uint8(s, ctype);
+	in_uint16(s, clen);
+	clen -= 18;
+
+#if 0
+	if (ctype & 0x20)
+	{
+		if (!dict)
+		{
+			dict = (signed char *) malloc(8200 * sizeof(signed char));
+			dict = (signed char *) memset(dict, 0, 8200 * sizeof(signed char));
+		}
+
+		ret = decompress(s->p, clen, ctype, (signed char *) dict, &roff, &rlen);
+
+		len -= 18;
+
+		ns.data = xrealloc(ns.data, len);
+
+		ns.data = (unsigned char *) memcpy(ns.data, (unsigned char *) (dict + roff), len);
+
+		ns.size = len;
+		ns.end = ns.data + ns.size;
+		ns.p = ns.data;
+		ns.rdp_hdr = ns.p;
+
+		s = &ns;
+	}
+#endif
 
 	switch (data_pdu_type)
 	{
@@ -833,6 +948,14 @@
 			process_update_pdu(s);
 			break;
 
+		case RDP_DATA_PDU_CONTROL:
+			DEBUG(("Received Control PDU\n"));
+			break;
+
+		case RDP_DATA_PDU_SYNCHRONISE:
+			DEBUG(("Received Sync PDU\n"));
+			break;
+
 		case RDP_DATA_PDU_POINTER:
 			process_pointer_pdu(s);
 			break;
@@ -846,16 +969,22 @@
 			/* User logged on */
 			break;
 
+		case RDP_DATA_PDU_DISCONNECT:
+			process_disconnect_pdu(s, ext_disc_reason);
+			return True;
+
 		default:
 			unimpl("data PDU %d\n", data_pdu_type);
 	}
+	return False;
 }
 
 /* Process incoming packets */
-BOOL
-rdp_main_loop(void)
+void
+rdp_main_loop(BOOL * deactivated, uint32 * ext_disc_reason)
 {
 	uint8 type;
+	BOOL disc = False;	/* True when a disconnect PDU was received */
 	STREAM s;
 
 	while ((s = rdp_recv(&type)) != NULL)
@@ -864,20 +993,15 @@
 		{
 			case RDP_PDU_DEMAND_ACTIVE:
 				process_demand_active(s);
+				*deactivated = False;
 				break;
 
 			case RDP_PDU_DEACTIVATE:
-				DEBUG(("RDP_PDU_DEACTIVATE\n"));
-				/* We thought we could detect a clean
-				   shutdown of the session by this
-				   packet, but it seems Windows 2003
-				   is sending us one of these when we
-				   reconnect to a disconnected session
-				   return True; */
+				*deactivated = True;
 				break;
 
 			case RDP_PDU_DATA:
-				process_data_pdu(s);
+				disc = process_data_pdu(s, ext_disc_reason);
 				break;
 
 			case 0:
@@ -886,11 +1010,13 @@
 			default:
 				unimpl("PDU %d\n", type);
 		}
+
+		if (disc)
+		{
+			return;
+		}
 	}
-	return True;
-	/* We want to detect if we got a clean shutdown, but we
-	   can't. Se above.  
-	   return False;  */
+	return;
 }
 
 /* Establish a connection up to the RDP layer */
@@ -898,10 +1024,10 @@
 rdp_connect(char *server, uint32 flags, char *domain, char *password,
 	    char *command, char *directory)
 {
-	if (!sec_connect(server, username))
+	if (!sec_connect(server, g_username))
 		return False;
 
-	rdp_send_logon_info(flags, domain, username, password, command, directory);
+	rdp_send_logon_info(flags, domain, g_username, password, command, directory);
 	return True;
 }