--- sourceforge.net/trunk/rdesktop/rdp.c 2004/06/29 16:22:41 730 +++ sourceforge.net/trunk/rdesktop/rdp.c 2005/04/16 11:42:34 886 @@ -1,7 +1,7 @@ /* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Protocol services - RDP layer - Copyright (C) Matthew Chapman 1999-2002 + Copyright (C) Matthew Chapman 1999-2005 This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -19,14 +19,28 @@ */ #include +#include +#include #include "rdesktop.h" +#ifdef HAVE_ICONV +#ifdef HAVE_ICONV_H +#include +#endif + +#ifndef ICONV_CONST +#define ICONV_CONST "" +#endif +#endif + extern uint16 g_mcs_userid; -extern char g_username[16]; +extern char g_username[64]; +extern char g_codepage[16]; extern BOOL g_bitmap_compression; extern BOOL g_orders; extern BOOL g_encryption; extern BOOL g_desktop_save; +extern BOOL g_polygon_ellipse_orders; extern BOOL g_use_rdp5; extern uint16 g_server_rdp_version; extern uint32 g_rdp5_performanceflags; @@ -35,6 +49,7 @@ extern int g_height; extern BOOL g_bitmap_cache; extern BOOL g_bitmap_cache_persist_enable; +extern BOOL g_rdp_compression; uint8 *g_next_packet; uint32 g_rdp_shareid; @@ -45,18 +60,36 @@ static uint32 g_packetno; #endif +#ifdef HAVE_ICONV +static BOOL g_iconv_works = True; +#endif + /* Receive an RDP packet */ static STREAM rdp_recv(uint8 * type) { static STREAM rdp_s; uint16 length, pdu_type; + uint8 rdpver; if ((rdp_s == NULL) || (g_next_packet >= rdp_s->end)) { - rdp_s = sec_recv(); + rdp_s = sec_recv(&rdpver); if (rdp_s == NULL) return NULL; + if (rdpver == 0xff) + { + g_next_packet = rdp_s->end; + *type = 0; + return rdp_s; + } + else if (rdpver != 3) + { + /* rdp5_process should move g_next_packet ok */ + rdp5_process(rdp_s); + *type = 0; + return rdp_s; + } g_next_packet = rdp_s->p; } @@ -126,17 +159,71 @@ void rdp_out_unistr(STREAM s, char *string, int len) { - int i = 0, j = 0; +#ifdef HAVE_ICONV + size_t ibl = strlen(string), obl = len + 2; + static iconv_t iconv_h = (iconv_t) - 1; + char *pin = string, *pout = (char *) s->p; - len += 2; + memset(pout, 0, len + 4); - while (i < len) + if (g_iconv_works) { - s->p[i++] = string[j++]; - s->p[i++] = 0; + if (iconv_h == (iconv_t) - 1) + { + size_t i = 1, o = 4; + if ((iconv_h = iconv_open(WINDOWS_CODEPAGE, g_codepage)) == (iconv_t) - 1) + { + warning("rdp_out_unistr: iconv_open[%s -> %s] fail %d\n", + g_codepage, WINDOWS_CODEPAGE, (int) iconv_h); + + g_iconv_works = False; + rdp_out_unistr(s, string, len); + return; + } + if (iconv(iconv_h, (ICONV_CONST char **) &pin, &i, &pout, &o) == + (size_t) - 1) + { + iconv_close(iconv_h); + iconv_h = (iconv_t) - 1; + warning("rdp_out_unistr: iconv(1) fail, errno %d\n", errno); + + g_iconv_works = False; + rdp_out_unistr(s, string, len); + return; + } + pin = string; + pout = (char *) s->p; + } + + if (iconv(iconv_h, (ICONV_CONST char **) &pin, &ibl, &pout, &obl) == (size_t) - 1) + { + iconv_close(iconv_h); + iconv_h = (iconv_t) - 1; + warning("rdp_out_unistr: iconv(2) fail, errno %d\n", errno); + + g_iconv_works = False; + rdp_out_unistr(s, string, len); + return; + } + + s->p += len + 2; + } + else +#endif + { + int i = 0, j = 0; + + len += 2; + + while (i < len) + { + s->p[i++] = string[j++]; + s->p[i++] = 0; + } - s->p += len; + s->p += len; + } } /* Input a string in Unicode @@ -146,15 +233,49 @@ int rdp_in_unistr(STREAM s, char *string, int uni_len) { - int i = 0; +#ifdef HAVE_ICONV + size_t ibl = uni_len, obl = uni_len; + char *pin = (char *) s->p, *pout = string; + static iconv_t iconv_h = (iconv_t) - 1; - while (i < uni_len / 2) + if (g_iconv_works) { - in_uint8a(s, &string[i++], 1); - in_uint8s(s, 1); + if (iconv_h == (iconv_t) - 1) + { + if ((iconv_h = iconv_open(g_codepage, WINDOWS_CODEPAGE)) == (iconv_t) - 1) + { + warning("rdp_in_unistr: iconv_open[%s -> %s] fail %d\n", + WINDOWS_CODEPAGE, g_codepage, (int) iconv_h); + + g_iconv_works = False; + return rdp_in_unistr(s, string, uni_len); + } + } + + if (iconv(iconv_h, (ICONV_CONST char **) &pin, &ibl, &pout, &obl) == (size_t) - 1) + { + iconv_close(iconv_h); + iconv_h = (iconv_t) - 1; + warning("rdp_in_unistr: iconv fail, errno %d\n", errno); + + g_iconv_works = False; + return rdp_in_unistr(s, string, uni_len); + } + return pout - string; } + else +#endif + { + int i = 0; + + while (i < uni_len / 2) + { + in_uint8a(s, &string[i++], 1); + in_uint8s(s, 1); + } - return i - 1; + return i - 1; + } } @@ -372,22 +493,22 @@ rdp_enum_bmpcache2(void) { STREAM s; - uint8 idlist[BMPCACHE2_NUM_PSTCELLS * sizeof(BITMAP_ID)]; - uint32 nids, offset, count, flags; + HASH_KEY keylist[BMPCACHE2_NUM_PSTCELLS]; + uint32 num_keys, offset, count, flags; offset = 0; - nids = pstcache_enumerate(2, idlist); + num_keys = pstcache_enumerate(2, keylist); - while (offset < nids) + while (offset < num_keys) { - count = MIN(nids - offset, 169); + count = MIN(num_keys - offset, 169); - s = rdp_init_data(24 + count * sizeof(BITMAP_ID)); + s = rdp_init_data(24 + count * sizeof(HASH_KEY)); flags = 0; if (offset == 0) flags |= PDU_FLAG_FIRST; - if (nids - offset <= 169) + if (num_keys - offset <= 169) flags |= PDU_FLAG_LAST; /* header */ @@ -397,13 +518,12 @@ out_uint16_le(s, 0); out_uint16_le(s, 0); out_uint16_le(s, 0); - out_uint16_le(s, nids); + out_uint16_le(s, num_keys); out_uint32_le(s, 0); out_uint32_le(s, flags); /* list */ - out_uint8a(s, idlist + offset * sizeof(BITMAP_ID), - count * sizeof(BITMAP_ID)); + out_uint8a(s, keylist[offset], count * sizeof(HASH_KEY)); s_mark_end(s); rdp_send_data(s, 0x2b); @@ -482,19 +602,23 @@ { uint8 order_caps[32]; - memset(order_caps, 0, 32); order_caps[0] = 1; /* dest blt */ order_caps[1] = 1; /* pat blt */ order_caps[2] = 1; /* screen blt */ order_caps[3] = (g_bitmap_cache ? 1 : 0); /* memblt */ + order_caps[4] = 0; /* triblt */ order_caps[8] = 1; /* line */ order_caps[9] = 1; /* line */ order_caps[10] = 1; /* rect */ - order_caps[11] = (g_desktop_save == False ? 0 : 1); /* desksave */ + order_caps[11] = (g_desktop_save ? 1 : 0); /* desksave */ order_caps[13] = 1; /* memblt */ order_caps[14] = 1; /* triblt */ + order_caps[20] = (g_polygon_ellipse_orders ? 1 : 0); /* polygon */ + order_caps[21] = (g_polygon_ellipse_orders ? 1 : 0); /* polygon2 */ order_caps[22] = 1; /* polyline */ + order_caps[25] = (g_polygon_ellipse_orders ? 1 : 0); /* ellipse */ + order_caps[26] = (g_polygon_ellipse_orders ? 1 : 0); /* ellipse2 */ order_caps[27] = 1; /* text2 */ out_uint16_le(s, RDP_CAPSET_ORDER); out_uint16_le(s, RDP_CAPLEN_ORDER); @@ -536,12 +660,33 @@ static void rdp_out_bmpcache2_caps(STREAM s) { + uint16 cellsize; + out_uint16_le(s, RDP_CAPSET_BMPCACHE2); out_uint16_le(s, RDP_CAPLEN_BMPCACHE2); out_uint16_le(s, g_bitmap_cache_persist_enable ? 2 : 0); /* version */ - out_uint16_le(s, 0x0300); /* flags? number of caches? */ + /* Cellsize: + 01 = 16x16, 02 = 32x32, 03 = 64x64 + log2(cell size) - 3 + */ + + cellsize = 0x03; + + if (g_rdp_compression) + { + switch (g_server_bpp) + { + case 24: + case 16: + case 15: + cellsize = 0x02; + break; + } + } + + out_uint16_le(s, (0x0000 | (cellsize << 8))); /* flags? number of caches? */ out_uint32_le(s, BMPCACHE2_C0_CELLS); out_uint32_le(s, BMPCACHE2_C1_CELLS); @@ -553,7 +698,7 @@ { out_uint32_le(s, BMPCACHE2_C2_CELLS); } - out_uint8s(s, 20); /* other bitmap caches not used */ + out_uint8s(s, 20); /* other bitmap caches not used */ } /* Output control capability set */ @@ -644,7 +789,7 @@ /* Output unknown capability sets */ static void -rdp_out_unknown_caps(STREAM s, uint16 id, uint16 length, uint8 *caps) +rdp_out_unknown_caps(STREAM s, uint16 id, uint16 length, uint8 * caps) { out_uint16_le(s, id); out_uint16_le(s, length); @@ -664,7 +809,7 @@ RDP_CAPLEN_BMPCACHE + RDP_CAPLEN_COLCACHE + RDP_CAPLEN_ACTIVATE + RDP_CAPLEN_CONTROL + RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE + - 0x58 + 0x08 + 0x08 + 0x34 /* unknown caps */ + + 0x58 + 0x08 + 0x08 + 0x34 /* unknown caps */ + 4 /* w2k fix, why? */ ; s = sec_init(sec_flags, 6 + 14 + caplen + sizeof(RDP_SOURCE)); @@ -692,11 +837,11 @@ rdp_out_pointer_caps(s); rdp_out_share_caps(s); - rdp_out_unknown_caps(s, 0x0d, 0x58, caps_0x0d); /* international? */ + rdp_out_unknown_caps(s, 0x0d, 0x58, caps_0x0d); /* international? */ rdp_out_unknown_caps(s, 0x0c, 0x08, caps_0x0c); rdp_out_unknown_caps(s, 0x0e, 0x08, caps_0x0e); - rdp_out_unknown_caps(s, 0x10, 0x34, caps_0x10); /* glyph cache? */ - + rdp_out_unknown_caps(s, 0x10, 0x34, caps_0x10); /* glyph cache? */ + s_mark_end(s); sec_send(s, sec_flags); } @@ -740,7 +885,7 @@ if (g_width != width || g_height != height) { warning("screen size changed from %dx%d to %dx%d\n", g_width, g_height, - width, height); + width, height); g_width = width; g_height = height; ui_resize_window(); @@ -1078,11 +1223,12 @@ if (ctype & RDP_MPPC_COMPRESSED) { - + if (len > RDP_MPPC_DICT_SIZE) + error("error decompressed packet size exceeds max\n"); if (mppc_expand(s->p, clen, ctype, &roff, &rlen) == -1) error("error while decompressing packet\n"); - //len -= 18; + /* len -= 18; */ /* allocate memory and copy the uncompressed data into the temporary stream */ ns->data = (uint8 *) xrealloc(ns->data, rlen); @@ -1135,47 +1281,15 @@ } /* Process incoming packets */ +/* nevers gets out of here till app is done */ void rdp_main_loop(BOOL * deactivated, uint32 * ext_disc_reason) { - uint8 type; - BOOL disc = False; /* True when a disconnect PDU was received */ - STREAM s; - - while ((s = rdp_recv(&type)) != NULL) - { - switch (type) - { - case RDP_PDU_DEMAND_ACTIVE: - process_demand_active(s); - *deactivated = False; - break; - - case RDP_PDU_DEACTIVATE: - DEBUG(("RDP_PDU_DEACTIVATE\n")); - *deactivated = True; - break; - - case RDP_PDU_DATA: - disc = process_data_pdu(s, ext_disc_reason); - break; - - case 0: - break; - - default: - unimpl("PDU %d\n", type); - } - - if (disc) - { - return; - } - } - return; + while (rdp_loop(deactivated, ext_disc_reason)) + ; } -/* used in uiports, processes the rdp packets waiting */ +/* used in uiports and rdp_main_loop, processes the rdp packets waiting */ BOOL rdp_loop(BOOL * deactivated, uint32 * ext_disc_reason) {