--- sourceforge.net/trunk/rdesktop/rdp.c 2003/10/22 10:55:11 508 +++ sourceforge.net/trunk/rdesktop/rdp.c 2004/06/15 22:45:12 711 @@ -18,6 +18,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include #include "rdesktop.h" extern uint16 g_mcs_userid; @@ -28,11 +29,17 @@ extern BOOL g_desktop_save; extern BOOL g_use_rdp5; extern uint16 g_server_rdp_version; +extern uint32 g_rdp5_performanceflags; extern int g_server_bpp; +extern int g_width; +extern int g_height; +extern BOOL g_bitmap_cache; uint8 *g_next_packet; uint32 g_rdp_shareid; +extern RDPCOMP g_mppc_dict; + #if WITH_DEBUG static uint32 g_packetno; #endif @@ -71,7 +78,7 @@ #if WITH_DEBUG DEBUG(("RDP packet #%d, (type %x)\n", ++g_packetno, *type)); - // hexdump(g_next_packet, length); + hexdump(g_next_packet, length); #endif /* */ g_next_packet += length; @@ -131,21 +138,49 @@ s->p += len; } +/* Input a string in Unicode + * + * Returns str_len of string + */ +int +rdp_in_unistr(STREAM s, char *string, int uni_len) +{ + int i = 0; + + while (i < uni_len / 2) + { + in_uint8a(s, &string[i++], 1); + in_uint8s(s, 1); + } + + return i - 1; +} + + /* Parse a logon info packet */ static void rdp_send_logon_info(uint32 flags, char *domain, char *user, char *password, char *program, char *directory) { + char *ipaddr = tcp_get_address(); int len_domain = 2 * strlen(domain); int len_user = 2 * strlen(user); int len_password = 2 * strlen(password); int len_program = 2 * strlen(program); int len_directory = 2 * strlen(directory); - int len_ip = 2 * strlen("127.0.0.1"); + int len_ip = 2 * strlen(ipaddr); int len_dll = 2 * strlen("C:\\WINNT\\System32\\mstscax.dll"); int packetlen = 0; uint32 sec_flags = g_encryption ? (SEC_LOGON_INFO | SEC_ENCRYPT) : SEC_LOGON_INFO; STREAM s; + time_t t = time(NULL); + time_t tzone; + +#if 0 + /* enable rdp compression */ + /* some problems still exist with rdp5 */ + flags |= RDP_COMPRESSION; +#endif if (!g_use_rdp5 || 1 == g_server_rdp_version) { @@ -169,35 +204,36 @@ } else { + flags |= RDP_LOGON_BLOB; DEBUG_RDP5(("Sending RDP5-style Logon packet\n")); - packetlen = 4 + // Unknown uint32 - 4 + // flags - 2 + // len_domain - 2 + // len_user - (flags & RDP_LOGON_AUTO ? 2 : 0) + // len_password - (flags & RDP_LOGON_BLOB ? 2 : 0) + // Length of BLOB - 2 + // len_program - 2 + // len_directory - (0 < len_domain ? len_domain : 2) + // domain - len_user + (flags & RDP_LOGON_AUTO ? len_password : 0) + 0 + // We have no 512 byte BLOB. Perhaps we must? - (flags & RDP_LOGON_BLOB && !(flags & RDP_LOGON_AUTO) ? 2 : 0) + // After the BLOB is a unknown int16. If there is a BLOB, that is. - (0 < len_program ? len_program : 2) + (0 < len_directory ? len_directory : 2) + 2 + // Unknown (2) - 2 + // Client ip length - len_ip + // Client ip - 2 + // DLL string length - len_dll + // DLL string - 2 + // Unknown - 2 + // Unknown - 64 + // Time zone #0 - 2 + // Unknown - 64 + // Time zone #1 - 32; // Unknown + packetlen = 4 + /* Unknown uint32 */ + 4 + /* flags */ + 2 + /* len_domain */ + 2 + /* len_user */ + (flags & RDP_LOGON_AUTO ? 2 : 0) + /* len_password */ + (flags & RDP_LOGON_BLOB ? 2 : 0) + /* Length of BLOB */ + 2 + /* len_program */ + 2 + /* len_directory */ + (0 < len_domain ? len_domain : 2) + /* domain */ + len_user + (flags & RDP_LOGON_AUTO ? len_password : 0) + 0 + /* We have no 512 byte BLOB. Perhaps we must? */ + (flags & RDP_LOGON_BLOB && !(flags & RDP_LOGON_AUTO) ? 2 : 0) + /* After the BLOB is a unknown int16. If there is a BLOB, that is. */ + (0 < len_program ? len_program : 2) + (0 < len_directory ? len_directory : 2) + 2 + /* Unknown (2) */ + 2 + /* Client ip length */ + len_ip + /* Client ip */ + 2 + /* DLL string length */ + len_dll + /* DLL string */ + 2 + /* Unknown */ + 2 + /* Unknown */ + 64 + /* Time zone #0 */ + 2 + /* Unknown */ + 64 + /* Time zone #1 */ + 32; /* Unknown */ s = sec_init(sec_flags, packetlen); DEBUG_RDP5(("Called sec_init with packetlen %d\n", packetlen)); - out_uint32(s, 0); // Unknown + out_uint32(s, 0); /* Unknown */ out_uint32_le(s, flags); out_uint16_le(s, len_domain); out_uint16_le(s, len_user); @@ -243,16 +279,17 @@ out_uint16_le(s, 0); } out_uint16_le(s, 2); - out_uint16_le(s, len_ip + 2); // Length of client ip - rdp_out_unistr(s, "127.0.0.1", len_ip); + out_uint16_le(s, len_ip + 2); /* Length of client ip */ + rdp_out_unistr(s, ipaddr, len_ip); out_uint16_le(s, len_dll + 2); rdp_out_unistr(s, "C:\\WINNT\\System32\\mstscax.dll", len_dll); - out_uint16_le(s, 0xffc4); - out_uint16_le(s, 0xffff); + + tzone = (mktime(gmtime(&t)) - mktime(localtime(&t))) / 60; + out_uint32_le(s, tzone); + rdp_out_unistr(s, "GTB, normaltid", 2 * strlen("GTB, normaltid")); out_uint8s(s, 62 - 2 * strlen("GTB, normaltid")); - out_uint32_le(s, 0x0a0000); out_uint32_le(s, 0x050000); out_uint32_le(s, 3); @@ -268,7 +305,7 @@ out_uint32(s, 0); out_uint32_le(s, 0xffffffc4); out_uint32_le(s, 0xfffffffe); - out_uint32_le(s, 0x0f); + out_uint32_le(s, g_rdp5_performanceflags); out_uint32(s, 0); @@ -338,7 +375,7 @@ s = rdp_init_data(8); out_uint16(s, 0); /* number of fonts */ - out_uint16_le(s, 0x3e); /* unknown */ + out_uint16_le(s, 0); /* pad? */ out_uint16_le(s, seq); /* unknown */ out_uint16_le(s, 0x32); /* entry size */ @@ -379,14 +416,14 @@ out_uint16_le(s, RDP_CAPSET_BITMAP); out_uint16_le(s, RDP_CAPLEN_BITMAP); - out_uint16_le(s, 8); /* Preferred BPP */ + out_uint16_le(s, g_server_bpp); /* Preferred 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 */ out_uint16(s, 0); /* Pad */ - out_uint16(s, 0); /* Allow resize */ + out_uint16(s, 1); /* Allow resize */ out_uint16_le(s, g_bitmap_compression ? 1 : 0); /* Support compression */ out_uint16(s, 0); /* Unknown */ out_uint16_le(s, 1); /* Unknown */ @@ -404,7 +441,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[3] = (g_bitmap_cache ? 1 : 0); /* memblt */ order_caps[8] = 1; /* line */ order_caps[9] = 1; /* line */ order_caps[10] = 1; /* rect */ @@ -583,15 +620,90 @@ sec_send(s, sec_flags); } +/* Process a general capability set */ +static void +rdp_process_general_caps(STREAM s) +{ + uint16 pad2octetsB; /* rdp5 flags? */ + + in_uint8s(s, 10); + in_uint16_le(s, pad2octetsB); + + if (!pad2octetsB) + g_use_rdp5 = False; +} + +/* Process a bitmap capability set */ +static void +rdp_process_bitmap_caps(STREAM s) +{ + uint16 width, height, bpp; + + in_uint16_le(s, bpp); + in_uint8s(s, 6); + + in_uint16_le(s, width); + in_uint16_le(s, height); + + DEBUG(("setting desktop size and bpp to: %dx%dx%d\n", width, height, bpp)); + + /* + * The server may limit bpp and change the size of the desktop (for + * example when shadowing another session). + */ + if (g_server_bpp != bpp) + { + warning("colour depth changed from %d to %d\n", g_server_bpp, bpp); + g_server_bpp = bpp; + } + if (g_width != width || g_height != height) + { + warning("screen size changed from %dx%d to %dx%d\n", g_width, g_height, + width, height); + g_width = width; + g_height = height; + ui_resize_window(); + } +} + /* Respond to a demand active PDU */ static void process_demand_active(STREAM s) { - uint8 type; + int n; + uint8 type, *next; + uint16 len_src_descriptor, len_combined_caps, num_capsets, capset_type, capset_length; in_uint32_le(s, g_rdp_shareid); + in_uint16_le(s, len_src_descriptor); + in_uint16_le(s, len_combined_caps); + in_uint8s(s, len_src_descriptor); + + in_uint16_le(s, num_capsets); + in_uint8s(s, 2); /* pad */ + + DEBUG(("DEMAND_ACTIVE(id=0x%x,num_caps=%d)\n", g_rdp_shareid, num_capsets)); + + for (n = 0; n < num_capsets; n++) + { + in_uint16_le(s, capset_type); + in_uint16_le(s, capset_length); - DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", g_rdp_shareid)); + next = s->p + capset_length - 4; + + switch (capset_type) + { + case RDP_CAPSET_GENERAL: + rdp_process_general_caps(s); + break; + + case RDP_CAPSET_BITMAP: + rdp_process_bitmap_caps(s); + break; + } + + s->p = next; + } rdp_send_confirm_active(); rdp_send_synchronise(); @@ -600,10 +712,19 @@ rdp_recv(&type); /* RDP_PDU_SYNCHRONIZE */ rdp_recv(&type); /* RDP_CTL_COOPERATE */ rdp_recv(&type); /* RDP_CTL_GRANT_CONTROL */ - rdp_send_input(0, RDP_INPUT_SYNCHRONIZE, 0, 0, 0); - rdp_send_fonts(1); - rdp_send_fonts(2); - rdp_recv(&type); /* RDP_PDU_UNKNOWN 0x28 */ + rdp_send_input(0, RDP_INPUT_SYNCHRONIZE, 0, ui_get_numlock_state(read_keyboard_state()), 0); + + if (g_use_rdp5) + { + rdp_send_fonts(3); + } + else + { + rdp_send_fonts(1); + rdp_send_fonts(2); + } + + rdp_recv(&type); /* RDP_PDU_UNKNOWN 0x28 (Fonts?) */ reset_order_state(); } @@ -829,15 +950,55 @@ } +/* Process a disconnect PDU */ +void +process_disconnect_pdu(STREAM s, uint32 * ext_disc_reason) +{ + in_uint32_le(s, *ext_disc_reason); + + DEBUG(("Received disconnect PDU\n")); +} + /* Process data PDU */ -static void -process_data_pdu(STREAM s) +static BOOL +process_data_pdu(STREAM s, uint32 * ext_disc_reason) { uint8 data_pdu_type; + uint8 ctype; + uint16 clen; + uint32 len; - in_uint8s(s, 8); /* shareid, pad, streamid, length */ + uint32 roff, rlen; + + struct stream *ns = &(g_mppc_dict.ns); + + in_uint8s(s, 6); /* shareid, pad, streamid */ + in_uint16(s, len); in_uint8(s, data_pdu_type); - in_uint8s(s, 3); /* compress_type, compress_len */ + in_uint8(s, ctype); + in_uint16(s, clen); + clen -= 18; + + if (ctype & RDP_MPPC_COMPRESSED) + { + + if (mppc_expand(s->p, clen, ctype, &roff, &rlen) == -1) + error("error while decompressing packet\n"); + + //len -= 18; + + /* allocate memory and copy the uncompressed data into the temporary stream */ + ns->data = (uint8 *) xrealloc(ns->data, rlen); + + memcpy((ns->data), (unsigned char *) (g_mppc_dict.hist + roff), rlen); + + ns->size = rlen; + ns->end = (ns->data + ns->size); + ns->p = ns->data; + ns->rdp_hdr = ns->p; + + s = ns; + } switch (data_pdu_type) { @@ -845,6 +1006,14 @@ process_update_pdu(s); break; + case RDP_DATA_PDU_CONTROL: + DEBUG(("Received Control PDU\n")); + break; + + case RDP_DATA_PDU_SYNCHRONISE: + DEBUG(("Received Sync PDU\n")); + break; + case RDP_DATA_PDU_POINTER: process_pointer_pdu(s); break; @@ -858,16 +1027,22 @@ /* User logged on */ break; + case RDP_DATA_PDU_DISCONNECT: + process_disconnect_pdu(s, ext_disc_reason); + return True; + default: unimpl("data PDU %d\n", data_pdu_type); } + return False; } /* Process incoming packets */ -BOOL -rdp_main_loop(void) +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) @@ -876,20 +1051,16 @@ { case RDP_PDU_DEMAND_ACTIVE: process_demand_active(s); + *deactivated = False; break; case RDP_PDU_DEACTIVATE: DEBUG(("RDP_PDU_DEACTIVATE\n")); - /* We thought we could detect a clean - shutdown of the session by this - packet, but it seems Windows 2003 - is sending us one of these when we - reconnect to a disconnected session - return True; */ + *deactivated = True; break; case RDP_PDU_DATA: - process_data_pdu(s); + disc = process_data_pdu(s, ext_disc_reason); break; case 0: @@ -898,11 +1069,13 @@ default: unimpl("PDU %d\n", type); } + + if (disc) + { + return; + } } - return True; - /* We want to detect if we got a clean shutdown, but we - can't. Se above. - return False; */ + return; } /* Establish a connection up to the RDP layer */