--- sourceforge.net/trunk/rdesktop/rdesktop.c 2003/10/17 08:23:47 501 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2004/04/02 15:34:38 646 @@ -26,6 +26,7 @@ #include /* stat */ #include /* gettimeofday */ #include /* times */ +#include /* toupper */ #include #include "rdesktop.h" @@ -66,12 +67,20 @@ BOOL g_hide_decorations = False; BOOL g_use_rdp5 = True; BOOL g_console_session = False; +BOOL g_numlock_sync = False; extern BOOL g_owncolmap; +extern BOOL g_ownbackstore; +extern uint32 g_embed_wnd; +uint32 g_rdp5_performanceflags = RDP5_NO_WALLPAPER | RDP5_NO_FULLWINDOWDRAG | RDP5_NO_MENUANIMATIONS; #ifdef WITH_RDPSND -BOOL g_rdpsnd = True; +BOOL g_rdpsnd = False; #endif +extern RDPDR_DEVICE g_rdpdr_device[]; +extern uint32 g_num_devices; +extern char * g_rdpdr_clientname; + #ifdef RDP2VNC extern int rfb_port; extern int defer_time; @@ -95,25 +104,43 @@ 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"); - fprintf(stderr, " -k: keyboard layout on terminal server (us,sv,gr,etc.)\n"); + fprintf(stderr, " -k: keyboard layout on server (en-us, de, sv, etc.)\n"); 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"); fprintf(stderr, " -C: use private colour map\n"); + fprintf(stderr, " -D: hide window manager decorations\n"); fprintf(stderr, " -K: keep window manager key bindings\n"); + fprintf(stderr, " -S: caption button size (single application mode)\n"); fprintf(stderr, " -T: window title\n"); - fprintf(stderr, " -D: hide window manager decorations\n"); -#ifdef WITH_RDPSND - fprintf(stderr, " -A: disable audio-redirection\n"); -#endif - fprintf(stderr, " -a: server bpp\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, " 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"); + 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:[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"); @@ -218,12 +245,16 @@ uint32 flags; char *p; int c; + int username_option = 0; flags = RDP_LOGON_NORMAL; prompt_password = False; domain[0] = password[0] = shell[0] = directory[0] = 0; strcpy(keymapname, "en-us"); + g_embed_wnd = 0; + + g_num_devices = 0; #ifdef RDP2VNC #define VNCOPT "V:Q:" @@ -231,7 +262,7 @@ #define VNCOPT #endif - while ((c = getopt(argc, argv, VNCOPT "u:d:s:S:c:p:n:k:g:a:fbeEmCKT:AD045h?")) != -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) { @@ -262,23 +293,6 @@ STRNCPY(shell, optarg, sizeof(shell)); break; - case 'S': - if (!strcmp(optarg, "standard")) - { - g_win_button_size = 18; - break; - } - - g_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; @@ -308,6 +322,7 @@ break; case 'g': + g_fullscreen = False; if (!strcmp(optarg, "workarea")) { g_width = g_height = 0; @@ -343,6 +358,10 @@ g_orders = False; break; + case 'B': + g_ownbackstore = False; + break; + case 'e': g_encryption = False; break; @@ -357,18 +376,43 @@ g_owncolmap = True; break; + case 'D': + g_hide_decorations = True; + break; + case 'K': g_grab_keyboard = False; break; + case 'S': + if (!strcmp(optarg, "standard")) + { + g_win_button_size = 18; + break; + } + + g_win_button_size = strtol(optarg, &p, 10); + + if (*p) + { + error("invalid button size\n"); + return 1; + } + + break; + case 'T': STRNCPY(g_title, optarg, sizeof(g_title)); break; - case 'D': - g_hide_decorations = True; + case 'N': + 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 @@ -379,11 +423,90 @@ } break; -#ifdef WITH_RDPSND - case 'A': - g_rdpsnd = False; + 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) + g_rdpsnd = False; + + optarg = p; + } + } + else + { +#ifdef WITH_RDPSND + g_rdpsnd = True; +#else + warning("Not compiled with sound support"); +#endif + } + } + else if (strncmp("disk", optarg, 4) == 0) + { + /* -r disk:h:=/mnt/floppy */ + disk_enum_devices(&g_num_devices, optarg + 4); + } + else if (strncmp("comport", optarg, 7) == 0) + { + serial_enum_devices(&g_num_devices, optarg + 7); + } + else if (strncmp("lptport", optarg, 7) == 0) + { + parallel_enum_devices(&g_num_devices, optarg + 7); + } + else if (strncmp("printer", optarg, 7) == 0) + { + 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"); + } + break; + case '0': g_console_session = True; break; @@ -404,7 +527,7 @@ } } - if (argc - optind < 1) + if (argc - optind != 1) { usage(argv[0]); return 1; @@ -459,11 +582,9 @@ #ifdef WITH_RDPSND if (g_rdpsnd) - { rdpsnd_init(); - } #endif - /* rdpdr_init(); */ + rdpdr_init(); if (!rdp_connect(server, flags, domain, password, shell, directory)) return 1; @@ -653,7 +774,7 @@ /* produce a hex dump */ void -hexdump(unsigned char *p, int len) +hexdump(unsigned char *p, unsigned int len) { unsigned char *line = p; int i, thisline, offset = 0; @@ -680,6 +801,123 @@ } } +/* + input: src is the string we look in for needle. + Needle may be escaped by a backslash, in + that case we ignore that particular needle. + return value: returns next src pointer, for + succesive executions, like in a while loop + if retval is 0, then there are no more args. + pitfalls: + src is modified. 0x00 chars are inserted to + terminate strings. + return val, points on the next val chr after ins + 0x00 + + example usage: + while( (pos = next_arg( optarg, ',')) ){ + printf("%s\n",optarg); + optarg=pos; + } + +*/ +char * +next_arg(char *src, char needle) +{ + char *nextval; + char *p; + char *mvp = 0; + + /* EOS */ + if (*src == (char) 0x00) + return 0; + + p = src; + /* skip escaped needles */ + while ((nextval = strchr(p, needle))) + { + mvp = nextval - 1; + /* found backslashed needle */ + if (*mvp == '\\' && (mvp > src)) + { + /* move string one to the left */ + while (*(mvp + 1) != (char) 0x00) + { + *mvp = *(mvp + 1); + *mvp++; + } + *mvp = (char) 0x00; + p = nextval; + } + else + { + p = nextval + 1; + break; + } + + } + + /* more args available */ + if (nextval) + { + *nextval = (char) 0x00; + return ++nextval; + } + + /* no more args after this, jump to EOS */ + nextval = src + strlen(src); + return nextval; +} + + +void +toupper_str(char *p) +{ + while (*p) + { + if ((*p >= 'a') && (*p <= 'z')) + *p = toupper((int) *p); + p++; + } +} + + +/* not all clibs got ltoa */ +#define LTOA_BUFSIZE (sizeof(long) * 8 + 1) + +char * +l_to_a(long N, int base) +{ + static char ret[LTOA_BUFSIZE]; + + char *head = ret, buf[LTOA_BUFSIZE], *tail = buf + sizeof(buf); + + register int divrem; + + if (base < 36 || 2 > base) + base = 10; + + if (N < 0) + { + *head++ = '-'; + N = -N; + } + + tail = buf + sizeof(buf); + *--tail = 0; + + do + { + divrem = N % base; + *--tail = (divrem <= 9) ? divrem + '0' : divrem + 'a' - 10; + N /= base; + } + while (N); + + strcpy(head, tail); + return ret; +} + int load_licence(unsigned char **data)