--- sourceforge.net/trunk/rdesktop/rdesktop.c 2003/01/28 12:27:28 297 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2003/08/17 07:31:36 444 @@ -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 @@ -21,12 +21,12 @@ #include /* va_list va_start va_end */ #include /* read close getuid getgid getpid getppid gethostname */ #include /* open */ -#include /* save licence uses it. */ #include /* getpwuid */ #include /* tcgetattr tcsetattr */ #include /* stat */ #include /* gettimeofday */ #include /* times */ +#include #include "rdesktop.h" #ifdef EGD_SOCKET @@ -41,36 +41,52 @@ #endif char title[32] = ""; -char username[16]; +char g_username[16]; 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 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; -BOOL bitmap_compression = True; +int g_server_bpp = 8; +int win_button_size = 0; /* If zero, disable single app mode */ +BOOL g_bitmap_compression = True; BOOL sendmotion = True; -BOOL orders = True; -BOOL encryption = True; -BOOL desktop_save = True; +BOOL g_orders = True; +BOOL g_encryption = True; +BOOL packet_encryption = True; +BOOL g_desktop_save = True; BOOL fullscreen = False; BOOL grab_keyboard = True; BOOL hide_decorations = False; +BOOL g_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"); @@ -79,11 +95,14 @@ 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, " -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 @@ -122,6 +141,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[]) @@ -132,7 +199,7 @@ char password[16]; char shell[128]; char directory[32]; - BOOL prompt_password; + BOOL prompt_password, rdp_retval = False; struct passwd *pw; uint32 flags; char *p; @@ -144,12 +211,32 @@ domain[0] = password[0] = shell[0] = directory[0] = 0; strcpy(keymapname, "en-us"); - while ((c = getopt(argc, argv, "u:d:s:c:p:n:k:g:fbemCKT:Dh?")) != -1) +#ifdef RDP2VNC +#define VNCOPT "V:E:" +#else +#define VNCOPT +#endif + + 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)); + STRNCPY(g_username, optarg, sizeof(g_username)); username_option = 1; break; @@ -161,6 +248,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; @@ -212,13 +316,15 @@ 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; break; @@ -239,6 +345,19 @@ hide_decorations = True; break; + case 'a': + 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 '5': + g_use_rdp5 = True; + break; case 'h': case '?': default: @@ -254,12 +373,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) { @@ -270,7 +384,7 @@ return 1; } - STRNCPY(username, pw->pw_name, sizeof(username)); + STRNCPY(g_username, pw->pw_name, sizeof(g_username)); } if (hostname[0] == 0) @@ -297,25 +411,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) + g_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 @@ -475,11 +610,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) { @@ -503,20 +637,19 @@ } } -#ifdef SAVE_LICENCE + int load_licence(unsigned char **data) { - char *path; - char *home; + char *home, *path; struct stat st; - int fd; + int fd, length; home = getenv("HOME"); if (home == NULL) return -1; - path = xmalloc(strlen(home) + strlen(hostname) + 20); + path = (char *) xmalloc(strlen(home) + strlen(hostname) + sizeof("/.rdesktop/licence.")); sprintf(path, "%s/.rdesktop/licence.%s", home, hostname); fd = open(path, O_RDONLY); @@ -526,137 +659,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 *fpath; /* file path for licence */ - char *fname, *fnamewrk; /* file name for licence .inkl path. */ - char *home; - uint32 y; - struct flock fnfl; - int fnfd, fnwrkfd, i, wlen; - struct stream s, *s_ptr; - uint32 len; - - /* Construct a stream, so that we can use macros to extract the - * licence. - */ - s_ptr = &s; - s_ptr->p = data; - /* Skip first two bytes */ - in_uint16(s_ptr, len); - - /* Skip three strings */ - for (i = 0; i < 3; i++) - { - in_uint32(s_ptr, len); - s_ptr->p += len; - /* Make sure that we won't be past the end of data after - * reading the next length value - */ - if ((s_ptr->p) + 4 > data + length) - { - printf("Error in parsing licence key.\n"); - printf("Strings %d end value %x > supplied length (%x)\n", - i, s_ptr->p, data + length); - return; - } - } - in_uint32(s_ptr, len); - if (s_ptr->p + len > data + length) - { - printf("Error in parsing licence key.\n"); - printf("End of licence %x > supplied length (%x)\n", s_ptr->p + len, data + length); - return; - } + char *home, *path, *tmppath; + int fd; home = getenv("HOME"); if (home == NULL) return; - /* set and create the directory -- if it doesn't exist. */ - fpath = xmalloc(strlen(home) + 11); - STRNCPY(fpath, home, strlen(home) + 1); + path = (char *) xmalloc(strlen(home) + strlen(hostname) + sizeof("/.rdesktop/licence.")); - sprintf(fpath, "%s/.rdesktop", fpath); - if (mkdir(fpath, 0700) == -1 && errno != EEXIST) + sprintf(path, "%s/.rdesktop", home); + if ((mkdir(path, 0700) == -1) && errno != EEXIST) { - perror("mkdir"); - exit(1); + perror(path); + return; } - /* set the real licence filename, and put a write lock on it. */ - fname = xmalloc(strlen(fpath) + strlen(hostname) + 10); - sprintf(fname, "%s/licence.%s", fpath, hostname); - fnfd = open(fname, O_RDONLY); - if (fnfd != -1) - { - fnfl.l_type = F_WRLCK; - fnfl.l_whence = SEEK_SET; - fnfl.l_start = 0; - fnfl.l_len = 1; - fcntl(fnfd, F_SETLK, &fnfl); - } - - /* create a temporary licence file */ - fnamewrk = xmalloc(strlen(fname) + 12); - for (y = 0;; y++) - { - sprintf(fnamewrk, "%s.%lu", fname, y); - fnwrkfd = open(fnamewrk, O_WRONLY | O_CREAT | O_EXCL, 0600); - if (fnwrkfd == -1) - { - if (errno == EINTR || errno == EEXIST) - continue; - perror("create"); - exit(1); - } - break; - } - /* write to the licence file */ - for (y = 0; y < len;) - { - do - { - wlen = write(fnwrkfd, s_ptr->p + y, len - y); - } - while (wlen == -1 && errno == EINTR); - if (wlen < 1) - { - perror("write"); - unlink(fnamewrk); - exit(1); - } - y += wlen; - } + /* write licence to licence.hostname.new, then atomically rename to licence.hostname */ - /* close the file and rename it to fname */ - if (close(fnwrkfd) == -1) + sprintf(path, "%s/.rdesktop/licence.%s", home, hostname); + tmppath = (char *) xmalloc(strlen(path) + sizeof(".new")); + strcpy(tmppath, path); + strcat(tmppath, ".new"); + + fd = open(tmppath, O_WRONLY | O_CREAT | O_TRUNC, 0600); + if (fd == -1) { - perror("close"); - unlink(fnamewrk); - exit(1); + perror(tmppath); + return; } - if (rename(fnamewrk, fname) == -1) + + if (write(fd, data, length) != length) { - perror("rename"); - unlink(fnamewrk); - exit(1); + perror(tmppath); + unlink(tmppath); } - /* close the file lock on fname */ - if (fnfd != -1) + else if (rename(tmppath, path) == -1) { - fnfl.l_type = F_UNLCK; - fnfl.l_whence = SEEK_SET; - fnfl.l_start = 0; - fnfl.l_len = 1; - fcntl(fnfd, F_SETLK, &fnfl); - close(fnfd); + perror(path); + unlink(tmppath); } + close(fd); + xfree(tmppath); + xfree(path); } -#endif