--- sourceforge.net/trunk/rdesktop/rdesktop.c 2004/04/26 22:31:22 678 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2004/11/18 11:18:49 800 @@ -35,17 +35,13 @@ #include /* sockaddr_un */ #endif -#ifdef WITH_OPENSSL #include -#else -#include "crypto/md5.h" -#endif char g_title[64] = ""; char g_username[64]; -char hostname[16]; +char g_hostname[16]; char keymapname[16]; -int keylayout = 0x409; /* Defaults to US keyboard layout */ +int g_keylayout = 0x409; /* Defaults to US keyboard layout */ int g_width = 800; /* width is special: If 0, the geometry will be fetched from @@ -53,12 +49,16 @@ absolute value specifies the percent of the whole screen. */ int g_height = 600; -int tcp_port_rdp = TCP_PORT_RDP; +int g_xpos = 0; +int g_ypos = 0; +extern int g_tcp_port_rdp; int g_server_bpp = 8; int g_win_button_size = 0; /* If zero, disable single app mode */ BOOL g_bitmap_compression = True; BOOL g_sendmotion = True; BOOL g_bitmap_cache = True; +BOOL g_bitmap_cache_persist_enable = False; +BOOL g_bitmap_cache_precache = True; BOOL g_encryption = True; BOOL packet_encryption = True; BOOL g_desktop_save = True; @@ -124,15 +124,16 @@ fprintf(stderr, " -N: enable numlock syncronization\n"); fprintf(stderr, " -X: embed into another window with a given id.\n"); fprintf(stderr, " -a: connection colour depth\n"); - fprintf(stderr, - " -x: RDP5 experience (m[odem 28.8], b[roadband], l[an] or hex number)\n"); + fprintf(stderr, " -z: enable rdp compression\n"); + fprintf(stderr, " -x: RDP5 experience (m[odem 28.8], b[roadband], l[an] or hex nr.)\n"); + fprintf(stderr, " -P: use persistent bitmap caching\n"); fprintf(stderr, " -r: enable specified device redirection (this flag can be repeated)\n"); fprintf(stderr, " '-r comport:COM1=/dev/ttyS0': enable serial redirection of /dev/ttyS0 to COM1\n"); fprintf(stderr, " or COM1=/dev/ttyS0,COM2=/dev/ttyS1\n"); fprintf(stderr, - " '-r disk:A=/mnt/floppy': enable redirection of /mnt/floppy to A:\n"); - fprintf(stderr, " or A=/mnt/floppy,D=/mnt/cdrom'\n"); + " '-r disk:floppy=/mnt/floppy': enable redirection of /mnt/floppy to 'floppy' share\n"); + fprintf(stderr, " or 'floppy=/mnt/floppy,cdrom=/mnt/cdrom'\n"); fprintf(stderr, " '-r clientname=': Set the client name displayed\n"); fprintf(stderr, " for redirected disks\n"); fprintf(stderr, @@ -305,7 +306,7 @@ if (*server == '[' && p != NULL) { if (*(p + 1) == ':' && *(p + 2) != '\0') - tcp_port_rdp = strtol(p + 2, NULL, 10); + g_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)); @@ -317,7 +318,7 @@ p = strchr(server, ':'); if (p != NULL) { - tcp_port_rdp = strtol(p + 1, NULL, 10); + g_tcp_port_rdp = strtol(p + 1, NULL, 10); *p = 0; } } @@ -325,7 +326,7 @@ p = strchr(server, ':'); if (p != NULL) { - tcp_port_rdp = strtol(p + 1, NULL, 10); + g_tcp_port_rdp = strtol(p + 1, NULL, 10); *p = 0; } #endif /* IPv6 */ @@ -364,7 +365,8 @@ #define VNCOPT #endif - while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbBeEmCDKS:T:NX:a:x:r:045h?")) != -1) + while ((c = getopt(argc, argv, + VNCOPT "u:d:s:c:p:n:k:g:fbBeEmzCDKS:T:NX:a:x:Pr:045h?")) != -1) { switch (c) { @@ -416,7 +418,7 @@ break; case 'n': - STRNCPY(hostname, optarg, sizeof(hostname)); + STRNCPY(g_hostname, optarg, sizeof(g_hostname)); break; case 'k': @@ -439,7 +441,7 @@ } if (*p == 'x') - g_height = strtol(p + 1, NULL, 10); + g_height = strtol(p + 1, &p, 10); if (g_height <= 0) { @@ -448,7 +450,16 @@ } if (*p == '%') + { g_width = -g_width; + p++; + } + + if (*p == '+' || *p == '-') + g_xpos = strtol(p, &p, 10); + + if (*p == '+' || *p == '-') + g_ypos = strtol(p, NULL, 10); break; @@ -525,8 +536,12 @@ } break; - case 'x': + case 'z': + DEBUG(("rdp compression enabled\n")); + flags |= RDP_COMPRESSION; + break; + case 'x': if (strncmp("modem", optarg, 1) == 0) { g_rdp5_performanceflags = @@ -547,6 +562,10 @@ } break; + case 'P': + g_bitmap_cache_persist_enable = True; + break; + case 'r': if (strncmp("sound", optarg, 5) == 0) @@ -565,11 +584,15 @@ #ifdef WITH_RDPSND g_rdpsnd = True; #else - warning("Not compiled with sound support"); + warning("Not compiled with sound support\n"); #endif if (strncmp("off", optarg, 3) == 0) +#ifdef WITH_RDPSND g_rdpsnd = False; +#else + warning("Not compiled with sound support\n"); +#endif optarg = p; } @@ -579,7 +602,7 @@ #ifdef WITH_RDPSND g_rdpsnd = True; #else - warning("Not compiled with sound support"); + warning("Not compiled with sound support\n"); #endif } } @@ -652,7 +675,7 @@ STRNCPY(g_username, pw->pw_name, sizeof(g_username)); } - if (hostname[0] == 0) + if (g_hostname[0] == 0) { if (gethostname(fullhostname, sizeof(fullhostname)) == -1) { @@ -664,7 +687,7 @@ if (p != NULL) *p = 0; - STRNCPY(hostname, fullhostname, sizeof(hostname)); + STRNCPY(g_hostname, fullhostname, sizeof(g_hostname)); } if (prompt_password && read_password(password, sizeof(password))) @@ -710,6 +733,7 @@ DEBUG(("Disconnecting...\n")); rdp_disconnect(); + cache_save_state(); ui_deinit(); if (ext_disc_reason >= 2) @@ -839,7 +863,11 @@ void * xrealloc(void *oldmem, int size) { - void *mem = realloc(oldmem, size); + void *mem; + + if (size < 1) + size = 1; + mem = realloc(oldmem, size); if (mem == NULL) { error("xrealloc %d\n", size); @@ -1052,8 +1080,8 @@ if (home == NULL) return -1; - path = (char *) xmalloc(strlen(home) + strlen(hostname) + sizeof("/.rdesktop/licence.")); - sprintf(path, "%s/.rdesktop/licence.%s", home, hostname); + path = (char *) xmalloc(strlen(home) + strlen(g_hostname) + sizeof("/.rdesktop/licence.")); + sprintf(path, "%s/.rdesktop/licence.%s", home, g_hostname); fd = open(path, O_RDONLY); if (fd == -1) @@ -1079,7 +1107,7 @@ if (home == NULL) return; - path = (char *) xmalloc(strlen(home) + strlen(hostname) + sizeof("/.rdesktop/licence.")); + path = (char *) xmalloc(strlen(home) + strlen(g_hostname) + sizeof("/.rdesktop/licence.")); sprintf(path, "%s/.rdesktop", home); if ((mkdir(path, 0700) == -1) && errno != EEXIST) @@ -1090,7 +1118,7 @@ /* write licence to licence.hostname.new, then atomically rename to licence.hostname */ - sprintf(path, "%s/.rdesktop/licence.%s", home, hostname); + sprintf(path, "%s/.rdesktop/licence.%s", home, g_hostname); tmppath = (char *) xmalloc(strlen(path) + sizeof(".new")); strcpy(tmppath, path); strcat(tmppath, ".new"); @@ -1117,3 +1145,95 @@ xfree(tmppath); xfree(path); } + +/* Create the bitmap cache directory */ +BOOL +rd_pstcache_mkdir(void) +{ + char *home; + char bmpcache_dir[256]; + + home = getenv("HOME"); + + if (home == NULL) + return False; + + sprintf(bmpcache_dir, "%s/%s", home, ".rdesktop"); + + if ((mkdir(bmpcache_dir, S_IRWXU) == -1) && errno != EEXIST) + { + perror(bmpcache_dir); + return False; + } + + sprintf(bmpcache_dir, "%s/%s", home, ".rdesktop/cache"); + + if ((mkdir(bmpcache_dir, S_IRWXU) == -1) && errno != EEXIST) + { + perror(bmpcache_dir); + return False; + } + + return True; +} + +/* open a file in the .rdesktop directory */ +int +rd_open_file(char *filename) +{ + char *home; + char fn[256]; + int fd; + + home = getenv("HOME"); + if (home == NULL) + return -1; + sprintf(fn, "%s/.rdesktop/%s", home, filename); + fd = open(fn, O_RDWR | O_CREAT, S_IRUSR | S_IWUSR); + if (fd == -1) + perror(fn); + return fd; +} + +/* close file */ +void +rd_close_file(int fd) +{ + close(fd); +} + +/* read from file*/ +int +rd_read_file(int fd, void *ptr, int len) +{ + return read(fd, ptr, len); +} + +/* write to file */ +int +rd_write_file(int fd, void *ptr, int len) +{ + return write(fd, ptr, len); +} + +/* move file pointer */ +int +rd_lseek_file(int fd, int offset) +{ + return lseek(fd, offset, SEEK_SET); +} + +/* do a write lock on a file */ +BOOL +rd_lock_file(int fd, int start, int len) +{ + struct flock lock; + + lock.l_type = F_WRLCK; + lock.l_whence = SEEK_SET; + lock.l_start = start; + lock.l_len = len; + if (fcntl(fd, F_SETLK, &lock) == -1) + return False; + return True; +}