--- sourceforge.net/trunk/rdesktop/rdesktop.c 2004/03/04 13:23:23 629 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2004/04/29 19:40:40 685 @@ -58,7 +58,7 @@ 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,8 +68,11 @@ BOOL g_use_rdp5 = True; BOOL g_console_session = False; BOOL g_numlock_sync = False; -extern BOOL g_owncolmap; -extern BOOL g_ownbackstore; +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; @@ -77,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; @@ -118,7 +122,10 @@ 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"); @@ -126,19 +133,121 @@ 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 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:[on|off|remote]': enable sound redirection\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) { @@ -233,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; @@ -245,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; @@ -254,7 +364,7 @@ #define VNCOPT #endif - while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbBeEmCDKS: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) { @@ -347,7 +457,7 @@ break; case 'b': - g_orders = False; + g_bitmap_cache = False; break; case 'B': @@ -401,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 @@ -411,6 +525,28 @@ } 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) @@ -425,7 +561,7 @@ if (strncmp("remote", optarg, 6) == 0) flags |= RDP_LOGON_LEAVE_AUDIO; - if (strncmp("on", optarg, 2) == 0) + if (strncmp("local", optarg, 5) == 0) #ifdef WITH_RDPSND g_rdpsnd = True; #else @@ -433,7 +569,11 @@ #endif if (strncmp("off", optarg, 3) == 0) +#ifdef WITH_RDPSND g_rdpsnd = False; +#else + warning("Not compiled with sound support"); +#endif optarg = p; } @@ -464,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"); @@ -563,7 +708,7 @@ if (ui_create_window()) { - rdp_retval = rdp_main_loop(); + rdp_main_loop(&deactivated, &ext_disc_reason); ui_destroy_window(); } @@ -571,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