--- sourceforge.net/trunk/rdesktop/rdp.c 2002/07/18 16:38:31 64 +++ sourceforge.net/trunk/rdesktop/rdp.c 2003/04/16 08:19:15 365 @@ -1,7 +1,7 @@ -/* +/* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Protocol services - RDP layer - Copyright (C) Matthew Chapman 1999-2001 + Copyright (C) Matthew Chapman 1999-2002 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 @@ -26,37 +26,15 @@ extern BOOL orders; extern BOOL encryption; extern BOOL desktop_save; +extern BOOL use_rdp5; +extern uint16 server_rdp_version; uint8 *next_packet; uint32 rdp_shareid; -/* Initialise an RDP packet */ -static STREAM -rdp_init(int maxlen) -{ - STREAM s; - - s = sec_init(encryption ? SEC_ENCRYPT : 0, maxlen + 6); - s_push_layer(s, rdp_hdr, 6); - - return s; -} - -/* Send an RDP packet */ -static void -rdp_send(STREAM s, uint8 pdu_type) -{ - uint16 length; - - s_pop_layer(s, rdp_hdr); - length = s->end - s->p; - - out_uint16_le(s, length); - out_uint16_le(s, (pdu_type | 0x10)); /* Version 1 */ - out_uint16_le(s, (mcs_userid + 1001)); - - sec_send(s, encryption ? SEC_ENCRYPT : 0); -} +#if WITH_DEBUG +static uint32 packetno; +#endif /* Receive an RDP packet */ static STREAM @@ -79,13 +57,20 @@ } in_uint16_le(rdp_s, length); + /* 32k packets are really 8, keepalive fix */ + if (length == 0x8000) + { + next_packet += 8; + *type = 0; + return rdp_s; + } in_uint16_le(rdp_s, pdu_type); in_uint8s(rdp_s, 2); /* userid */ *type = pdu_type & 0xf; #if WITH_DEBUG - DEBUG(("RDP packet (type %x):\n", *type)); - hexdump(next_packet, length); + DEBUG(("RDP packet #%d, (type %x)\n", ++packetno, *type)); + // hexdump(next_packet, length); #endif /* */ next_packet += length; @@ -120,7 +105,7 @@ out_uint32_le(s, rdp_shareid); out_uint8(s, 0); /* pad */ out_uint8(s, 1); /* streamid */ - out_uint16(s, (length - 14)); + out_uint16_le(s, (length - 14)); out_uint8(s, data_pdu_type); out_uint8(s, 0); /* compress_type */ out_uint16(s, 0); /* compress_len */ @@ -155,26 +140,89 @@ int len_password = 2 * strlen(password); int len_program = 2 * strlen(program); int len_directory = 2 * strlen(directory); - uint32 sec_flags = encryption ? (SEC_LOGON_INFO | SEC_ENCRYPT) - : SEC_LOGON_INFO; + uint32 sec_flags = encryption ? (SEC_LOGON_INFO | SEC_ENCRYPT) : SEC_LOGON_INFO; STREAM s; - s = sec_init(sec_flags, 18 + len_domain + len_user + len_password - + len_program + len_directory + 10); + if (1 == server_rdp_version) + { + DEBUG_RDP5(("Sending RDP4-style Logon packet\n")); - out_uint32(s, 0); - out_uint32_le(s, flags); - out_uint16_le(s, len_domain); - out_uint16_le(s, len_user); - out_uint16_le(s, len_password); - out_uint16_le(s, len_program); - out_uint16_le(s, len_directory); - rdp_out_unistr(s, domain, len_domain); - rdp_out_unistr(s, user, len_user); - rdp_out_unistr(s, password, len_password); - rdp_out_unistr(s, program, len_program); - rdp_out_unistr(s, directory, len_directory); + s = sec_init(sec_flags, 18 + len_domain + len_user + len_password + + len_program + len_directory + 10); + out_uint32(s, 0); + out_uint32_le(s, flags); + out_uint16_le(s, len_domain); + out_uint16_le(s, len_user); + out_uint16_le(s, len_password); + out_uint16_le(s, len_program); + out_uint16_le(s, len_directory); + rdp_out_unistr(s, domain, len_domain); + rdp_out_unistr(s, user, len_user); + rdp_out_unistr(s, password, len_password); + rdp_out_unistr(s, program, len_program); + rdp_out_unistr(s, directory, len_directory); + } + else + { + DEBUG_RDP5(("Sending RDP5-style Logon packet\n")); + s = sec_init(sec_flags, 12 + (flags & RDP_LOGON_AUTO ? 2 : 0) + 6 + (flags & RDP_LOGON_AUTO ? len_password : 0) + len_domain + len_user + 4 + len_program + len_directory + 30 + 2 + 60 + 32 + 20 + 32 + 20); /* Phew! */ + + out_uint32(s, 0); + out_uint32_le(s, flags); + out_uint16_le(s, len_domain); + out_uint16_le(s, len_user); + if (flags & RDP_LOGON_AUTO) + { + out_uint16_le(s, len_password); + } + out_uint16(s, 0); /* Seems to be length of a 512 byte blob with + completely unknown data, but hopefully we'll do + with a 0 length block as well */ + out_uint16_le(s, len_program); + out_uint16_le(s, len_directory); + if (flags & RDP_LOGON_AUTO) + { + rdp_out_unistr(s, password, len_password); + } + rdp_out_unistr(s, domain, len_domain); + rdp_out_unistr(s, user, len_user); + out_uint16(s, 0); + out_uint16(s, 0); + if (0 < len_program) + rdp_out_unistr(s, program, len_program); + if (0 < len_directory) + rdp_out_unistr(s, directory, len_directory); + out_uint8s(s, 30); /* Some kind of client data - let's see if the server + handles zeros well.. */ + out_uint16_le(s, 60); + rdp_out_unistr(s, "C:\\WINNT\\System32\\mstscax.dll", 58); + out_uint32_be(s, 0x88ffffff); + rdp_out_unistr(s, "GTB, normaltid", 2 * strlen("GTB, normaltid") - 2); + out_uint8s(s, 30 - 2 * strlen("GTP, normaltid")); + + out_uint32_le(s, 0x0a0000); + out_uint32_le(s, 0x050000); + out_uint32_le(s, 2); + out_uint32(s, 0); + out_uint32_le(s, 0xffffffc4); + out_uint32_le(s, 0xfffffffe); + out_uint32_le(s, 0x0f); + out_uint32(s, 0); + + rdp_out_unistr(s, "GTB, sommartid", 2 * strlen("GTB, sommartid") - 1); + out_uint8s(s, 30 - 2 * strlen("GTP, sommartid")); + + out_uint32_le(s, 0x030000); + out_uint32_le(s, 0x050000); + out_uint32_le(s, 2); + out_uint32(s, 0); + out_uint32_le(s, 0xffffffc4); + out_uint32_le(s, 0xfffffffe); + out_uint32_le(s, 0x0f); + out_uint32(s, 0); + + } s_mark_end(s); sec_send(s, sec_flags); } @@ -197,7 +245,7 @@ /* Send a synchronisation PDU */ static void -rdp_send_synchronise() +rdp_send_synchronise(void) { STREAM s; @@ -212,8 +260,7 @@ /* Send a single input event */ void -rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, - uint16 param1, uint16 param2) +rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, uint16 param1, uint16 param2) { STREAM s; @@ -261,7 +308,14 @@ out_uint16_le(s, 0x200); /* Protocol version */ out_uint16(s, 0); /* Pad */ out_uint16(s, 0); /* Compression types */ - out_uint16(s, 0); /* Pad */ + out_uint16_le(s, use_rdp5 ? 0x40d : 0); + /* Pad, according to T.128. 0x40d seems to + trigger + the server to start sending RDP5 packets. + However, the value is 0x1d04 with W2KTSK and + NT4MS. Hmm.. Anyway, thankyou, Microsoft, + for sending such information in a padding + field.. */ out_uint16(s, 0); /* Update capability */ out_uint16(s, 0); /* Remote unshare capability */ out_uint16(s, 0); /* Compression level */ @@ -276,8 +330,8 @@ out_uint16_le(s, RDP_CAPLEN_BITMAP); out_uint16_le(s, 8); /* Preferred BPP */ - out_uint16(s, 1); /* Receive 1 BPP */ - out_uint16(s, 1); /* Receive 4 BPP */ + out_uint16_le(s, 1); /* Receive 1 BPP */ + out_uint16_le(s, 1); /* Receive 4 BPP */ out_uint16_le(s, 1); /* Receive 8 BPP */ out_uint16_le(s, 800); /* Desktop width */ out_uint16_le(s, 600); /* Desktop height */ @@ -300,6 +354,7 @@ order_caps[0] = 1; /* dest blt */ order_caps[1] = 1; /* pat blt */ order_caps[2] = 1; /* screen blt */ + order_caps[3] = 1; /* required for memblt? */ order_caps[8] = 1; /* line */ order_caps[9] = 1; /* line */ order_caps[10] = 1; /* rect */ @@ -321,9 +376,9 @@ out_uint8p(s, order_caps, 32); /* Orders supported */ out_uint16_le(s, 0x6a1); /* Text capability flags */ out_uint8s(s, 6); /* Pad */ - out_uint32(s, desktop_save == False ? 0 : 0x38400); /* Desktop cache size */ + out_uint32_le(s, desktop_save == False ? 0 : 0x38400); /* Desktop cache size */ out_uint32(s, 0); /* Unknown */ - out_uint32(s, 0x4e4); /* Unknown */ + out_uint32_le(s, 0x4e4); /* Unknown */ } /* Output bitmap cache capability set */ @@ -423,7 +478,7 @@ 0x02, 0x00, 0x00, 0x00 }; -/* Output unknown capability set */ +/* Output unknown capability sets (number 13, 12, 14 and 16) */ static void rdp_out_unknown_caps(STREAM s) { @@ -433,19 +488,24 @@ out_uint8p(s, canned_caps, RDP_CAPLEN_UNKNOWN - 4); } +#define RDP5_FLAG 0x0030 /* Send a confirm active PDU */ static void -rdp_send_confirm_active() +rdp_send_confirm_active(void) { STREAM s; + uint32 sec_flags = encryption ? (RDP5_FLAG | SEC_ENCRYPT) : RDP5_FLAG; uint16 caplen = RDP_CAPLEN_GENERAL + RDP_CAPLEN_BITMAP + RDP_CAPLEN_ORDER + RDP_CAPLEN_BMPCACHE + RDP_CAPLEN_COLCACHE + RDP_CAPLEN_ACTIVATE + RDP_CAPLEN_CONTROL + - RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE + RDP_CAPLEN_UNKNOWN - + 4 /* w2k fix, why? */ ; + RDP_CAPLEN_POINTER + RDP_CAPLEN_SHARE + RDP_CAPLEN_UNKNOWN + 4 /* w2k fix, why? */ ; - s = rdp_init(14 + caplen + sizeof(RDP_SOURCE)); + s = sec_init(sec_flags, 6 + 14 + caplen + sizeof(RDP_SOURCE)); + + out_uint16_le(s, 2 + 14 + caplen + sizeof(RDP_SOURCE)); + out_uint16_le(s, (RDP_PDU_CONFIRM_ACTIVE | 0x10)); /* Version 1 */ + out_uint16_le(s, (mcs_userid + 1001)); out_uint32_le(s, rdp_shareid); out_uint16_le(s, 0x3ea); /* userid */ @@ -468,7 +528,7 @@ rdp_out_unknown_caps(s); s_mark_end(s); - rdp_send(s, RDP_PDU_CONFIRM_ACTIVE); + sec_send(s, sec_flags); } /* Respond to a demand active PDU */ @@ -495,14 +555,54 @@ reset_order_state(); } +/* Process a null system pointer PDU */ +void +process_null_system_pointer_pdu(STREAM s) +{ + // FIXME: We should probably set another cursor here, + // like the X window system base cursor or something. + ui_set_cursor(cache_get_cursor(0)); +} + +/* Process a colour pointer PDU */ +void +process_colour_pointer_pdu(STREAM s) +{ + uint16 x, y, width, height, cache_idx, masklen, datalen; + uint8 *mask, *data; + HCURSOR cursor; + + in_uint16_le(s, cache_idx); + in_uint16_le(s, x); + in_uint16_le(s, y); + in_uint16_le(s, width); + in_uint16_le(s, height); + in_uint16_le(s, masklen); + in_uint16_le(s, datalen); + in_uint8p(s, data, datalen); + in_uint8p(s, mask, masklen); + cursor = ui_create_cursor(x, y, width, height, mask, data); + ui_set_cursor(cursor); + cache_put_cursor(cache_idx, cursor); +} + +/* Process a cached pointer PDU */ +void +process_cached_pointer_pdu(STREAM s) +{ + uint16 cache_idx; + + in_uint16_le(s, cache_idx); + ui_set_cursor(cache_get_cursor(cache_idx)); +} + + /* Process a pointer PDU */ static void process_pointer_pdu(STREAM s) { uint16 message_type; - uint16 x, y, width, height, cache_idx, masklen, datalen; - uint8 *mask, *data; - HCURSOR cursor; + uint16 x, y; in_uint16_le(s, message_type); in_uint8s(s, 2); /* pad */ @@ -517,24 +617,11 @@ break; case RDP_POINTER_COLOR: - in_uint16_le(s, cache_idx); - in_uint16_le(s, x); - in_uint16_le(s, y); - in_uint16_le(s, width); - in_uint16_le(s, height); - in_uint16_le(s, masklen); - in_uint16_le(s, datalen); - in_uint8p(s, data, datalen); - in_uint8p(s, mask, masklen); - cursor = ui_create_cursor(x, y, width, height, mask, - data); - ui_set_cursor(cursor); - cache_put_cursor(cache_idx, cursor); + process_colour_pointer_pdu(s); break; case RDP_POINTER_CACHED: - in_uint16_le(s, cache_idx); - ui_set_cursor(cache_get_cursor(cache_idx)); + process_cached_pointer_pdu(s); break; default: @@ -543,12 +630,12 @@ } /* Process bitmap updates */ -static void +void process_bitmap_updates(STREAM s) { uint16 num_updates; uint16 left, top, right, bottom, width, height; - uint16 cx, cy, bpp, compress, bufsize, size; + uint16 cx, cy, bpp, Bpp, compress, bufsize, size; uint8 *data, *bmpdata; int i; @@ -563,41 +650,50 @@ in_uint16_le(s, width); in_uint16_le(s, height); in_uint16_le(s, bpp); + Bpp = (bpp + 7) / 8; in_uint16_le(s, compress); in_uint16_le(s, bufsize); cx = right - left + 1; cy = bottom - top + 1; - DEBUG(("UPDATE(l=%d,t=%d,r=%d,b=%d,w=%d,h=%d,cmp=%d)\n", - left, top, right, bottom, width, height, compress)); + DEBUG(("BITMAP_UPDATE(l=%d,t=%d,r=%d,b=%d,w=%d,h=%d,Bpp=%d,cmp=%d)\n", + left, top, right, bottom, width, height, Bpp, compress)); if (!compress) { int y; - bmpdata = xmalloc(width * height); + bmpdata = xmalloc(width * height * Bpp); for (y = 0; y < height; y++) { - in_uint8a(s, - &bmpdata[(height - y - 1) * width], - width); + in_uint8a(s, &bmpdata[(height - y - 1) * (width * Bpp)], + width * Bpp); } - ui_paint_bitmap(left, top, cx, cy, width, height, - bmpdata); + ui_paint_bitmap(left, top, cx, cy, width, height, bmpdata); xfree(bmpdata); continue; } - in_uint8s(s, 2); /* pad */ - in_uint16_le(s, size); - in_uint8s(s, 4); /* line_size, final_size */ - in_uint8p(s, data, size); - bmpdata = xmalloc(width * height); - if (bitmap_decompress(bmpdata, width, height, data, size)) + if (compress & 0x400) + { + size = bufsize; + } + else + { + in_uint8s(s, 2); /* pad */ + in_uint16_le(s, size); + in_uint8s(s, 4); /* line_size, final_size */ + } + in_uint8p(s, data, size); + bmpdata = xmalloc(width * height * Bpp); + if (bitmap_decompress(bmpdata, width, height, data, size, Bpp)) { - ui_paint_bitmap(left, top, cx, cy, width, height, - bmpdata); + ui_paint_bitmap(left, top, cx, cy, width, height, bmpdata); + } + else + { + DEBUG_RDP5(("Failed to decompress data\n")); } xfree(bmpdata); @@ -605,35 +701,51 @@ } /* Process a palette update */ -static void +void process_palette(STREAM s) { - HCOLOURMAP hmap; + COLOURENTRY *entry; COLOURMAP map; - uint8 *colours; + HCOLOURMAP hmap; + int i; in_uint8s(s, 2); /* pad */ in_uint16_le(s, map.ncolours); in_uint8s(s, 2); /* pad */ - in_uint8p(s, colours, (map.ncolours * 3)); - map.colours = (COLOURENTRY *) colours; + + map.colours = xmalloc(3 * map.ncolours); + + DEBUG(("PALETTE(c=%d)\n", map.ncolours)); + + for (i = 0; i < map.ncolours; i++) + { + entry = &map.colours[i]; + in_uint8(s, entry->red); + in_uint8(s, entry->green); + in_uint8(s, entry->blue); + } hmap = ui_create_colourmap(&map); ui_set_colourmap(hmap); + + xfree(map.colours); } /* Process an update PDU */ static void process_update_pdu(STREAM s) { - uint16 update_type; + uint16 update_type, count; in_uint16_le(s, update_type); switch (update_type) { case RDP_UPDATE_ORDERS: - process_orders(s); + in_uint8s(s, 2); /* pad */ + in_uint16_le(s, count); + in_uint8s(s, 2); /* pad */ + process_orders(s, count); break; case RDP_UPDATE_BITMAP: @@ -678,6 +790,7 @@ break; case RDP_DATA_PDU_LOGON: + DEBUG(("Received Logon PDU\n")); /* User logged on */ break; @@ -688,7 +801,7 @@ /* Process incoming packets */ void -rdp_main_loop() +rdp_main_loop(void) { uint8 type; STREAM s; @@ -708,6 +821,9 @@ process_data_pdu(s); break; + case 0: + break; + default: unimpl("PDU %d\n", type); } @@ -719,17 +835,16 @@ rdp_connect(char *server, uint32 flags, char *domain, char *password, char *command, char *directory) { - if (!sec_connect(server)) + if (!sec_connect(server, username)) return False; - rdp_send_logon_info(flags, domain, username, password, - command, directory); + rdp_send_logon_info(flags, domain, username, password, command, directory); return True; } /* Disconnect from the RDP layer */ void -rdp_disconnect() +rdp_disconnect(void) { sec_disconnect(); }