--- sourceforge.net/trunk/rdesktop/rdesktop.c 2001/09/14 03:38:39 29 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2002/08/09 09:11:01 96 @@ -1,7 +1,7 @@ /* rdesktop: A Remote Desktop Protocol client. Entrypoint and utility functions - Copyright (C) Matthew Chapman 1999-2000 + 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 @@ -19,9 +19,11 @@ */ #include /* malloc realloc free */ +#include /* va_list va_start va_end */ #include /* read close getuid getgid getpid getppid gethostname */ #include /* open */ #include /* getpwuid */ +#include /* PATH_MAX */ #include /* stat */ #include /* gettimeofday */ #include /* times */ @@ -29,126 +31,148 @@ char username[16]; char hostname[16]; -int width = 800; -int height = 600; -int keylayout = 0x409; +char keymapname[16]; +int keylayout = 0x409; /* Defaults to US keyboard layout */ +int width; +int height; +int tcp_port_rdp = TCP_PORT_RDP; BOOL bitmap_compression = True; BOOL sendmotion = True; BOOL orders = True; BOOL licence = True; -BOOL use_encryption = True; +BOOL encryption = True; BOOL desktop_save = True; BOOL fullscreen = False; +BOOL grab_keyboard = True; /* Display usage information */ static void usage(char *program) { - STATUS("Usage: %s [options] server\n", program); - STATUS(" -u: user name\n"); - STATUS(" -d: domain\n"); - STATUS(" -s: shell\n"); - STATUS(" -c: working directory\n"); - STATUS(" -p: password (autologon)\n"); - STATUS(" -n: client hostname\n"); - STATUS(" -w: desktop width\n"); - STATUS(" -h: desktop height\n"); - STATUS(" -k: keyboard layout (hex)\n"); - STATUS(" -b: force bitmap updates\n"); - STATUS(" -m: do not send motion events\n"); - STATUS(" -l: do not request licence\n\n"); + 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(" -P: askpass-program (autologon)\n"); + printf(" -n: client hostname\n"); + printf(" -k: keyboard layout on terminal server (us,sv,gr etc.)\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"); + printf(" -t: rdp tcp port\n"); + printf(" -K: keep window manager key bindings\n"); } /* Client program */ int main(int argc, char *argv[]) { - struct passwd *pw; - char *server; - uint32 flags; + 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; - STATUS("rdesktop: A Remote Desktop Protocol client.\n"); - STATUS("Version " VERSION - ". Copyright (C) 1999-2000 Matt Chapman.\n"); - STATUS("See http://www.rdesktop.org/ for more information.\n\n"); + 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"); 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:g:k:mbleKFVh?")) != -1) + while ((c = getopt(argc, argv, "u:d:s:c:p:P:n:k:g:t:fbemlKh?")) != -1) { switch (c) { case 'u': - strncpy(username, optarg, sizeof(username)); + STRNCPY(username, optarg, sizeof(username)); break; case 'd': - strncpy(domain, optarg, sizeof(domain)); + STRNCPY(domain, optarg, sizeof(domain)); + break; + + case 's': + STRNCPY(shell, optarg, sizeof(shell)); + break; + + case 'c': + STRNCPY(directory, optarg, sizeof(directory)); break; case 'p': + STRNCPY(password, optarg, sizeof(password)); flags |= RDP_LOGON_AUTO; - strncpy(password, optarg, sizeof(password)); break; - case 's': - strncpy(shell, optarg, sizeof(shell)); - break; + case 'P': + askpass_result = askpass(optarg, "Enter password"); + if (askpass_result == NULL) + exit(1); - case 'c': - strncpy(directory, optarg, sizeof(directory)); + STRNCPY(password, askpass_result, sizeof(password)); + free(askpass_result); + flags |= RDP_LOGON_AUTO; break; case 'n': - strncpy(hostname, optarg, sizeof(hostname)); + STRNCPY(hostname, optarg, sizeof(hostname)); + break; + + case 'k': + STRNCPY(keymapname, optarg, sizeof(keymapname)); break; + case 'g': + width = strtol(optarg, &p, 10); + if (*p == 'x') + height = strtol(p + 1, NULL, 10); + + if ((width == 0) || (height == 0)) { - char *tgem = 0; - width = strtol(optarg, NULL, 10); - tgem = strchr(optarg, 'x'); - if ((tgem == 0) || (strlen(tgem) < 2)) - { - ERROR - ("-g: invalid parameter. Syntax example: -g 1024x768\n"); - exit(1); - } - height = strtol(tgem + 1, NULL, 10); + error("invalid geometry\n"); + return 1; } break; - case 'k': - keylayout = strtol(optarg, NULL, 16); - /* keylayout = find_keyb_code(optarg); */ - if (keylayout == 0) - return 0; - break; - - case 'm': - sendmotion = False; + case 'f': + fullscreen = True; break; case 'b': orders = False; break; + case 'e': + encryption = False; + break; + + case 'm': + sendmotion = False; + break; + case 'l': licence = False; break; - case 'e': - use_encryption = False; + case 't': + tcp_port_rdp = strtol(optarg, NULL, 10); break; - case 'F': - fullscreen = True; + case 'K': + grab_keyboard = False; break; case 'h': @@ -172,43 +196,71 @@ pw = getpwuid(getuid()); if ((pw == NULL) || (pw->pw_name == NULL)) { - STATUS("Could not determine user name.\n"); + error("could not determine username, use -u\n"); return 1; } - strncpy(username, pw->pw_name, sizeof(username)); + STRNCPY(username, pw->pw_name, sizeof(username)); } if (hostname[0] == 0) { - if (gethostname(hostname, sizeof(hostname)) == -1) + if (gethostname(fullhostname, sizeof(fullhostname)) == -1) { - STATUS("Could not determine host name.\n"); + error("could not determine local hostname, use -n\n"); return 1; } + + p = strchr(fullhostname, '.'); + if (p != NULL) + *p = 0; + + STRNCPY(hostname, fullhostname, sizeof(hostname)); + } + + if (!strcmp(password, "-")) + { + p = getpass("Password: "); + if (p == NULL) + { + error("failed to read password\n"); + return 0; + } + STRNCPY(password, p, sizeof(password)); + } + + if ((width == 0) || (height == 0)) + { + width = 800; + height = 600; } strcpy(title, "rdesktop - "); - strncat(title, server, sizeof(title)); + 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"); if (ui_create_window(title)) { - if (!rdp_connect(server, flags, domain, password, shell, - directory)) - return 1; - - STATUS("Connection successful.\n"); rdp_main_loop(); ui_destroy_window(); } + printf("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; @@ -216,7 +268,8 @@ int fd; /* If we have a kernel random device, use it. */ - if ((fd = open("/dev/urandom", O_RDONLY)) != -1) + if (((fd = open("/dev/urandom", O_RDONLY)) != -1) + || ((fd = open("/dev/random", O_RDONLY)) != -1)) { read(fd, random, 32); close(fd); @@ -241,7 +294,7 @@ void *mem = malloc(size); if (mem == NULL) { - ERROR("xmalloc %d\n", size); + error("xmalloc %d\n", size); exit(1); } return mem; @@ -254,7 +307,7 @@ void *mem = realloc(oldmem, size); if (mem == NULL) { - ERROR("xrealloc %d\n", size); + error("xrealloc %d\n", size); exit(1); } return mem; @@ -267,7 +320,33 @@ free(mem); } -/* Produce a hex dump */ +/* report an error */ +void +error(char *format, ...) +{ + va_list ap; + + fprintf(stderr, "ERROR: "); + + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); +} + +/* report an unimplemented protocol feature */ +void +unimpl(char *format, ...) +{ + va_list ap; + + fprintf(stderr, "NOT IMPLEMENTED: "); + + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); +} + +/* produce a hex dump */ void hexdump(unsigned char *p, unsigned int len) { @@ -277,22 +356,76 @@ while (offset < len) { - STATUS("%04x ", offset); + printf("%04x ", offset); thisline = len - offset; if (thisline > 16) thisline = 16; for (i = 0; i < thisline; i++) - STATUS("%02x ", line[i]) for (; i < 16; i++) - STATUS(" "); + printf("%02x ", line[i]); + + for (; i < 16; i++) + printf(" "); for (i = 0; i < thisline; i++) - STATUS("%c", - (line[i] >= 0x20 - && line[i] < 0x7f) ? line[i] : '.'); + printf("%c", (line[i] >= 0x20 && line[i] < 0x7f) ? line[i] : '.'); - STATUS("\n"); + printf("\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); +}