--- sourceforge.net/trunk/rdesktop/rdesktop.c 2003/08/21 23:23:15 447 +++ sourceforge.net/trunk/rdesktop/rdesktop.c 2004/01/23 14:37:51 582 @@ -26,6 +26,7 @@ #include /* stat */ #include /* gettimeofday */ #include /* times */ +#include /* toupper */ #include #include "rdesktop.h" @@ -40,17 +41,21 @@ #include "crypto/md5.h" #endif -char title[32] = ""; -char g_username[16]; +char g_title[64] = ""; +char g_username[64]; char hostname[16]; char keymapname[16]; int keylayout = 0x409; /* Defaults to US keyboard layout */ -int g_width = 800; /* If width or height are reset to zero, the geometry will - be fetched from _NET_WORKAREA */ + +int g_width = 800; /* width is special: If 0, the + geometry will be fetched from + _NET_WORKAREA. If negative, + absolute value specifies the + percent of the whole screen. */ int g_height = 600; int tcp_port_rdp = TCP_PORT_RDP; int g_server_bpp = 8; -int win_button_size = 0; /* If zero, disable single app mode */ +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; @@ -58,10 +63,19 @@ BOOL packet_encryption = True; BOOL g_desktop_save = True; BOOL g_fullscreen = False; -BOOL grab_keyboard = True; -BOOL hide_decorations = False; -BOOL g_use_rdp5 = False; -extern BOOL owncolmap; +BOOL g_grab_keyboard = True; +BOOL g_hide_decorations = False; +BOOL g_use_rdp5 = True; +BOOL g_console_session = False; +BOOL g_numlock_sync = False; +extern BOOL g_owncolmap; + +#ifdef WITH_RDPSND +BOOL g_rdpsnd = False; +#endif + +extern RDPDR_DEVICE g_rdpdr_device[]; +extern uint32 g_num_devices; #ifdef RDP2VNC extern int rfb_port; @@ -81,28 +95,45 @@ fprintf(stderr, "Usage: %s [options] server[:port]\n", program); #ifdef RDP2VNC fprintf(stderr, " -V: vnc port\n"); - fprintf(stderr, " -E: defer time (ms)\n"); + fprintf(stderr, " -Q: defer time (ms)\n"); #endif 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, " -e: disable encryption (French TS)\n"); - fprintf(stderr, " -E: disable encryption of everything but the logon packet\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"); - fprintf(stderr, " -a: server bpp\n"); - fprintf(stderr, " -5: Use RDP5 (EXPERIMENTAL!)\n"); + fprintf(stderr, " -N: enable numlock syncronization\n"); + fprintf(stderr, " -a: connection colour depth\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 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, " -0: attach to console\n"); + fprintf(stderr, " -4: use RDP version 4\n"); + fprintf(stderr, " -5: use RDP version 5 (default)\n"); } static BOOL @@ -196,7 +227,7 @@ char server[64]; char fullhostname[64]; char domain[16]; - char password[16]; + char password[64]; char shell[128]; char directory[32]; BOOL prompt_password, rdp_retval = False; @@ -204,6 +235,7 @@ uint32 flags; char *p; int c; + int username_option = 0; flags = RDP_LOGON_NORMAL; @@ -211,13 +243,15 @@ domain[0] = password[0] = shell[0] = directory[0] = 0; strcpy(keymapname, "en-us"); + g_num_devices = 0; + #ifdef RDP2VNC -#define VNCOPT "V:E:" +#define VNCOPT "V:Q:" #else #define VNCOPT #endif - while ((c = getopt(argc, argv, VNCOPT "u:d:s:S:c:p:n:k:g:a:fbeEmCKT:Dh?54")) != -1) + while ((c = getopt(argc, argv, VNCOPT "u:d:s:c:p:n:k:g:fbeEmCDKS:T:Na:r:045h?")) != -1) { switch (c) { @@ -228,7 +262,7 @@ rfb_port += 5900; break; - case 'E': + case 'Q': defer_time = strtol(optarg, NULL, 10); if (defer_time < 0) defer_time = 0; @@ -248,23 +282,6 @@ STRNCPY(shell, optarg, sizeof(shell)); break; - case 'S': - if (!strcmp(optarg, "standard")) - { - win_button_size = 18; - break; - } - - 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; @@ -294,6 +311,7 @@ break; case 'g': + g_fullscreen = False; if (!strcmp(optarg, "workarea")) { g_width = g_height = 0; @@ -301,14 +319,24 @@ } g_width = strtol(optarg, &p, 10); + if (g_width <= 0) + { + error("invalid geometry\n"); + return 1; + } + if (*p == 'x') g_height = strtol(p + 1, NULL, 10); - if ((g_width == 0) || (g_height == 0)) + if (g_height <= 0) { error("invalid geometry\n"); return 1; } + + if (*p == '%') + g_width = -g_width; + break; case 'f': @@ -330,19 +358,40 @@ break; case 'C': - owncolmap = True; + g_owncolmap = True; + break; + + case 'D': + g_hide_decorations = True; break; case 'K': - grab_keyboard = False; + 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(title, optarg, sizeof(title)); + STRNCPY(g_title, optarg, sizeof(g_title)); break; - case 'D': - hide_decorations = True; + case 'N': + g_numlock_sync = True; break; case 'a': @@ -355,9 +404,51 @@ } break; + case 'r': + + if (strncmp("sound", optarg, 5) == 0) + { +#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 + { + warning("Unknown -r argument\n\n\tPossible arguments are: comport, disk, lptport, printer, sound\n"); + } + break; + + case '0': + g_console_session = True; + break; + + case '4': + g_use_rdp5 = False; + break; + case '5': g_use_rdp5 = True; break; + case 'h': case '?': default: @@ -405,10 +496,10 @@ if (prompt_password && read_password(password, sizeof(password))) flags |= RDP_LOGON_AUTO; - if (title[0] == 0) + if (g_title[0] == 0) { - strcpy(title, "rdesktop - "); - strncat(title, server, sizeof(title) - sizeof("rdesktop - ")); + strcpy(g_title, "rdesktop - "); + strncat(g_title, server, sizeof(g_title) - sizeof("rdesktop - ")); } #ifdef RDP2VNC @@ -419,8 +510,11 @@ if (!ui_init()) return 1; - /* rdpsnd_init(); */ - /* rdpdr_init(); */ +#ifdef WITH_RDPSND + if (g_rdpsnd) + rdpsnd_init(); +#endif + rdpdr_init(); if (!rdp_connect(server, flags, domain, password, shell, directory)) return 1; @@ -610,7 +704,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; @@ -637,6 +731,129 @@ } } +/* + input: src is the string we look in for 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 * +ltoa(long N, int base) +{ + static char ret[LTOA_BUFSIZE]; + + register int i = 2; + long uarg; + char *tail, *head = ret, buf[LTOA_BUFSIZE]; + + if (36 < base || 2 > base) + base = 10; + + tail = &buf[LTOA_BUFSIZE - 1]; + *tail-- = '\0'; + + if (10 == base && N < 0L) + { + *head++ = '-'; + uarg = -N; + } + else + uarg = N; + + if (uarg) + { + for (i = 1; uarg; ++i) + { + register ldiv_t r; + + r = ldiv(uarg, base); + *tail-- = (char) (r.rem + ((9L < r.rem) ? ('A' - 10L) : '0')); + uarg = r.quot; + } + } + else + *tail-- = '0'; + + memcpy(head, ++tail, i); + return ret; +} + int load_licence(unsigned char **data)