--- sourceforge.net/trunk/rdesktop/rdesktop.c 2002/10/11 04:00:32 222 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2003/07/09 09:18:20 435 @@ -1,7 +1,7 @@ -/* +/* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Entrypoint and utility functions - Copyright (C) Matthew Chapman 1999-2002 + Copyright (C) Matthew Chapman 1999-2003 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 @@ -22,11 +22,11 @@ #include /* read close getuid getgid getpid getppid gethostname */ #include /* open */ #include /* getpwuid */ -#include /* PATH_MAX */ #include /* tcgetattr tcsetattr */ #include /* stat */ #include /* gettimeofday */ #include /* times */ +#include #include "rdesktop.h" #ifdef EGD_SOCKET @@ -45,40 +45,64 @@ char hostname[16]; char keymapname[16]; int keylayout = 0x409; /* Defaults to US keyboard layout */ -int width = 800; +int width = 800; /* If width or height are reset to zero, the geometry will + be fetched from _NET_WORKAREA */ int 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 packet_encryption = True; BOOL desktop_save = True; BOOL fullscreen = False; BOOL grab_keyboard = True; - +BOOL hide_decorations = False; +BOOL use_rdp5 = False; +extern BOOL owncolmap; + +#ifdef RDP2VNC +extern int rfb_port; +extern int defer_time; +void +rdp2vnc_connect(char *server, uint32 flags, char *domain, char *password, + char *shell, char *directory); +#endif /* Display usage information */ static void usage(char *program) { fprintf(stderr, "rdesktop: A Remote Desktop Protocol client.\n"); - fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2002 Matt Chapman.\n"); + fprintf(stderr, "Version " VERSION ". Copyright (C) 1999-2003 Matt Chapman.\n"); fprintf(stderr, "See http://www.rdesktop.org/ for more information.\n\n"); fprintf(stderr, "Usage: %s [options] server[:port]\n", program); +#ifdef RDP2VNC + fprintf(stderr, " -V: vnc port\n"); + fprintf(stderr, " -E: defer time (ms)\n"); +#endif fprintf(stderr, " -u: user name\n"); fprintf(stderr, " -d: domain\n"); fprintf(stderr, " -s: shell\n"); + fprintf(stderr, " -S: caption button size (single application mode)\n"); fprintf(stderr, " -c: working directory\n"); fprintf(stderr, " -p: password (- to prompt)\n"); fprintf(stderr, " -n: client hostname\n"); - fprintf(stderr, " -k: keyboard layout on terminal server (us,sv,gr etc.)\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, " -E: disable encryption of everything but the logon packet\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, " -w: window title\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"); } static BOOL @@ -125,25 +149,47 @@ char fullhostname[64]; char domain[16]; char password[16]; - char shell[32]; + char shell[128]; char directory[32]; - BOOL prompt_password; + BOOL prompt_password, rdp_retval = False; struct passwd *pw; uint32 flags; char *p; int c; + int username_option = 0; flags = RDP_LOGON_NORMAL; prompt_password = False; domain[0] = password[0] = shell[0] = directory[0] = 0; - strcpy(keymapname, "us"); + strcpy(keymapname, "en-us"); + +#ifdef RDP2VNC +#define VNCOPT "V:E:" +#else +#define VNCOPT +#endif - while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:fbemKw:h?")) != -1) + while ((c = getopt(argc, argv, VNCOPT "u:d:s:S:c:p:n:k:g:a:fbeEmCKT:Dh?54")) != -1) { switch (c) { +#ifdef RDP2VNC + case 'V': + rfb_port = strtol(optarg, NULL, 10); + if (rfb_port < 100) + rfb_port += 5900; + break; + + case 'E': + defer_time = strtol(optarg, NULL, 10); + if (defer_time < 0) + defer_time = 0; + break; +#endif + case 'u': STRNCPY(username, optarg, sizeof(username)); + username_option = 1; break; case 'd': @@ -154,6 +200,23 @@ STRNCPY(shell, optarg, sizeof(shell)); break; + case 'S': + if (!strcmp(optarg, "standard")) + { + win_button_size = 18; + break; + } + + win_button_size = strtol(optarg, &p, 10); + + if (*p) + { + error("invalid button size\n"); + return 1; + } + + break; + case 'c': STRNCPY(directory, optarg, sizeof(directory)); break; @@ -183,6 +246,12 @@ break; case 'g': + if (!strcmp(optarg, "workarea")) + { + width = height = 0; + break; + } + width = strtol(optarg, &p, 10); if (*p == 'x') height = strtol(p + 1, NULL, 10); @@ -205,19 +274,42 @@ case 'e': encryption = False; break; - + case 'E': + packet_encryption = False; + break; case 'm': sendmotion = False; break; + case 'C': + owncolmap = True; + break; + case 'K': grab_keyboard = False; break; - case 'w': + case 'T': STRNCPY(title, optarg, sizeof(title)); break; + case 'D': + 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) + { + error("invalid server bpp\n"); + return 1; + } + break; + + case '5': + use_rdp5 = True; + break; case 'h': case '?': default: @@ -240,7 +332,7 @@ *p = 0; } - if (username[0] == 0) + if (!username_option) { pw = getpwuid(getuid()); if ((pw == NULL) || (pw->pw_name == NULL)) @@ -276,25 +368,46 @@ strncat(title, server, sizeof(title) - sizeof("rdesktop - ")); } +#ifdef RDP2VNC + rdp2vnc_connect(server, flags, domain, password, shell, directory); + return 0; +#else + if (!ui_init()) return 1; + /* rdpsnd_init(); */ + /* 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) + encryption = False; + + DEBUG(("Connection successful.\n")); memset(password, 0, sizeof(password)); if (ui_create_window()) { - rdp_main_loop(); + rdp_retval = rdp_main_loop(); ui_destroy_window(); } DEBUG(("Disconnecting...\n")); rdp_disconnect(); ui_deinit(); - return 0; + + if (True == rdp_retval) + return 0; + else + return 2; + +#endif + } #ifdef EGD_SOCKET @@ -312,16 +425,16 @@ addr.sun_family = AF_UNIX; memcpy(addr.sun_path, EGD_SOCKET, sizeof(EGD_SOCKET)); - if (connect(fd, (struct sockaddr *)&addr, sizeof(addr)) == -1) + if (connect(fd, (struct sockaddr *) &addr, sizeof(addr)) == -1) goto err; /* PRNGD and EGD use a simple communications protocol */ - buf[0] = 1; /* Non-blocking (similar to /dev/urandom) */ - buf[1] = 32; /* Number of requested random bytes */ + buf[0] = 1; /* Non-blocking (similar to /dev/urandom) */ + buf[1] = 32; /* Number of requested random bytes */ if (write(fd, buf, 2) != 2) goto err; - if ((read(fd, buf, 1) != 1) || (buf[0] == 0)) /* Available? */ + if ((read(fd, buf, 1) != 1) || (buf[0] == 0)) /* Available? */ goto err; if (read(fd, buf, 32) != 32) @@ -329,7 +442,7 @@ ret = True; -err: + err: close(fd); return ret; } @@ -362,7 +475,7 @@ #endif /* Otherwise use whatever entropy we can gather - ideas welcome. */ - r = (uint32 *)random; + r = (uint32 *) random; r[0] = (getpid()) | (getppid() << 16); r[1] = (getuid()) | (getgid() << 16); r[2] = times(&tmsbuf); /* system uptime (clocks) */ @@ -374,10 +487,10 @@ /* Hash both halves with MD5 to obscure possible patterns */ MD5_Init(&md5); - MD5_Update(&md5, random, 16); + MD5_Update(&md5, random, 16); MD5_Final(random, &md5); - MD5_Update(&md5, random+16, 16); - MD5_Final(random+16, &md5); + MD5_Update(&md5, random + 16, 16); + MD5_Final(random + 16, &md5); } /* malloc; exit if out of memory */ @@ -426,6 +539,19 @@ va_end(ap); } +/* report a warning */ +void +warning(char *format, ...) +{ + va_list ap; + + fprintf(stderr, "WARNING: "); + + va_start(ap, format); + vfprintf(stderr, format, ap); + va_end(ap); +} + /* report an unimplemented protocol feature */ void unimpl(char *format, ...) @@ -441,11 +567,10 @@ /* produce a hex dump */ void -hexdump(unsigned char *p, unsigned int len) +hexdump(unsigned char *p, int len) { unsigned char *line = p; - unsigned int thisline, offset = 0; - int i; + int i, thisline, offset = 0; while (offset < len) { @@ -469,21 +594,20 @@ } } -#ifdef SAVE_LICENCE + int load_licence(unsigned char **data) { - char path[PATH_MAX]; - char *home; + char *home, *path; struct stat st; - int fd; + int fd, length; home = getenv("HOME"); if (home == NULL) return -1; - STRNCPY(path, home, sizeof(path)); - strncat(path, "/.rdesktop/licence", sizeof(path) - strlen(path) - 1); + path = (char *) xmalloc(strlen(home) + strlen(hostname) + sizeof("/.rdesktop/licence.")); + sprintf(path, "%s/.rdesktop/licence.%s", home, hostname); fd = open(path, O_RDONLY); if (fd == -1) @@ -492,35 +616,58 @@ if (fstat(fd, &st)) return -1; - *data = xmalloc(st.st_size); - return read(fd, *data, st.st_size); + *data = (uint8 *) xmalloc(st.st_size); + length = read(fd, *data, st.st_size); + close(fd); + xfree(path); + return length; } void save_licence(unsigned char *data, int length) { - char path[PATH_MAX]; - char *home; + char *home, *path, *tmppath; 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); + path = (char *) xmalloc(strlen(home) + strlen(hostname) + sizeof("/.rdesktop/licence.")); + + sprintf(path, "%s/.rdesktop", home); + if ((mkdir(path, 0700) == -1) && errno != EEXIST) + { + perror(path); + return; + } + + /* write licence to licence.hostname.new, then atomically rename to licence.hostname */ - strncat(path, "/licence", sizeof(path) - strlen(path) - 1); + sprintf(path, "%s/.rdesktop/licence.%s", home, hostname); + tmppath = (char *) xmalloc(strlen(path) + sizeof(".new")); + strcpy(tmppath, path); + strcat(tmppath, ".new"); - fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, 0600); + fd = open(tmppath, O_WRONLY | O_CREAT | O_TRUNC, 0600); if (fd == -1) { - perror("open"); + perror(tmppath); return; } - write(fd, data, length); + if (write(fd, data, length) != length) + { + perror(tmppath); + unlink(tmppath); + } + else if (rename(tmppath, path) == -1) + { + perror(path); + unlink(tmppath); + } + close(fd); + xfree(tmppath); + xfree(path); } -#endif