--- sourceforge.net/trunk/rdesktop/rdp.c 2004/02/14 19:30:01 604 +++ sourceforge.net/trunk/rdesktop/rdp.c 2004/04/26 13:48:39 677 @@ -29,7 +29,10 @@ 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; uint8 *g_next_packet; uint32 g_rdp_shareid; @@ -156,12 +159,13 @@ 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; @@ -169,6 +173,11 @@ time_t t = time(NULL); time_t tzone; +#if 0 + // enable rdp compression + flags |= RDP_COMPRESSION; +#endif + if (!g_use_rdp5 || 1 == g_server_rdp_version) { DEBUG_RDP5(("Sending RDP4-style Logon packet\n")); @@ -266,7 +275,7 @@ } 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); + 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); @@ -276,7 +285,6 @@ 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); @@ -292,7 +300,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); @@ -362,7 +370,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 */ @@ -403,14 +411,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 */ @@ -607,15 +615,82 @@ 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). + */ + g_server_bpp = bpp; + 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); + + next = s->p + capset_length - 4; - DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", g_rdp_shareid)); + 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(); @@ -625,9 +700,18 @@ rdp_recv(&type); /* RDP_CTL_COOPERATE */ rdp_recv(&type); /* RDP_CTL_GRANT_CONTROL */ rdp_send_input(0, RDP_INPUT_SYNCHRONIZE, 0, ui_get_numlock_state(read_keyboard_state()), 0); - rdp_send_fonts(1); - rdp_send_fonts(2); - rdp_recv(&type); /* RDP_PDU_UNKNOWN 0x28 */ + + 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(); } @@ -748,13 +832,6 @@ 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)); - /* Server may limit bpp - this is how we find out */ - if (g_server_bpp != bpp) - { - warning("Server limited colour depth to %d bits\n", bpp); - g_server_bpp = bpp; - } - if (!compress) { int y; @@ -860,15 +937,61 @@ } +/* 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; + int len; +#if 0 + int roff, rlen, ret; + static struct stream ns; + static signed char *dict = 0; +#endif - in_uint8s(s, 8); /* shareid, pad, streamid, length */ + 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 0 + if (ctype & 0x20) + { + if (!dict) + { + dict = (signed char *) malloc(8200 * sizeof(signed char)); + dict = (signed char *) memset(dict, 0, 8200 * sizeof(signed char)); + } + + ret = decompress(s->p, clen, ctype, (signed char *) dict, &roff, &rlen); + + len -= 18; + + ns.data = xrealloc(ns.data, len); + + ns.data = (unsigned char *) memcpy(ns.data, (unsigned char *) (dict + roff), len); + + ns.size = len; + ns.end = ns.data + ns.size; + ns.p = ns.data; + ns.rdp_hdr = ns.p; + + s = &ns; + } +#endif switch (data_pdu_type) { @@ -876,6 +999,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; @@ -890,21 +1021,21 @@ break; case RDP_DATA_PDU_DISCONNECT: - /* Normally received when user logs out or disconnects from a - console session on Windows XP and 2003 Server */ - DEBUG(("Received disconnect PDU\n")); - break; + 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) @@ -913,20 +1044,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: @@ -935,11 +1062,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 */