--- sourceforge.net/trunk/rdesktop/rdp.c 2001/01/06 03:47:04 25 +++ sourceforge.net/trunk/rdesktop/rdp.c 2003/10/29 14:14:46 532 @@ -1,18 +1,18 @@ -/* +/* -*- c-basic-offset: 8 -*- rdesktop: A Remote Desktop Protocol client. Protocol services - RDP layer - Copyright (C) Matthew Chapman 1999-2000 - + 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 the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - + This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - + You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. @@ -20,73 +20,61 @@ #include "rdesktop.h" -extern uint16 mcs_userid; -extern char username[16]; -extern BOOL orders; - -unsigned char *next_packet; -uint32 rdp_shareid; - -/* Initialise an RDP packet */ -static STREAM -rdp_init(int maxlen) -{ - STREAM s; - - s = sec_init(SEC_ENCRYPT, 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; +extern uint16 g_mcs_userid; +extern char g_username[16]; +extern BOOL g_bitmap_compression; +extern BOOL g_orders; +extern BOOL g_encryption; +extern BOOL g_desktop_save; +extern BOOL g_use_rdp5; +extern uint16 g_server_rdp_version; +extern int g_server_bpp; - out_uint16_le(s, length); - out_uint16_le(s, (pdu_type | 0x10)); /* Version 1 */ - out_uint16_le(s, (mcs_userid + 1001)); +uint8 *g_next_packet; +uint32 g_rdp_shareid; - sec_send(s, SEC_ENCRYPT); -} +#if WITH_DEBUG +static uint32 g_packetno; +#endif /* Receive an RDP packet */ static STREAM -rdp_recv(uint8 *type) +rdp_recv(uint8 * type) { static STREAM rdp_s; uint16 length, pdu_type; - if ((rdp_s == NULL) || (next_packet >= rdp_s->end)) + if ((rdp_s == NULL) || (g_next_packet >= rdp_s->end)) { rdp_s = sec_recv(); if (rdp_s == NULL) return NULL; - next_packet = rdp_s->p; + g_next_packet = rdp_s->p; } else { - rdp_s->p = next_packet; + rdp_s->p = g_next_packet; } in_uint16_le(rdp_s, length); + /* 32k packets are really 8, keepalive fix */ + if (length == 0x8000) + { + g_next_packet += 8; + *type = 0; + return rdp_s; + } in_uint16_le(rdp_s, pdu_type); in_uint8s(rdp_s, 2); /* userid */ - - next_packet += length; *type = pdu_type & 0xf; -#if RDP_DEBUG - DEBUG("RDP packet (type %x):\n", *type); - hexdump(rdp_s->p, length); -#endif +#if WITH_DEBUG + DEBUG(("RDP packet #%d, (type %x)\n", ++g_packetno, *type)); + hexdump(g_next_packet, length); +#endif /* */ + g_next_packet += length; return rdp_s; } @@ -96,7 +84,7 @@ { STREAM s; - s = sec_init(SEC_ENCRYPT, maxlen + 18); + s = sec_init(g_encryption ? SEC_ENCRYPT : 0, maxlen + 18); s_push_layer(s, rdp_hdr, 18); return s; @@ -113,17 +101,17 @@ out_uint16_le(s, length); out_uint16_le(s, (RDP_PDU_DATA | 0x10)); - out_uint16_le(s, (mcs_userid + 1001)); + out_uint16_le(s, (g_mcs_userid + 1001)); - out_uint32_le(s, rdp_shareid); + out_uint32_le(s, g_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 */ - sec_send(s, SEC_ENCRYPT); + sec_send(s, g_encryption ? SEC_ENCRYPT : 0); } /* Output a string in Unicode */ @@ -153,25 +141,138 @@ int len_password = 2 * strlen(password); int len_program = 2 * strlen(program); int len_directory = 2 * strlen(directory); - uint32 sec_flags = SEC_LOGON_INFO | SEC_ENCRYPT; + int len_ip = 2 * strlen("127.0.0.1"); + 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; - s = sec_init(sec_flags, 18 + len_domain + len_user + len_password - + len_program + len_directory + 10); + if (!g_use_rdp5 || 1 == g_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 + { + 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 + + s = sec_init(sec_flags, packetlen); + DEBUG_RDP5(("Called sec_init with packetlen %d\n", packetlen)); + + out_uint32(s, 0); // Unknown + 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); + + } + if (flags & RDP_LOGON_BLOB && !(flags & RDP_LOGON_AUTO)) + { + out_uint16_le(s, 0); + } + out_uint16_le(s, len_program); + out_uint16_le(s, len_directory); + if (0 < len_domain) + rdp_out_unistr(s, domain, len_domain); + else + out_uint16_le(s, 0); + rdp_out_unistr(s, user, len_user); + if (flags & RDP_LOGON_AUTO) + { + rdp_out_unistr(s, password, len_password); + } + if (flags & RDP_LOGON_BLOB && !(flags & RDP_LOGON_AUTO)) + { + out_uint16_le(s, 0); + } + if (0 < len_program) + { + rdp_out_unistr(s, program, len_program); + + } + else + { + out_uint16_le(s, 0); + } + if (0 < len_directory) + { + rdp_out_unistr(s, directory, len_directory); + } + else + { + 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_dll + 2); + rdp_out_unistr(s, "C:\\WINNT\\System32\\mstscax.dll", len_dll); + out_uint16_le(s, 0xffc4); + out_uint16_le(s, 0xffff); + 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); + out_uint32_le(s, 0); + out_uint32_le(s, 0); + + rdp_out_unistr(s, "GTB, sommartid", 2 * strlen("GTB, sommartid")); + out_uint8s(s, 62 - 2 * strlen("GTB, sommartid")); + + out_uint32_le(s, 0x30000); + 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); } @@ -194,7 +295,7 @@ /* Send a synchronisation PDU */ static void -rdp_send_synchronise() +rdp_send_synchronise(void) { STREAM s; @@ -209,8 +310,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; @@ -258,7 +358,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, g_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 */ @@ -273,14 +380,14 @@ 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 */ out_uint16(s, 0); /* Pad */ out_uint16(s, 0); /* Allow resize */ - out_uint16_le(s, 1); /* Support compression */ + out_uint16_le(s, g_bitmap_compression ? 1 : 0); /* Support compression */ out_uint16(s, 0); /* Unknown */ out_uint16_le(s, 1); /* Unknown */ out_uint16(s, 0); /* Pad */ @@ -292,8 +399,20 @@ { uint8 order_caps[32]; - memset(order_caps, orders, 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] = 1; /* required for memblt? */ + 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[13] = 1; /* memblt */ + order_caps[14] = 1; /* triblt */ + order_caps[22] = 1; /* polyline */ + order_caps[27] = 1; /* text2 */ out_uint16_le(s, RDP_CAPSET_ORDER); out_uint16_le(s, RDP_CAPLEN_ORDER); @@ -307,25 +426,27 @@ out_uint8p(s, order_caps, 32); /* Orders supported */ out_uint16_le(s, 0x6a1); /* Text capability flags */ out_uint8s(s, 6); /* Pad */ - out_uint32(s, 0x38400); /* Desktop cache size */ + out_uint32_le(s, g_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 */ static void rdp_out_bmpcache_caps(STREAM s) { + int Bpp; out_uint16_le(s, RDP_CAPSET_BMPCACHE); out_uint16_le(s, RDP_CAPLEN_BMPCACHE); + Bpp = (g_server_bpp + 7) / 8; out_uint8s(s, 24); /* unused */ out_uint16_le(s, 0x258); /* entries */ - out_uint16_le(s, 0x100); /* max cell size */ + out_uint16_le(s, 0x100 * Bpp); /* max cell size */ out_uint16_le(s, 0x12c); /* entries */ - out_uint16_le(s, 0x400); /* max cell size */ + out_uint16_le(s, 0x400 * Bpp); /* max cell size */ out_uint16_le(s, 0x106); /* entries */ - out_uint16_le(s, 0x1000); /* max cell size */ + out_uint16_le(s, 0x1000 * Bpp); /* max cell size */ } /* Output control capability set */ @@ -409,7 +530,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) { @@ -419,20 +540,26 @@ 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 = g_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; + 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_uint32_le(s, rdp_shareid); + 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, (g_mcs_userid + 1001)); + + out_uint32_le(s, g_rdp_shareid); out_uint16_le(s, 0x3ea); /* userid */ out_uint16_le(s, sizeof(RDP_SOURCE)); out_uint16_le(s, caplen); @@ -453,7 +580,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 */ @@ -462,24 +589,74 @@ { uint8 type; - in_uint32_le(s, rdp_shareid); + in_uint32_le(s, g_rdp_shareid); - DEBUG("DEMAND_ACTIVE(id=0x%x)\n", rdp_shareid); + DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", g_rdp_shareid)); rdp_send_confirm_active(); rdp_send_synchronise(); rdp_send_control(RDP_CTL_COOPERATE); rdp_send_control(RDP_CTL_REQUEST_CONTROL); - rdp_recv(&type); // RDP_PDU_SYNCHRONIZE - rdp_recv(&type); // RDP_CTL_COOPERATE - rdp_recv(&type); // RDP_CTL_GRANT_CONTROL + 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_recv(&type); /* RDP_PDU_UNKNOWN 0x28 */ reset_order_state(); } +/* 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 system pointer PDU */ +void +process_system_pointer_pdu(STREAM s) +{ + uint16 system_pointer_type; + + in_uint16(s, system_pointer_type); + switch (system_pointer_type) + { + case RDP_NULL_POINTER: + ui_set_null_cursor(); + break; + + default: + unimpl("System pointer message 0x%x\n", system_pointer_type); + } +} + /* Process a pointer PDU */ static void process_pointer_pdu(STREAM s) @@ -499,19 +676,31 @@ ui_move_pointer(x, y); break; + case RDP_POINTER_COLOR: + process_colour_pointer_pdu(s); + break; + + case RDP_POINTER_CACHED: + process_cached_pointer_pdu(s); + break; + + case RDP_POINTER_SYSTEM: + process_system_pointer_pdu(s); + break; + default: - DEBUG("Pointer message 0x%x\n", message_type); + unimpl("Pointer message 0x%x\n", message_type); } } /* 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; - uint8 *data, *rawdata; + uint16 cx, cy, bpp, Bpp, compress, bufsize, size; + uint8 *data, *bmpdata; int i; in_uint16_le(s, num_updates); @@ -525,67 +714,109 @@ 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)); + + /* 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) { - in_uint8p(s, data, bufsize); - ui_paint_bitmap(left, top, cx, cy, width, height, - data); - return; + int y; + bmpdata = (uint8 *) xmalloc(width * height * Bpp); + for (y = 0; y < height; y++) + { + in_uint8a(s, &bmpdata[(height - y - 1) * (width * Bpp)], + width * Bpp); + } + 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); - rawdata = xmalloc(width * height); - if (bitmap_decompress(rawdata, 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 = (uint8 *) xmalloc(width * height * Bpp); + if (bitmap_decompress(bmpdata, width, height, data, size, Bpp)) { - ui_paint_bitmap(left, top, cx, cy, width, height, - rawdata); + ui_paint_bitmap(left, top, cx, cy, width, height, bmpdata); + } + else + { + DEBUG_RDP5(("Failed to decompress data\n")); } - xfree(rawdata); + xfree(bmpdata); } } /* Process a palette update */ -static void +void process_palette(STREAM s) { - HCOLOURMAP hmap; + COLOURENTRY *entry; COLOURMAP map; + HCOLOURMAP hmap; + int i; in_uint8s(s, 2); /* pad */ in_uint16_le(s, map.ncolours); in_uint8s(s, 2); /* pad */ - in_uint8p(s, (uint8 *) map.colours, (map.ncolours * 3)); + + map.colours = (COLOURENTRY *) xmalloc(sizeof(COLOURENTRY) * 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: @@ -600,7 +831,7 @@ break; default: - NOTIMP("update %d\n", update_type); + unimpl("update %d\n", update_type); } } @@ -630,17 +861,24 @@ break; case RDP_DATA_PDU_LOGON: + DEBUG(("Received Logon PDU\n")); /* User logged on */ 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; + default: - NOTIMP("data PDU %d\n", data_pdu_type); + unimpl("data PDU %d\n", data_pdu_type); } } /* Process incoming packets */ -void -rdp_main_loop() +BOOL +rdp_main_loop(void) { uint8 type; STREAM s; @@ -654,16 +892,30 @@ 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; */ break; case RDP_PDU_DATA: process_data_pdu(s); break; + case 0: + break; + default: - NOTIMP("PDU %d\n", type); + unimpl("PDU %d\n", type); } } + return True; + /* We want to detect if we got a clean shutdown, but we + can't. Se above. + return False; */ } /* Establish a connection up to the RDP layer */ @@ -671,17 +923,16 @@ rdp_connect(char *server, uint32 flags, char *domain, char *password, char *command, char *directory) { - if (!sec_connect(server)) + if (!sec_connect(server, g_username)) return False; - rdp_send_logon_info(flags, domain, username, password, - command, directory); + rdp_send_logon_info(flags, domain, g_username, password, command, directory); return True; } /* Disconnect from the RDP layer */ void -rdp_disconnect() +rdp_disconnect(void) { sec_disconnect(); }