--- sourceforge.net/trunk/rdesktop/rdesktop.c 2001/09/15 12:34:34 33 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2002/09/11 07:54:21 114 @@ -2,17 +2,17 @@ rdesktop: A Remote Desktop Protocol client. Entrypoint and utility functions Copyright (C) Matthew Chapman 1999-2001 - + 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 the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -23,16 +23,20 @@ #include /* read close getuid getgid getpid getppid gethostname */ #include /* open */ #include /* getpwuid */ +#include /* PATH_MAX */ #include /* stat */ #include /* gettimeofday */ #include /* times */ #include "rdesktop.h" +char title[32] = ""; char username[16]; char hostname[16]; +char keymapname[16]; +int keylayout = 0x409; /* Defaults to US keyboard layout */ int width; int height; -int keylayout = 0x409; +int tcp_port_rdp = TCP_PORT_RDP; BOOL bitmap_compression = True; BOOL sendmotion = True; BOOL orders = True; @@ -40,25 +44,30 @@ BOOL encryption = True; BOOL desktop_save = True; BOOL fullscreen = False; +BOOL grab_keyboard = True; /* Display usage information */ static void usage(char *program) { - printf("Usage: %s [options] server\n", program); - printf(" -u: user name\n"); - printf(" -d: domain\n"); - printf(" -s: shell\n"); - printf(" -c: working directory\n"); - printf(" -p: password (autologon)\n"); - printf(" -n: client hostname\n"); - printf(" -k: keyboard layout (hex)\n"); - printf(" -g: desktop geometry (WxH)\n"); - printf(" -f: full-screen mode\n"); - 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"); + fprintf(stderr, "Usage: %s [options] server\n", program); + fprintf(stderr, " -u: user name\n"); + fprintf(stderr, " -d: domain\n"); + fprintf(stderr, " -s: shell\n"); + fprintf(stderr, " -c: working directory\n"); + fprintf(stderr, " -p: password (autologon)\n"); + fprintf(stderr, " -P: askpass-program (autologon)\n"); + fprintf(stderr, " -n: client hostname\n"); + fprintf(stderr, " -k: keyboard layout on terminal server (us,sv,gr etc.)\n"); + fprintf(stderr, " -g: desktop geometry (WxH)\n"); + fprintf(stderr, " -f: full-screen mode\n"); + fprintf(stderr, " -b: force bitmap updates\n"); + fprintf(stderr, " -e: disable encryption (French TS)\n"); + fprintf(stderr, " -m: do not send motion events\n"); + fprintf(stderr, " -l: do not request licence\n"); + fprintf(stderr, " -t: rdp tcp port\n"); + fprintf(stderr, " -K: keep window manager key bindings\n"); + fprintf(stderr, " -w: window title\n"); } /* Client program */ @@ -68,22 +77,23 @@ char fullhostname[64]; char domain[16]; char password[16]; + char *askpass_result; char shell[32]; char directory[32]; - char title[32]; struct passwd *pw; char *server, *p; uint32 flags; int c; - printf("rdesktop: A Remote Desktop Protocol client.\n"); - printf("Version " VERSION ". Copyright (C) 1999-2001 Matt Chapman.\n"); - printf("See http://www.rdesktop.org/ for more information.\n\n"); + fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n"); + fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2001 Matt Chapman.\n"); + fprintf(stderr, "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:P:n:k:g:t:fbemlKw:h?")) != -1) { switch (c) { @@ -108,23 +118,28 @@ flags |= RDP_LOGON_AUTO; break; + case 'P': + askpass_result = askpass(optarg, "Enter password"); + if (askpass_result == NULL) + exit(1); + + STRNCPY(password, askpass_result, sizeof(password)); + free(askpass_result); + flags |= RDP_LOGON_AUTO; + break; + case 'n': STRNCPY(hostname, optarg, sizeof(hostname)); break; case 'k': - keylayout = strtol(optarg, NULL, 16); - if (keylayout == 0) - { - error("invalid keyboard layout\n"); - return 1; - } + 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)) { @@ -153,6 +168,18 @@ licence = False; break; + case 't': + tcp_port_rdp = strtol(optarg, NULL, 10); + break; + + case 'K': + grab_keyboard = False; + break; + + case 'w': + strncpy(title, optarg, sizeof(title)); + break; + case 'h': case '?': default: @@ -212,29 +239,41 @@ width = 800; height = 600; } + else + { + /* make sure width is a multiple of 4 */ + width = (width + 3) & ~3; + } - strcpy(title, "rdesktop - "); - strncat(title, server, sizeof(title) - sizeof("rdesktop - ")); - - if (ui_create_window(title)) + if (!strlen(title)) { - if (!rdp_connect(server, flags, domain, password, shell, - directory)) - return 1; + strcpy(title, "rdesktop - "); + strncat(title, server, sizeof(title) - sizeof("rdesktop - ")); + } + + xkeymap_init1(); + if (!ui_init()) + return 1; + + if (!rdp_connect(server, flags, domain, password, shell, directory)) + return 1; - printf("Connection successful.\n"); + fprintf(stderr, "Connection successful.\n"); + + if (ui_create_window()) + { rdp_main_loop(); - printf("Disconnecting...\n"); ui_destroy_window(); } + fprintf(stderr, "Disconnecting...\n"); rdp_disconnect(); return 0; } /* 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; @@ -330,24 +369,76 @@ while (offset < len) { - printf("%04x ", offset); + fprintf(stderr, "%04x ", offset); thisline = len - offset; if (thisline > 16) thisline = 16; for (i = 0; i < thisline; i++) - printf("%02x ", line[i]); + fprintf(stderr, "%02x ", line[i]); for (; i < 16; i++) - printf(" "); + fprintf(stderr, " "); for (i = 0; i < thisline; i++) - printf("%c", - (line[i] >= 0x20 - && line[i] < 0x7f) ? line[i] : '.'); + fprintf(stderr, "%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.'); - printf("\n"); + fprintf(stderr, "\n"); offset += thisline; line += thisline; } } + +int +load_licence(unsigned char **data) +{ + char path[PATH_MAX]; + char *home; + struct stat st; + int fd; + + home = getenv("HOME"); + if (home == NULL) + return -1; + + STRNCPY(path, home, sizeof(path)); + strncat(path, "/.rdesktop/licence", sizeof(path) - strlen(path) - 1); + + fd = open(path, O_RDONLY); + if (fd == -1) + return -1; + + if (fstat(fd, &st)) + return -1; + + *data = xmalloc(st.st_size); + return read(fd, *data, st.st_size); +} + +void +save_licence(unsigned char *data, int length) +{ + char path[PATH_MAX]; + char *home; + int fd; + + home = getenv("HOME"); + if (home == NULL) + return; + + STRNCPY(path, home, sizeof(path)); + strncat(path, "/.rdesktop", sizeof(path) - strlen(path) - 1); + mkdir(path, 0700); + + strncat(path, "/licence", sizeof(path) - strlen(path) - 1); + + fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600); + if (fd == -1) + { + perror("open"); + return; + } + + write(fd, data, length); + close(fd); +}