--- sourceforge.net/trunk/rdesktop/rdp.c	2005/03/13 03:29:19	848
+++ sourceforge.net/trunk/rdesktop/rdp.c	2005/03/19 15:30:14	866
@@ -19,10 +19,23 @@
 */
 
 #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;
@@ -46,6 +59,10 @@
 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)
@@ -141,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
@@ -161,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;
 
-	return i - 1;
+		while (i < uni_len / 2)
+		{
+			in_uint8a(s, &string[i++], 1);
+			in_uint8s(s, 1);
+		}
+
+		return i - 1;
+	}
 }
 
 
@@ -1101,7 +1206,7 @@
 		if (mppc_expand(s->p, clen, ctype, &roff, &rlen) == -1)
 			error("error while decompressing packet\n");
 
-		//len -= 18;
+		/* len -= 18; */
 
 		/* allocate memory and copy the uncompressed data into the temporary stream */
 		ns->data = (uint8 *) xrealloc(ns->data, rlen);