--- sourceforge.net/trunk/rdesktop/rdp.c	2004/04/17 07:37:07	668
+++ sourceforge.net/trunk/rdesktop/rdp.c	2005/03/19 15:30:14	866
@@ -1,7 +1,7 @@
 /* -*- c-basic-offset: 8 -*-
    rdesktop: A Remote Desktop Protocol client.
    Protocol services - RDP layer
-   Copyright (C) Matthew Chapman 1999-2002
+   Copyright (C) Matthew Chapman 1999-2005
 
    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
@@ -19,38 +19,76 @@
 */
 
 #include <time.h>
+#include <errno.h>
+#include <unistd.h>
 #include "rdesktop.h"
 
+#ifdef HAVE_ICONV
+#ifdef HAVE_ICONV_H
+#include <iconv.h>
+#endif
+
+#ifndef ICONV_CONST
+#define ICONV_CONST ""
+#endif
+#endif
+
 extern uint16 g_mcs_userid;
-extern char g_username[16];
+extern char g_username[64];
+extern char g_codepage[16];
 extern BOOL g_bitmap_compression;
 extern BOOL g_orders;
 extern BOOL g_encryption;
 extern BOOL g_desktop_save;
+extern BOOL g_polygon_ellipse_orders;
 extern BOOL g_use_rdp5;
 extern uint16 g_server_rdp_version;
 extern uint32 g_rdp5_performanceflags;
 extern int g_server_bpp;
+extern int g_width;
+extern int g_height;
+extern BOOL g_bitmap_cache;
+extern BOOL g_bitmap_cache_persist_enable;
 
 uint8 *g_next_packet;
 uint32 g_rdp_shareid;
 
+extern RDPCOMP g_mppc_dict;
+
 #if WITH_DEBUG
 static uint32 g_packetno;
 #endif
 
+#ifdef HAVE_ICONV
+static BOOL g_iconv_works = True;
+#endif
+
 /* Receive an RDP packet */
 static STREAM
 rdp_recv(uint8 * type)
 {
 	static STREAM rdp_s;
 	uint16 length, pdu_type;
+	uint8 rdpver;
 
 	if ((rdp_s == NULL) || (g_next_packet >= rdp_s->end))
 	{
-		rdp_s = sec_recv();
+		rdp_s = sec_recv(&rdpver);
 		if (rdp_s == NULL)
 			return NULL;
+		if (rdpver == 0xff)
+		{
+			g_next_packet = rdp_s->end;
+			*type = 0;
+			return rdp_s;
+		}
+		else if (rdpver != 3)
+		{
+			/* rdp5_process should move g_next_packet ok */
+			rdp5_process(rdp_s);
+			*type = 0;
+			return rdp_s;
+		}
 
 		g_next_packet = rdp_s->p;
 	}
@@ -120,17 +158,71 @@
 void
 rdp_out_unistr(STREAM s, char *string, int len)
 {
-	int i = 0, j = 0;
+#ifdef HAVE_ICONV
+	size_t ibl = strlen(string), obl = len + 2;
+	static iconv_t iconv_h = (iconv_t) - 1;
+	char *pin = string, *pout = (char *)s->p;
 
-	len += 2;
+	memset(pout, 0, len + 4);
 
-	while (i < len)
+	if (g_iconv_works)
 	{
-		s->p[i++] = string[j++];
-		s->p[i++] = 0;
+		if (iconv_h == (iconv_t) - 1)
+		{
+			size_t i = 1, o = 4;
+			if ((iconv_h = iconv_open(WINDOWS_CODEPAGE, g_codepage)) == (iconv_t) - 1)
+			{
+				warning("rdp_out_unistr: iconv_open[%s -> %s] fail %d\n",
+					g_codepage, WINDOWS_CODEPAGE, (int) iconv_h);
+
+				g_iconv_works = False;
+				rdp_out_unistr(s, string, len);
+				return;
+			}
+			if (iconv(iconv_h, (ICONV_CONST char **) &pin, &i, &pout, &o) ==
+			    (size_t) - 1)
+			{
+				iconv_close(iconv_h);
+				iconv_h = (iconv_t) - 1;
+				warning("rdp_out_unistr: iconv(1) fail, errno %d\n", errno);
+
+				g_iconv_works = False;
+				rdp_out_unistr(s, string, len);
+				return;
+			}
+			pin = string;
+			pout = (char *) s->p;
+		}
+
+		if (iconv(iconv_h, (ICONV_CONST char **) &pin, &ibl, &pout, &obl) == (size_t) - 1)
+		{
+			iconv_close(iconv_h);
+			iconv_h = (iconv_t) - 1;
+			warning("rdp_out_unistr: iconv(2) fail, errno %d\n", errno);
+
+			g_iconv_works = False;
+			rdp_out_unistr(s, string, len);
+			return;
+		}
+
+		s->p += len + 2;
+
 	}
+	else
+#endif
+	{
+		int i = 0, j = 0;
+
+		len += 2;
+
+		while (i < len)
+		{
+			s->p[i++] = string[j++];
+			s->p[i++] = 0;
+		}
 
-	s->p += len;
+		s->p += len;
+	}
 }
 
 /* Input a string in Unicode
@@ -140,15 +232,49 @@
 int
 rdp_in_unistr(STREAM s, char *string, int uni_len)
 {
-	int i = 0;
+#ifdef HAVE_ICONV
+	size_t ibl = uni_len, obl = uni_len;
+	char *pin = (char *)s->p, *pout = string;
+	static iconv_t iconv_h = (iconv_t) - 1;
 
-	while (i < uni_len / 2)
+	if (g_iconv_works)
 	{
-		in_uint8a(s, &string[i++], 1);
-		in_uint8s(s, 1);
+		if (iconv_h == (iconv_t) - 1)
+		{
+			if ((iconv_h = iconv_open(g_codepage, WINDOWS_CODEPAGE)) == (iconv_t) - 1)
+			{
+				warning("rdp_in_unistr: iconv_open[%s -> %s] fail %d\n",
+					WINDOWS_CODEPAGE, g_codepage, (int) iconv_h);
+
+				g_iconv_works = False;
+				return rdp_in_unistr(s, string, uni_len);
+			}
+		}
+
+		if (iconv(iconv_h, (ICONV_CONST char **) &pin, &ibl, &pout, &obl) == (size_t) - 1)
+		{
+			iconv_close(iconv_h);
+			iconv_h = (iconv_t) - 1;
+			warning("rdp_in_unistr: iconv fail, errno %d\n", errno);
+
+			g_iconv_works = False;
+			return rdp_in_unistr(s, string, uni_len);
+		}
+		return pout - string;
 	}
+	else
+#endif
+	{
+		int i = 0;
+
+		while (i < uni_len / 2)
+		{
+			in_uint8a(s, &string[i++], 1);
+			in_uint8s(s, 1);
+		}
 
-	return i - 1;
+		return i - 1;
+	}
 }
 
 
@@ -172,7 +298,8 @@
 	time_t tzone;
 
 #if 0
-	// enable rdp compression
+	/* enable rdp compression */
+	/* some problems still exist with rdp5 */
 	flags |= RDP_COMPRESSION;
 #endif
 
@@ -198,6 +325,7 @@
 	}
 	else
 	{
+
 		flags |= RDP_LOGON_BLOB;
 		DEBUG_RDP5(("Sending RDP5-style Logon packet\n"));
 		packetlen = 4 +	/* Unknown uint32 */
@@ -359,6 +487,50 @@
 	rdp_send_data(s, RDP_DATA_PDU_INPUT);
 }
 
+/* Inform the server on the contents of the persistent bitmap cache */
+static void
+rdp_enum_bmpcache2(void)
+{
+	STREAM s;
+	HASH_KEY keylist[BMPCACHE2_NUM_PSTCELLS];
+	uint32 num_keys, offset, count, flags;
+
+	offset = 0;
+	num_keys = pstcache_enumerate(2, keylist);
+
+	while (offset < num_keys)
+	{
+		count = MIN(num_keys - offset, 169);
+
+		s = rdp_init_data(24 + count * sizeof(HASH_KEY));
+
+		flags = 0;
+		if (offset == 0)
+			flags |= PDU_FLAG_FIRST;
+		if (num_keys - offset <= 169)
+			flags |= PDU_FLAG_LAST;
+
+		/* header */
+		out_uint32_le(s, 0);
+		out_uint16_le(s, count);
+		out_uint16_le(s, 0);
+		out_uint16_le(s, 0);
+		out_uint16_le(s, 0);
+		out_uint16_le(s, 0);
+		out_uint16_le(s, num_keys);
+		out_uint32_le(s, 0);
+		out_uint32_le(s, flags);
+
+		/* list */
+		out_uint8a(s, keylist[offset], count * sizeof(HASH_KEY));
+
+		s_mark_end(s);
+		rdp_send_data(s, 0x2b);
+
+		offset += 169;
+	}
+}
+
 /* Send an (empty) font information PDU */
 static void
 rdp_send_fonts(uint16 seq)
@@ -368,7 +540,7 @@
 	s = rdp_init_data(8);
 
 	out_uint16(s, 0);	/* number of fonts */
-	out_uint16_le(s, 0x3e);	/* unknown */
+	out_uint16_le(s, 0);	/* pad? */
 	out_uint16_le(s, seq);	/* unknown */
 	out_uint16_le(s, 0x32);	/* entry size */
 
@@ -416,7 +588,7 @@
 	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(s, 1);	/* Allow resize */
 	out_uint16_le(s, g_bitmap_compression ? 1 : 0);	/* Support compression */
 	out_uint16(s, 0);	/* Unknown */
 	out_uint16_le(s, 1);	/* Unknown */
@@ -429,19 +601,23 @@
 {
 	uint8 order_caps[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[3] = (g_bitmap_cache ? 1 : 0);	/* memblt */
+	order_caps[4] = 0;	/* triblt */
 	order_caps[8] = 1;	/* line */
 	order_caps[9] = 1;	/* line */
 	order_caps[10] = 1;	/* rect */
-	order_caps[11] = (g_desktop_save == False ? 0 : 1);	/* desksave */
+	order_caps[11] = (g_desktop_save ? 1 : 0);	/* desksave */
 	order_caps[13] = 1;	/* memblt */
 	order_caps[14] = 1;	/* triblt */
+	order_caps[20] = (g_polygon_ellipse_orders ? 1 : 0);	/* polygon */
+	order_caps[21] = (g_polygon_ellipse_orders ? 1 : 0);	/* polygon2 */
 	order_caps[22] = 1;	/* polyline */
+	order_caps[25] = (g_polygon_ellipse_orders ? 1 : 0);	/* ellipse */
+	order_caps[26] = (g_polygon_ellipse_orders ? 1 : 0);	/* ellipse2 */
 	order_caps[27] = 1;	/* text2 */
 	out_uint16_le(s, RDP_CAPSET_ORDER);
 	out_uint16_le(s, RDP_CAPLEN_ORDER);
@@ -479,6 +655,30 @@
 	out_uint16_le(s, 0x1000 * Bpp);	/* max cell size */
 }
 
+/* Output bitmap cache v2 capability set */
+static void
+rdp_out_bmpcache2_caps(STREAM s)
+{
+	out_uint16_le(s, RDP_CAPSET_BMPCACHE2);
+	out_uint16_le(s, RDP_CAPLEN_BMPCACHE2);
+
+	out_uint16_le(s, g_bitmap_cache_persist_enable ? 2 : 0);	/* version */
+
+	out_uint16_le(s, 0x0300);	/* flags? number of caches? */
+
+	out_uint32_le(s, BMPCACHE2_C0_CELLS);
+	out_uint32_le(s, BMPCACHE2_C1_CELLS);
+	if (pstcache_init(2))
+	{
+		out_uint32_le(s, BMPCACHE2_NUM_PSTCELLS | BMPCACHE2_FLAG_PERSIST);
+	}
+	else
+	{
+		out_uint32_le(s, BMPCACHE2_C2_CELLS);
+	}
+	out_uint8s(s, 20);	/* other bitmap caches not used */
+}
+
 /* Output control capability set */
 static void
 rdp_out_control_caps(STREAM s)
@@ -538,36 +738,41 @@
 	out_uint16(s, 0);	/* pad */
 }
 
-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
+static uint8 caps_0x0d[] = {
+	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
 };
 
-/* Output unknown capability sets (number 13, 12, 14 and 16) */
+static uint8 caps_0x0c[] = { 0x01, 0x00, 0x00, 0x00 };
+
+static uint8 caps_0x0e[] = { 0x01, 0x00, 0x00, 0x00 };
+
+static uint8 caps_0x10[] = {
+	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 sets */
 static void
-rdp_out_unknown_caps(STREAM s)
+rdp_out_unknown_caps(STREAM s, uint16 id, uint16 length, uint8 * caps)
 {
-	out_uint16_le(s, RDP_CAPSET_UNKNOWN);
-	out_uint16_le(s, 0x58);
+	out_uint16_le(s, id);
+	out_uint16_le(s, length);
 
-	out_uint8p(s, canned_caps, RDP_CAPLEN_UNKNOWN - 4);
+	out_uint8p(s, caps, length - 4);
 }
 
 #define RDP5_FLAG 0x0030
@@ -581,7 +786,9 @@
 		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? */ ;
+		RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE +
+		0x58 + 0x08 + 0x08 + 0x34 /* unknown caps */  +
+		4 /* w2k fix, why? */ ;
 
 	s = sec_init(sec_flags, 6 + 14 + caplen + sizeof(RDP_SOURCE));
 
@@ -601,54 +808,120 @@
 	rdp_out_general_caps(s);
 	rdp_out_bitmap_caps(s);
 	rdp_out_order_caps(s);
-	rdp_out_bmpcache_caps(s);
+	g_use_rdp5 ? rdp_out_bmpcache2_caps(s) : rdp_out_bmpcache_caps(s);
 	rdp_out_colcache_caps(s);
 	rdp_out_activate_caps(s);
 	rdp_out_control_caps(s);
 	rdp_out_pointer_caps(s);
 	rdp_out_share_caps(s);
-	rdp_out_unknown_caps(s);
+
+	rdp_out_unknown_caps(s, 0x0d, 0x58, caps_0x0d);	/* international? */
+	rdp_out_unknown_caps(s, 0x0c, 0x08, caps_0x0c);
+	rdp_out_unknown_caps(s, 0x0e, 0x08, caps_0x0e);
+	rdp_out_unknown_caps(s, 0x10, 0x34, caps_0x10);	/* glyph cache? */
 
 	s_mark_end(s);
 	sec_send(s, sec_flags);
 }
 
-/* Respond to a demand active PDU */
+/* Process a general capability set */
 static void
-process_demand_active(STREAM s)
+rdp_process_general_caps(STREAM s)
 {
-	uint8 type;
-	uint16 i;
-	uint16 p_bpp;
+	uint16 pad2octetsB;	/* rdp5 flags? */
 
-	in_uint32_le(s, g_rdp_shareid);
+	in_uint8s(s, 10);
+	in_uint16_le(s, pad2octetsB);
 
-	/* scan for prefered bpp */
-	while (s_check_rem(s, 6))
+	if (!pad2octetsB)
+		g_use_rdp5 = False;
+}
+
+/* Process a bitmap capability set */
+static void
+rdp_process_bitmap_caps(STREAM s)
+{
+	uint16 width, height, bpp;
+
+	in_uint16_le(s, bpp);
+	in_uint8s(s, 6);
+
+	in_uint16_le(s, width);
+	in_uint16_le(s, height);
+
+	DEBUG(("setting desktop size and bpp to: %dx%dx%d\n", width, height, bpp));
+
+	/*
+	 * The server may limit bpp and change the size of the desktop (for
+	 * example when shadowing another session).
+	 */
+	if (g_server_bpp != bpp)
 	{
-		in_uint16_le(s, i);
-		if (i == RDP_CAPSET_BITMAP)
+		warning("colour depth changed from %d to %d\n", g_server_bpp, bpp);
+		g_server_bpp = bpp;
+	}
+	if (g_width != width || g_height != height)
+	{
+		warning("screen size changed from %dx%d to %dx%d\n", g_width, g_height,
+			width, height);
+		g_width = width;
+		g_height = height;
+		ui_resize_window();
+	}
+}
+
+/* Process server capabilities */
+void
+rdp_process_server_caps(STREAM s, uint16 length)
+{
+	int n;
+	uint8 *next, *start;
+	uint16 ncapsets, capset_type, capset_length;
+
+	start = s->p;
+
+	in_uint16_le(s, ncapsets);
+	in_uint8s(s, 2);	/* pad */
+
+	for (n = 0; n < ncapsets; n++)
+	{
+		if (s->p > start + length)
+			return;
+
+		in_uint16_le(s, capset_type);
+		in_uint16_le(s, capset_length);
+
+		next = s->p + capset_length - 4;
+
+		switch (capset_type)
 		{
-			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;
-				}
-			}
+			case RDP_CAPSET_GENERAL:
+				rdp_process_general_caps(s);
+				break;
+
+			case RDP_CAPSET_BITMAP:
+				rdp_process_bitmap_caps(s);
+				break;
 		}
+
+		s->p = next;
 	}
+}
 
+/* Respond to a demand active PDU */
+static void
+process_demand_active(STREAM s)
+{
+	uint8 type;
+	uint16 len_src_descriptor, len_combined_caps;
+
+	in_uint32_le(s, g_rdp_shareid);
+	in_uint16_le(s, len_src_descriptor);
+	in_uint16_le(s, len_combined_caps);
+	in_uint8s(s, len_src_descriptor);
 
 	DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", g_rdp_shareid));
+	rdp_process_server_caps(s, len_combined_caps);
 
 	rdp_send_confirm_active();
 	rdp_send_synchronise();
@@ -658,9 +931,19 @@
 	rdp_recv(&type);	/* RDP_CTL_COOPERATE */
 	rdp_recv(&type);	/* RDP_CTL_GRANT_CONTROL */
 	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 */
+
+	if (g_use_rdp5)
+	{
+		rdp_enum_bmpcache2();
+		rdp_send_fonts(3);
+	}
+	else
+	{
+		rdp_send_fonts(1);
+		rdp_send_fonts(2);
+	}
+
+	rdp_recv(&type);	/* RDP_PDU_UNKNOWN 0x28 (Fonts?) */
 	reset_order_state();
 }
 
@@ -860,6 +1143,7 @@
 
 	in_uint16_le(s, update_type);
 
+	ui_begin_update();
 	switch (update_type)
 	{
 		case RDP_UPDATE_ORDERS:
@@ -883,22 +1167,30 @@
 		default:
 			unimpl("update %d\n", update_type);
 	}
+	ui_end_update();
+}
+
+/* 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
+	uint32 len;
+
+	uint32 roff, rlen;
+
+	struct stream *ns = &(g_mppc_dict.ns);
 
 	in_uint8s(s, 6);	/* shareid, pad, streamid */
 	in_uint16(s, len);
@@ -907,31 +1199,27 @@
 	in_uint16(s, clen);
 	clen -= 18;
 
-#if 0
-	if (ctype & 0x20)
+	if (ctype & RDP_MPPC_COMPRESSED)
 	{
-		if (!dict)
-		{
-			dict = (signed char *) malloc(8200 * sizeof(signed char));
-			dict = (signed char *) memset(dict, 0, 8200 * sizeof(signed char));
-		}
+		if (len > RDP_MPPC_DICT_SIZE)
+			error("error decompressed packet size exceeds max\n");
+		if (mppc_expand(s->p, clen, ctype, &roff, &rlen) == -1)
+			error("error while decompressing packet\n");
 
-		ret = decompress(s->p, clen, ctype, (signed char *) dict, &roff, &rlen);
+		/* len -= 18; */
 
-		len -= 18;
+		/* allocate memory and copy the uncompressed data into the temporary stream */
+		ns->data = (uint8 *) xrealloc(ns->data, rlen);
 
-		ns.data = xrealloc(ns.data, len);
+		memcpy((ns->data), (unsigned char *) (g_mppc_dict.hist + roff), rlen);
 
-		ns.data = (unsigned char *) memcpy(ns.data, (unsigned char *) (dict + roff), len);
+		ns->size = rlen;
+		ns->end = (ns->data + ns->size);
+		ns->p = ns->data;
+		ns->rdp_hdr = ns->p;
 
-		ns.size = len;
-		ns.end = ns.data + ns.size;
-		ns.p = ns.data;
-		ns.rdp_hdr = ns.p;
-
-		s = &ns;
+		s = ns;
 	}
-#endif
 
 	switch (data_pdu_type)
 	{
@@ -939,6 +1227,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;
@@ -953,56 +1249,61 @@
 			break;
 
 		case RDP_DATA_PDU_DISCONNECT:
-			/* Normally received when user logs out or disconnects from a
-			   console session on Windows XP and 2003 Server */
-			DEBUG(("Received disconnect PDU\n"));
-			break;
+			process_disconnect_pdu(s, ext_disc_reason);
+			return True;
 
 		default:
 			unimpl("data PDU %d\n", data_pdu_type);
 	}
+	return False;
 }
 
 /* Process incoming packets */
+/* nevers gets out of here till app is done */
+void
+rdp_main_loop(BOOL * deactivated, uint32 * ext_disc_reason)
+{
+	while (rdp_loop(deactivated, ext_disc_reason))
+		;
+}
+
+/* used in uiports and rdp_main_loop, processes the rdp packets waiting */
 BOOL
-rdp_main_loop(void)
+rdp_loop(BOOL * deactivated, uint32 * ext_disc_reason)
 {
 	uint8 type;
+	BOOL disc = False;	/* True when a disconnect PDU was received */
+	BOOL cont = True;
 	STREAM s;
 
-	while ((s = rdp_recv(&type)) != NULL)
+	while (cont)
 	{
+		s = rdp_recv(&type);
+		if (s == NULL)
+			return False;
 		switch (type)
 		{
 			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:
 				break;
-
 			default:
 				unimpl("PDU %d\n", type);
 		}
+		if (disc)
+			return False;
+		cont = g_next_packet < s->end;
 	}
 	return True;
-	/* We want to detect if we got a clean shutdown, but we
-	   can't. Se above.  
-	   return False;  */
 }
 
 /* Establish a connection up to the RDP layer */