--- sourceforge.net/trunk/rdesktop/rdesktop.c 2003/02/10 12:56:34 317 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2003/04/16 08:19:15 365 @@ -1,4 +1,4 @@ -/* +/* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Entrypoint and utility functions Copyright (C) Matthew Chapman 1999-2003 @@ -26,6 +26,7 @@ #include /* stat */ #include /* gettimeofday */ #include /* times */ +#include #include "rdesktop.h" #ifdef EGD_SOCKET @@ -49,6 +50,7 @@ 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; @@ -57,8 +59,16 @@ 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) @@ -68,9 +78,14 @@ 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"); @@ -85,6 +100,7 @@ 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 @@ -145,10 +161,30 @@ 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:a: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:fbemCKT: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; @@ -162,6 +198,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; @@ -242,13 +295,17 @@ case 'a': server_bpp = strtol(optarg, NULL, 10); - if (server_bpp != 8 && server_bpp != 16 && server_bpp != 15 && server_bpp != 24) + 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: @@ -307,6 +364,10 @@ strncat(title, server, sizeof(title) - sizeof("rdesktop - ")); } +#ifdef RDP2VNC + rdp2vnc_connect(server, flags, domain, password, shell, directory); +#else + if (!ui_init()) return 1; @@ -325,6 +386,9 @@ DEBUG(("Disconnecting...\n")); rdp_disconnect(); ui_deinit(); + +#endif + return 0; } @@ -513,3 +577,160 @@ } } + +int +load_licence(unsigned char **data) +{ + char *path; + char *home; + struct stat st; + int fd; + + home = getenv("HOME"); + if (home == NULL) + return -1; + + path = xmalloc(strlen(home) + strlen(hostname) + 20); + sprintf(path, "%s/.rdesktop/licence.%s", home, hostname); + + 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 *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_le(s_ptr, len); + + /* Skip three strings */ + for (i = 0; i < 3; i++) + { + in_uint32_le(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, + (unsigned int) s_ptr->p, (unsigned int) data + length); + return; + } + } + in_uint32_le(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", + (unsigned int) s_ptr->p + len, (unsigned int) data + length); + return; + } + + 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); + + sprintf(fpath, "%s/.rdesktop", fpath); + if (mkdir(fpath, 0700) == -1 && errno != EEXIST) + { + perror("mkdir"); + exit(1); + } + + /* 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, (long unsigned int) 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; + } + + /* close the file and rename it to fname */ + if (close(fnwrkfd) == -1) + { + perror("close"); + unlink(fnamewrk); + exit(1); + } + if (rename(fnamewrk, fname) == -1) + { + perror("rename"); + unlink(fnamewrk); + exit(1); + } + /* close the file lock on fname */ + if (fnfd != -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); + } + +}