--- sourceforge.net/trunk/rdesktop/rdesktop.c	2003/06/19 07:29:53	424
+++ sourceforge.net/trunk/rdesktop/rdesktop.c	2003/10/09 04:21:19	482
@@ -40,27 +40,29 @@
 #include "crypto/md5.h"
 #endif
 
-char title[32] = "";
-char username[16];
+char g_title[64] = "";
+char g_username[64];
 char hostname[16];
 char keymapname[16];
 int keylayout = 0x409;		/* Defaults to US keyboard layout */
-int width = 800;		/* If width or height are reset to zero, the geometry will
+int g_width = 800;		/* If width or height are reset to zero, the geometry will
 				   be fetched from _NET_WORKAREA */
-int height = 600;
+int g_height = 600;
 int tcp_port_rdp = TCP_PORT_RDP;
-int server_bpp = 8;
-int win_button_size = 0;	/* If zero, disable single app mode */
-BOOL bitmap_compression = True;
-BOOL sendmotion = True;
-BOOL orders = True;
-BOOL encryption = True;
-BOOL desktop_save = True;
-BOOL fullscreen = False;
-BOOL grab_keyboard = True;
-BOOL hide_decorations = False;
-BOOL use_rdp5 = False;
-extern BOOL owncolmap;
+int g_server_bpp = 8;
+int g_win_button_size = 0;	/* If zero, disable single app mode */
+BOOL g_bitmap_compression = True;
+BOOL g_sendmotion = True;
+BOOL g_orders = True;
+BOOL g_encryption = True;
+BOOL packet_encryption = True;
+BOOL g_desktop_save = True;
+BOOL g_fullscreen = False;
+BOOL g_grab_keyboard = True;
+BOOL g_hide_decorations = False;
+BOOL g_use_rdp5 = True;
+BOOL g_console_session = False;
+extern BOOL g_owncolmap;
 
 #ifdef RDP2VNC
 extern int rfb_port;
@@ -80,7 +82,7 @@
 	fprintf(stderr, "Usage: %s [options] server[:port]\n", program);
 #ifdef RDP2VNC
 	fprintf(stderr, "   -V: vnc port\n");
-	fprintf(stderr, "   -E: defer time (ms)\n");
+	fprintf(stderr, "   -Q: defer time (ms)\n");
 #endif
 	fprintf(stderr, "   -u: user name\n");
 	fprintf(stderr, "   -d: domain\n");
@@ -94,13 +96,16 @@
 	fprintf(stderr, "   -f: full-screen mode\n");
 	fprintf(stderr, "   -b: force bitmap updates\n");
 	fprintf(stderr, "   -e: disable encryption (French TS)\n");
+	fprintf(stderr, "   -E: disable encryption from client to server\n");
 	fprintf(stderr, "   -m: do not send motion events\n");
 	fprintf(stderr, "   -C: use private colour map\n");
 	fprintf(stderr, "   -K: keep window manager key bindings\n");
 	fprintf(stderr, "   -T: window title\n");
 	fprintf(stderr, "   -D: hide window manager decorations\n");
 	fprintf(stderr, "   -a: server bpp\n");
-	fprintf(stderr, "   -5: Use RDP5 (EXPERIMENTAL!)\n");
+	fprintf(stderr, "   -0: attach to console\n");
+	fprintf(stderr, "   -4: use RDP version 4\n");
+	fprintf(stderr, "   -5: use RDP version 5 (default)\n");
 }
 
 static BOOL
@@ -139,6 +144,54 @@
 	return ret;
 }
 
+static void
+parse_server_and_port(char *server)
+{
+	char *p;
+#ifdef IPv6
+	int addr_colons;
+#endif
+
+#ifdef IPv6
+	p = server;
+	addr_colons = 0;
+	while (*p)
+		if (*p++ == ':')
+			addr_colons++;
+	if (addr_colons >= 2)
+	{
+		/* numeric IPv6 style address format - [1:2:3::4]:port */
+		p = strchr(server, ']');
+		if (*server == '[' && p != NULL)
+		{
+			if (*(p + 1) == ':' && *(p + 2) != '\0')
+				tcp_port_rdp = strtol(p + 2, NULL, 10);
+			/* remove the port number and brackets from the address */
+			*p = '\0';
+			strncpy(server, server + 1, strlen(server));
+		}
+	}
+	else
+	{
+		/* dns name or IPv4 style address format - server.example.com:port or 1.2.3.4:port */
+		p = strchr(server, ':');
+		if (p != NULL)
+		{
+			tcp_port_rdp = strtol(p + 1, NULL, 10);
+			*p = 0;
+		}
+	}
+#else /* no IPv6 support */
+	p = strchr(server, ':');
+	if (p != NULL)
+	{
+		tcp_port_rdp = strtol(p + 1, NULL, 10);
+		*p = 0;
+	}
+#endif /* IPv6 */
+
+}
+
 /* Client program */
 int
 main(int argc, char *argv[])
@@ -146,7 +199,7 @@
 	char server[64];
 	char fullhostname[64];
 	char domain[16];
-	char password[16];
+	char password[64];
 	char shell[128];
 	char directory[32];
 	BOOL prompt_password, rdp_retval = False;
@@ -162,12 +215,12 @@
 	strcpy(keymapname, "en-us");
 
 #ifdef RDP2VNC
-#define VNCOPT "V:E:"
+#define VNCOPT "V:Q:"
 #else
 #define VNCOPT
 #endif
 
-	while ((c = getopt(argc, argv, VNCOPT "u:d:s:S:c:p:n:k:g:a:fbemCKT:Dh?54")) != -1)
+	while ((c = getopt(argc, argv, VNCOPT "u:d:s:S:c:p:n:k:g:a:fbeEmCKT:D045h?")) != -1)
 	{
 		switch (c)
 		{
@@ -178,7 +231,7 @@
 					rfb_port += 5900;
 				break;
 
-			case 'E':
+			case 'Q':
 				defer_time = strtol(optarg, NULL, 10);
 				if (defer_time < 0)
 					defer_time = 0;
@@ -186,7 +239,7 @@
 #endif
 
 			case 'u':
-				STRNCPY(username, optarg, sizeof(username));
+				STRNCPY(g_username, optarg, sizeof(g_username));
 				username_option = 1;
 				break;
 
@@ -201,11 +254,11 @@
 			case 'S':
 				if (!strcmp(optarg, "standard"))
 				{
-					win_button_size = 18;
+					g_win_button_size = 18;
 					break;
 				}
 
-				win_button_size = strtol(optarg, &p, 10);
+				g_win_button_size = strtol(optarg, &p, 10);
 
 				if (*p)
 				{
@@ -246,15 +299,15 @@
 			case 'g':
 				if (!strcmp(optarg, "workarea"))
 				{
-					width = height = 0;
+					g_width = g_height = 0;
 					break;
 				}
 
-				width = strtol(optarg, &p, 10);
+				g_width = strtol(optarg, &p, 10);
 				if (*p == 'x')
-					height = strtol(p + 1, NULL, 10);
+					g_height = strtol(p + 1, NULL, 10);
 
-				if ((width == 0) || (height == 0))
+				if ((g_width == 0) || (g_height == 0))
 				{
 					error("invalid geometry\n");
 					return 1;
@@ -262,50 +315,61 @@
 				break;
 
 			case 'f':
-				fullscreen = True;
+				g_fullscreen = True;
 				break;
 
 			case 'b':
-				orders = False;
+				g_orders = False;
 				break;
 
 			case 'e':
-				encryption = False;
+				g_encryption = False;
+				break;
+			case 'E':
+				packet_encryption = False;
 				break;
-
 			case 'm':
-				sendmotion = False;
+				g_sendmotion = False;
 				break;
 
 			case 'C':
-				owncolmap = True;
+				g_owncolmap = True;
 				break;
 
 			case 'K':
-				grab_keyboard = False;
+				g_grab_keyboard = False;
 				break;
 
 			case 'T':
-				STRNCPY(title, optarg, sizeof(title));
+				STRNCPY(g_title, optarg, sizeof(g_title));
 				break;
 
 			case 'D':
-				hide_decorations = True;
+				g_hide_decorations = True;
 				break;
 
 			case 'a':
-				server_bpp = strtol(optarg, NULL, 10);
-				if (server_bpp != 8 && server_bpp != 16 && server_bpp != 15
-				    && server_bpp != 24)
+				g_server_bpp = strtol(optarg, NULL, 10);
+				if (g_server_bpp != 8 && g_server_bpp != 16 && g_server_bpp != 15
+				    && g_server_bpp != 24)
 				{
 					error("invalid server bpp\n");
 					return 1;
 				}
 				break;
 
+			case '0':
+				g_console_session = True;
+				break;
+
+			case '4':
+				g_use_rdp5 = False;
+				break;
+
 			case '5':
-				use_rdp5 = True;
+				g_use_rdp5 = True;
 				break;
+
 			case 'h':
 			case '?':
 			default:
@@ -321,12 +385,7 @@
 	}
 
 	STRNCPY(server, argv[optind], sizeof(server));
-	p = strchr(server, ':');
-	if (p != NULL)
-	{
-		tcp_port_rdp = strtol(p + 1, NULL, 10);
-		*p = 0;
-	}
+	parse_server_and_port(server);
 
 	if (!username_option)
 	{
@@ -337,7 +396,7 @@
 			return 1;
 		}
 
-		STRNCPY(username, pw->pw_name, sizeof(username));
+		STRNCPY(g_username, pw->pw_name, sizeof(g_username));
 	}
 
 	if (hostname[0] == 0)
@@ -358,10 +417,10 @@
 	if (prompt_password && read_password(password, sizeof(password)))
 		flags |= RDP_LOGON_AUTO;
 
-	if (title[0] == 0)
+	if (g_title[0] == 0)
 	{
-		strcpy(title, "rdesktop - ");
-		strncat(title, server, sizeof(title) - sizeof("rdesktop - "));
+		strcpy(g_title, "rdesktop - ");
+		strncat(g_title, server, sizeof(g_title) - sizeof("rdesktop - "));
 	}
 
 #ifdef RDP2VNC
@@ -372,14 +431,20 @@
 	if (!ui_init())
 		return 1;
 
-	ipc_init();		// Must be run after ui_init, we need X to be setup.
-
-	if (use_rdp5)
-		cliprdr_init();	// FIXME: Should perhaps be integrated into the channel management code?
+#ifdef WITH_RDPSND
+	rdpsnd_init();
+#endif
+	/* rdpdr_init(); */
 
 	if (!rdp_connect(server, flags, domain, password, shell, directory))
 		return 1;
 
+	/* By setting encryption to False here, we have an encrypted login 
+	   packet but unencrypted transfer of other packets */
+	if (!packet_encryption)
+		g_encryption = False;
+
+
 	DEBUG(("Connection successful.\n"));
 	memset(password, 0, sizeof(password));
 
@@ -393,7 +458,7 @@
 	rdp_disconnect();
 	ui_deinit();
 
-	if (True == rdp_retval) 
+	if (True == rdp_retval)
 		return 0;
 	else
 		return 2;