--- sourceforge.net/trunk/rdesktop/rdesktop.c 2004/04/10 09:34:52 648 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2005/03/02 10:16:31 825 @@ -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_orders = 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; @@ -69,9 +69,10 @@ BOOL g_console_session = False; BOOL g_numlock_sync = False; BOOL g_owncolmap = False; -BOOL g_ownbackstore = True; /* We can't rely on external BackingStore */ +BOOL g_ownbackstore = True; /* We can't rely on external BackingStore */ uint32 g_embed_wnd; -uint32 g_rdp5_performanceflags = RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS; +uint32 g_rdp5_performanceflags = + RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS; #ifdef WITH_RDPSND BOOL g_rdpsnd = False; @@ -79,7 +80,7 @@ extern RDPDR_DEVICE g_rdpdr_device[]; extern uint32 g_num_devices; -extern char * g_rdpdr_clientname; +extern char *g_rdpdr_clientname; #ifdef RDP2VNC extern int rfb_port; @@ -123,14 +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, @@ -146,6 +149,106 @@ fprintf(stderr, " -5: use RDP version 5 (default)\n"); } +void +print_disconnect_reason(uint16 reason) +{ + char *text; + + switch (reason) + { + case exDiscReasonNoInfo: + text = "No information available"; + break; + + case exDiscReasonAPIInitiatedDisconnect: + text = "Server initiated disconnect"; + break; + + case exDiscReasonAPIInitiatedLogoff: + text = "Server initiated logoff"; + break; + + case exDiscReasonServerIdleTimeout: + text = "Server idle timeout reached"; + break; + + case exDiscReasonServerLogonTimeout: + text = "Server logon timeout reached"; + break; + + case exDiscReasonReplacedByOtherConnection: + text = "The session was replaced"; + break; + + case exDiscReasonOutOfMemory: + text = "The server is out of memory"; + break; + + case exDiscReasonServerDeniedConnection: + text = "The server denied the connection"; + break; + + case exDiscReasonServerDeniedConnectionFips: + text = "The server denied the connection for security reason"; + break; + + case exDiscReasonLicenseInternal: + text = "Internal licensing error"; + break; + + case exDiscReasonLicenseNoLicenseServer: + text = "No license server available"; + break; + + case exDiscReasonLicenseNoLicense: + text = "No valid license available"; + break; + + case exDiscReasonLicenseErrClientMsg: + text = "Invalid licensing message"; + break; + + case exDiscReasonLicenseHwidDoesntMatchLicense: + text = "Hardware id doesn't match software license"; + break; + + case exDiscReasonLicenseErrClientLicense: + text = "Client license error"; + break; + + case exDiscReasonLicenseCantFinishProtocol: + text = "Network error during licensing protocol"; + break; + + case exDiscReasonLicenseClientEndedProtocol: + text = "Licensing protocol was not completed"; + break; + + case exDiscReasonLicenseErrClientEncryption: + text = "Incorrect client license enryption"; + break; + + case exDiscReasonLicenseCantUpgradeLicense: + text = "Can't upgrade license"; + break; + + case exDiscReasonLicenseNoRemoteConnections: + text = "The server is not licensed to accept remote connections"; + break; + + default: + if (reason > 0x1000 && reason < 0x7fff) + { + text = "Internal protocol error"; + } + else + { + text = "Unknown reason"; + } + } + fprintf(stderr, "disconnect: %s.\n", text); +} + static BOOL read_password(char *password, int size) { @@ -203,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)); @@ -215,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; } } @@ -223,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 */ @@ -240,9 +343,9 @@ char password[64]; char shell[128]; char directory[32]; - BOOL prompt_password, rdp_retval = False; + BOOL prompt_password, deactivated; struct passwd *pw; - uint32 flags; + uint32 flags, ext_disc_reason = 0; char *p; int c; @@ -262,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) { @@ -314,7 +418,7 @@ break; case 'n': - STRNCPY(hostname, optarg, sizeof(hostname)); + STRNCPY(g_hostname, optarg, sizeof(g_hostname)); break; case 'k': @@ -337,7 +441,7 @@ } if (*p == 'x') - g_height = strtol(p + 1, NULL, 10); + g_height = strtol(p + 1, &p, 10); if (g_height <= 0) { @@ -346,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; @@ -355,7 +468,7 @@ break; case 'b': - g_orders = False; + g_bitmap_cache = False; break; case 'B': @@ -412,7 +525,7 @@ case 'X': g_embed_wnd = strtol(optarg, NULL, 10); break; - + case 'a': g_server_bpp = strtol(optarg, NULL, 10); if (g_server_bpp != 8 && g_server_bpp != 16 && g_server_bpp != 15 @@ -423,11 +536,17 @@ } break; + case 'z': + DEBUG(("rdp compression enabled\n")); + flags |= RDP_COMPRESSION; + break; + case 'x': - if (strncmp("modem", optarg, 1) == 0) { - g_rdp5_performanceflags = RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS | RDP5_NO_THEMING; + g_rdp5_performanceflags = + RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | + RDP5_NO_MENUANIMATIONS | RDP5_NO_THEMING; } else if (strncmp("broadband", optarg, 1) == 0) { @@ -442,7 +561,11 @@ g_rdp5_performanceflags = strtol(optarg, NULL, 16); } break; - + + case 'P': + g_bitmap_cache_persist_enable = True; + break; + case 'r': if (strncmp("sound", optarg, 5) == 0) @@ -461,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; } @@ -475,7 +602,7 @@ #ifdef WITH_RDPSND g_rdpsnd = True; #else - warning("Not compiled with sound support"); + warning("Not compiled with sound support\n"); #endif } } @@ -498,7 +625,7 @@ } else if (strncmp("clientname", optarg, 7) == 0) { - g_rdpdr_clientname = xmalloc(strlen(optarg+11)+1); + g_rdpdr_clientname = xmalloc(strlen(optarg + 11) + 1); strcpy(g_rdpdr_clientname, optarg + 11); } else @@ -548,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) { @@ -560,7 +687,13 @@ if (p != NULL) *p = 0; - STRNCPY(hostname, fullhostname, sizeof(hostname)); + STRNCPY(g_hostname, fullhostname, sizeof(g_hostname)); + } + + if ((flags & RDP_COMPRESSION) && (g_server_bpp > 8)) + { + warning("rdp compression not supported for bpp > 8, compression disabled\n"); + flags ^= RDP_COMPRESSION; } if (prompt_password && read_password(password, sizeof(password))) @@ -600,18 +733,37 @@ if (ui_create_window()) { - rdp_retval = rdp_main_loop(); + rdp_main_loop(&deactivated, &ext_disc_reason); ui_destroy_window(); } DEBUG(("Disconnecting...\n")); rdp_disconnect(); + cache_save_state(); ui_deinit(); - if (True == rdp_retval) + if (ext_disc_reason >= 2) + print_disconnect_reason(ext_disc_reason); + + if (deactivated) + { + /* clean disconnect */ return 0; + } else - return 2; + { + if (ext_disc_reason == exDiscReasonAPIInitiatedDisconnect + || ext_disc_reason == exDiscReasonAPIInitiatedLogoff) + { + /* not so clean disconnect, but nothing to worry about */ + return 0; + } + else + { + /* return error */ + return 2; + } + } #endif @@ -717,7 +869,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); @@ -930,8 +1086,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) @@ -957,7 +1113,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) @@ -968,7 +1124,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"); @@ -995,3 +1151,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; +}