--- sourceforge.net/trunk/rdesktop/rdesktop.c 2002/05/28 11:48:55 53 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2002/07/18 16:38:31 64 @@ -35,6 +35,7 @@ int keylayout; int width; int height; +int tcp_port_rdp = TCP_PORT_RDP; BOOL bitmap_compression = True; BOOL sendmotion = True; BOOL orders = True; @@ -60,7 +61,8 @@ printf(" -b: force bitmap updates\n"); printf(" -e: disable encryption (French TS)\n"); printf(" -m: do not send motion events\n"); - printf(" -l: do not request licence\n\n"); + printf(" -l: do not request licence\n"); + printf(" -t: rdp tcp port\n\n"); } /* Client program */ @@ -79,14 +81,15 @@ int c; printf("rdesktop: A Remote Desktop Protocol client.\n"); - printf("Version " VERSION ". Copyright (C) 1999-2001 Matt Chapman.\n"); + printf("Version " VERSION + ". Copyright (C) 1999-2001 Matt Chapman.\n"); printf("See http://www.rdesktop.org/ for more information.\n\n"); flags = RDP_LOGON_NORMAL; domain[0] = password[0] = shell[0] = directory[0] = 0; strcpy(keymapname, "us"); - while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:fbemlh?")) != -1) + while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:t:fbemlh?")) != -1) { switch (c) { @@ -116,13 +119,14 @@ break; case 'k': - STRNCPY(keymapname, optarg, sizeof(keymapname)); + STRNCPY(keymapname, optarg, + sizeof(keymapname)); break; case 'g': width = strtol(optarg, &p, 10); if (*p == 'x') - height = strtol(p+1, NULL, 10); + height = strtol(p + 1, NULL, 10); if ((width == 0) || (height == 0)) { @@ -151,6 +155,10 @@ licence = False; break; + case 't': + tcp_port_rdp = strtol(optarg, NULL, 10); + break; + case 'h': case '?': default: @@ -232,7 +240,7 @@ /* Generate a 32-byte random for the secure transport code. */ void -generate_random(uint8 *random) +generate_random(uint8 * random) { struct stat st; struct tms tmsbuf; @@ -337,7 +345,7 @@ printf("%02x ", line[i]); for (; i < 16; i++) - printf(" "); + printf(" "); for (i = 0; i < thisline; i++) printf("%c", @@ -363,7 +371,7 @@ return -1; STRNCPY(path, home, sizeof(path)); - strncat(path, "/.rdesktop/licence", sizeof(path)-strlen(path)-1); + strncat(path, "/.rdesktop/licence", sizeof(path) - strlen(path) - 1); fd = open(path, O_RDONLY); if (fd == -1) @@ -388,12 +396,12 @@ return; STRNCPY(path, home, sizeof(path)); - strncat(path, "/.rdesktop", sizeof(path)-strlen(path)-1); + strncat(path, "/.rdesktop", sizeof(path) - strlen(path) - 1); mkdir(path, 0700); - strncat(path, "/licence", sizeof(path)-strlen(path)-1); + strncat(path, "/licence", sizeof(path) - strlen(path) - 1); - fd = open(path, O_WRONLY|O_CREAT|O_TRUNC, 0600); + fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600); if (fd == -1) { perror("open"); @@ -403,4 +411,3 @@ write(fd, data, length); close(fd); } -