--- sourceforge.net/trunk/rdesktop/rdesktop.c 2004/01/27 10:36:49 583 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2004/06/15 22:17:08 710 @@ -43,9 +43,9 @@ 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 +53,12 @@ absolute value specifies the percent of the whole screen. */ int g_height = 600; -int tcp_port_rdp = TCP_PORT_RDP; +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_encryption = True; BOOL packet_encryption = True; BOOL g_desktop_save = True; @@ -68,7 +68,11 @@ BOOL g_use_rdp5 = True; BOOL g_console_session = False; BOOL g_numlock_sync = False; -extern BOOL g_owncolmap; +BOOL g_owncolmap = False; +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; #ifdef WITH_RDPSND BOOL g_rdpsnd = False; @@ -76,6 +80,7 @@ extern RDPDR_DEVICE g_rdpdr_device[]; extern uint32 g_num_devices; +extern char *g_rdpdr_clientname; #ifdef RDP2VNC extern int rfb_port; @@ -107,6 +112,7 @@ fprintf(stderr, " -g: desktop geometry (WxH)\n"); fprintf(stderr, " -f: full-screen mode\n"); fprintf(stderr, " -b: force bitmap updates\n"); + fprintf(stderr, " -B: use BackingStore of X-server (if available)\n"); fprintf(stderr, " -e: disable encryption (French TS)\n"); fprintf(stderr, " -E: disable encryption from client to server\n"); fprintf(stderr, " -m: do not send motion events\n"); @@ -116,22 +122,132 @@ fprintf(stderr, " -S: caption button size (single application mode)\n"); fprintf(stderr, " -T: window title\n"); 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, " -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, + " '-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, + " '-r disk:A=/mnt/floppy': enable redirection of /mnt/floppy to A:\n"); fprintf(stderr, " or A=/mnt/floppy,D=/mnt/cdrom'\n"); - fprintf(stderr, " '-r lptport:LPT1=/dev/lp0': enable parallel redirection of /dev/lp0 to LPT1\n"); + fprintf(stderr, " '-r clientname=': Set the client name displayed\n"); + fprintf(stderr, " for redirected disks\n"); + fprintf(stderr, + " '-r lptport:LPT1=/dev/lp0': enable parallel redirection of /dev/lp0 to LPT1\n"); fprintf(stderr, " or LPT1=/dev/lp0,LPT2=/dev/lp1\n"); fprintf(stderr, " '-r printer:mydeskjet': enable printer redirection\n"); - fprintf(stderr, " or mydeskjet=\"HP LaserJet IIIP\" to enter server driver as well\n"); - fprintf(stderr, " '-r sound': enable sound redirection\n"); + fprintf(stderr, + " or mydeskjet=\"HP LaserJet IIIP\" to enter server driver as well\n"); + fprintf(stderr, " '-r sound:[local|off|remote]': enable sound redirection\n"); + fprintf(stderr, " remote would leave sound on server\n"); fprintf(stderr, " -0: attach to console\n"); fprintf(stderr, " -4: use RDP version 4\n"); 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) { @@ -189,7 +305,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)); @@ -201,7 +317,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; } } @@ -209,7 +325,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 */ @@ -226,9 +342,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; @@ -238,6 +354,7 @@ prompt_password = False; domain[0] = password[0] = shell[0] = directory[0] = 0; strcpy(keymapname, "en-us"); + g_embed_wnd = 0; g_num_devices = 0; @@ -247,7 +364,7 @@ #define VNCOPT #endif - while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:Na:r:045h?")) != -1) + while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbBeEmCDKS:T:NX:a:x:r:045h?")) != -1) { switch (c) { @@ -299,7 +416,7 @@ break; case 'n': - STRNCPY(hostname, optarg, sizeof(hostname)); + STRNCPY(g_hostname, optarg, sizeof(g_hostname)); break; case 'k': @@ -340,7 +457,11 @@ break; case 'b': - g_orders = False; + g_bitmap_cache = False; + break; + + case 'B': + g_ownbackstore = False; break; case 'e': @@ -390,6 +511,10 @@ g_numlock_sync = True; break; + 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 @@ -400,15 +525,67 @@ } break; + case 'x': + + if (strncmp("modem", optarg, 1) == 0) + { + g_rdp5_performanceflags = + RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | + RDP5_NO_MENUANIMATIONS | RDP5_NO_THEMING; + } + else if (strncmp("broadband", optarg, 1) == 0) + { + g_rdp5_performanceflags = RDP5_NO_WALLPAPER; + } + else if (strncmp("lan", optarg, 1) == 0) + { + g_rdp5_performanceflags = RDP5_DISABLE_NOTHING; + } + else + { + g_rdp5_performanceflags = strtol(optarg, NULL, 16); + } + break; + case 'r': if (strncmp("sound", optarg, 5) == 0) { + optarg += 5; + + if (*optarg == ':') + { + *optarg++; + while ((p = next_arg(optarg, ','))) + { + if (strncmp("remote", optarg, 6) == 0) + flags |= RDP_LOGON_LEAVE_AUDIO; + + if (strncmp("local", optarg, 5) == 0) +#ifdef WITH_RDPSND + g_rdpsnd = True; +#else + warning("Not compiled with sound support"); +#endif + + if (strncmp("off", optarg, 3) == 0) #ifdef WITH_RDPSND - g_rdpsnd = True; + g_rdpsnd = False; #else - warning("Not compiled with sound support"); + warning("Not compiled with sound support"); #endif + + optarg = p; + } + } + else + { +#ifdef WITH_RDPSND + g_rdpsnd = True; +#else + warning("Not compiled with sound support"); +#endif + } } else if (strncmp("disk", optarg, 4) == 0) { @@ -427,6 +604,11 @@ { printer_enum_devices(&g_num_devices, optarg + 7); } + else if (strncmp("clientname", optarg, 7) == 0) + { + g_rdpdr_clientname = xmalloc(strlen(optarg + 11) + 1); + strcpy(g_rdpdr_clientname, optarg + 11); + } else { warning("Unknown -r argument\n\n\tPossible arguments are: comport, disk, lptport, printer, sound\n"); @@ -453,7 +635,7 @@ } } - if (argc - optind < 1) + if (argc - optind != 1) { usage(argv[0]); return 1; @@ -474,7 +656,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) { @@ -486,7 +668,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))) @@ -526,7 +708,7 @@ if (ui_create_window()) { - rdp_retval = rdp_main_loop(); + rdp_main_loop(&deactivated, &ext_disc_reason); ui_destroy_window(); } @@ -534,10 +716,28 @@ rdp_disconnect(); 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 @@ -812,7 +1012,7 @@ #define LTOA_BUFSIZE (sizeof(long) * 8 + 1) char * -ltoa(long N, int base) +l_to_a(long N, int base) { static char ret[LTOA_BUFSIZE]; @@ -856,8 +1056,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) @@ -883,7 +1083,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) @@ -894,7 +1094,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");