--- sourceforge.net/trunk/rdesktop/rdp.c 2000/10/16 08:44:48 21 +++ sourceforge.net/trunk/rdesktop/rdp.c 2001/09/14 13:51:38 30 @@ -1,7 +1,7 @@ /* rdesktop: A Remote Desktop Protocol client. Protocol services - RDP layer - Copyright (C) Matthew Chapman 1999-2000 + Copyright (C) Matthew Chapman 1999-2001 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 @@ -22,24 +22,29 @@ extern uint16 mcs_userid; extern char username[16]; +extern BOOL bitmap_compression; extern BOOL orders; +extern BOOL encryption; +extern BOOL desktop_save; -unsigned char *next_packet; +uint8 *next_packet; uint32 rdp_shareid; /* Initialise an RDP packet */ -static STREAM rdp_init(int maxlen) +static STREAM +rdp_init(int maxlen) { STREAM s; - s = sec_init(SEC_ENCRYPT, maxlen + 6); + 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) +static void +rdp_send(STREAM s, uint8 pdu_type) { uint16 length; @@ -47,14 +52,15 @@ length = s->end - s->p; out_uint16_le(s, length); - out_uint16_le(s, (pdu_type | 0x10)); /* Version 1 */ + out_uint16_le(s, (pdu_type | 0x10)); /* Version 1 */ out_uint16_le(s, (mcs_userid + 1001)); - sec_send(s, SEC_ENCRYPT); + sec_send(s, encryption ? SEC_ENCRYPT : 0); } /* Receive an RDP packet */ -static STREAM rdp_recv(uint8 *type) +static STREAM +rdp_recv(uint8 *type) { static STREAM rdp_s; uint16 length, pdu_type; @@ -74,32 +80,33 @@ in_uint16_le(rdp_s, length); in_uint16_le(rdp_s, pdu_type); - in_uint8s(rdp_s, 2); /* userid */ - - next_packet += length; + in_uint8s(rdp_s, 2); /* userid */ *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 (type %x):\n", *type)); + hexdump(next_packet, length); +#endif /* */ + next_packet += length; return rdp_s; } /* Initialise an RDP data packet */ -static STREAM rdp_init_data(int maxlen) +static STREAM +rdp_init_data(int maxlen) { STREAM s; - s = sec_init(SEC_ENCRYPT, maxlen + 18); + s = sec_init(encryption ? SEC_ENCRYPT : 0, maxlen + 18); s_push_layer(s, rdp_hdr, 18); return s; } /* Send an RDP data packet */ -static void rdp_send_data(STREAM s, uint8 data_pdu_type) +static void +rdp_send_data(STREAM s, uint8 data_pdu_type) { uint16 length; @@ -111,18 +118,19 @@ out_uint16_le(s, (mcs_userid + 1001)); out_uint32_le(s, rdp_shareid); - out_uint8(s, 0); /* pad */ - out_uint8(s, 1); /* streamid */ + out_uint8(s, 0); /* pad */ + out_uint8(s, 1); /* streamid */ out_uint16(s, (length - 14)); out_uint8(s, data_pdu_type); - out_uint8(s, 0); /* compress_type */ - out_uint16(s, 0); /* compress_len */ + out_uint8(s, 0); /* compress_type */ + out_uint16(s, 0); /* compress_len */ - sec_send(s, SEC_ENCRYPT); + sec_send(s, encryption ? SEC_ENCRYPT : 0); } /* Output a string in Unicode */ -void rdp_out_unistr(STREAM s, char *string, int len) +void +rdp_out_unistr(STREAM s, char *string, int len) { int i = 0, j = 0; @@ -138,19 +146,21 @@ } /* Parse a logon info packet */ -static void rdp_send_logon_info(uint32 flags, char *domain, char *user, - char *password, char *program, char *directory) -{ - int len_domain = 2 * strlen(domain); - int len_user = 2 * strlen(user); - int len_password = 2 * strlen(password); - int len_program = 2 * strlen(program); +static void +rdp_send_logon_info(uint32 flags, char *domain, char *user, + char *password, char *program, char *directory) +{ + 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); - uint32 sec_flags = SEC_LOGON_INFO | SEC_ENCRYPT; + 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); + + len_program + len_directory + 10); out_uint32(s, 0); out_uint32_le(s, flags); @@ -159,10 +169,10 @@ 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, 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_mark_end(s); @@ -170,28 +180,30 @@ } /* Send a control PDU */ -static void rdp_send_control(uint16 action) +static void +rdp_send_control(uint16 action) { STREAM s; s = rdp_init_data(8); out_uint16_le(s, action); - out_uint16(s, 0); /* userid */ - out_uint32(s, 0); /* control id */ + out_uint16(s, 0); /* userid */ + out_uint32(s, 0); /* control id */ s_mark_end(s); rdp_send_data(s, RDP_DATA_PDU_CONTROL); } /* Send a synchronisation PDU */ -static void rdp_send_synchronise() +static void +rdp_send_synchronise() { STREAM s; s = rdp_init_data(4); - out_uint16_le(s, 1); /* type */ + out_uint16_le(s, 1); /* type */ out_uint16_le(s, 1002); s_mark_end(s); @@ -199,15 +211,16 @@ } /* Send a single input event */ -void rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, - uint16 param1, uint16 param2) +void +rdp_send_input(uint32 time, uint16 message_type, uint16 device_flags, + uint16 param1, uint16 param2) { STREAM s; s = rdp_init_data(16); - out_uint16_le(s, 1); /* number of events */ - out_uint16(s, 0); /* pad */ + out_uint16_le(s, 1); /* number of events */ + out_uint16(s, 0); /* pad */ out_uint32_le(s, time); out_uint16_le(s, message_type); @@ -220,7 +233,8 @@ } /* Send an (empty) font information PDU */ -static void rdp_send_fonts(uint16 seq) +static void +rdp_send_fonts(uint16 seq) { STREAM s; @@ -236,14 +250,15 @@ } /* Output general capability set */ -static void rdp_out_general_caps(STREAM s) +static void +rdp_out_general_caps(STREAM s) { out_uint16_le(s, RDP_CAPSET_GENERAL); out_uint16_le(s, RDP_CAPLEN_GENERAL); out_uint16_le(s, 1); /* OS major type */ out_uint16_le(s, 3); /* OS minor type */ - out_uint16_le(s, 0x200); /* Protocol version */ + out_uint16_le(s, 0x200); /* Protocol version */ out_uint16(s, 0); /* Pad */ out_uint16(s, 0); /* Compression types */ out_uint16(s, 0); /* Pad */ @@ -254,7 +269,8 @@ } /* Output bitmap capability set */ -static void rdp_out_bitmap_caps(STREAM s) +static void +rdp_out_bitmap_caps(STREAM s) { out_uint16_le(s, RDP_CAPSET_BITMAP); out_uint16_le(s, RDP_CAPLEN_BITMAP); @@ -267,19 +283,31 @@ 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, bitmap_compression ? 1 : 0); /* Support compression */ out_uint16(s, 0); /* Unknown */ out_uint16_le(s, 1); /* Unknown */ out_uint16(s, 0); /* Pad */ } /* Output order capability set */ -static void rdp_out_order_caps(STREAM s) +static void +rdp_out_order_caps(STREAM s) { 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[8] = 1; /* line */ + order_caps[9] = 1; /* line */ + order_caps[10] = 1; /* rect */ + order_caps[11] = (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); @@ -289,32 +317,34 @@ out_uint16(s, 0); /* Pad */ out_uint16_le(s, 1); /* Max order level */ out_uint16_le(s, 0x147); /* Number of fonts */ - out_uint16_le(s, 0x2a); /* Capability flags */ + out_uint16_le(s, 0x2a); /* Capability flags */ 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(s, desktop_save == False ? 0 : 0x38400); /* Desktop cache size */ out_uint32(s, 0); /* Unknown */ out_uint32(s, 0x4e4); /* Unknown */ } /* Output bitmap cache capability set */ -static void rdp_out_bmpcache_caps(STREAM s) +static void +rdp_out_bmpcache_caps(STREAM s) { out_uint16_le(s, RDP_CAPSET_BMPCACHE); out_uint16_le(s, RDP_CAPLEN_BMPCACHE); - out_uint8s(s, 24); /* unused */ - out_uint16_le(s, 0x258); /* entries */ - out_uint16_le(s, 0x100); /* max cell size */ - out_uint16_le(s, 0x12c); /* entries */ - out_uint16_le(s, 0x400); /* max cell size */ - out_uint16_le(s, 0x106); /* entries */ - out_uint16_le(s, 0x1000); /* max cell size */ + out_uint8s(s, 24); /* unused */ + out_uint16_le(s, 0x258); /* entries */ + out_uint16_le(s, 0x100); /* max cell size */ + out_uint16_le(s, 0x12c); /* entries */ + out_uint16_le(s, 0x400); /* max cell size */ + out_uint16_le(s, 0x106); /* entries */ + out_uint16_le(s, 0x1000); /* max cell size */ } /* Output control capability set */ -static void rdp_out_control_caps(STREAM s) +static void +rdp_out_control_caps(STREAM s) { out_uint16_le(s, RDP_CAPSET_CONTROL); out_uint16_le(s, RDP_CAPLEN_CONTROL); @@ -326,7 +356,8 @@ } /* Output activation capability set */ -static void rdp_out_activate_caps(STREAM s) +static void +rdp_out_activate_caps(STREAM s) { out_uint16_le(s, RDP_CAPSET_ACTIVATE); out_uint16_le(s, RDP_CAPLEN_ACTIVATE); @@ -338,7 +369,8 @@ } /* Output pointer capability set */ -static void rdp_out_pointer_caps(STREAM s) +static void +rdp_out_pointer_caps(STREAM s) { out_uint16_le(s, RDP_CAPSET_POINTER); out_uint16_le(s, RDP_CAPLEN_POINTER); @@ -348,7 +380,8 @@ } /* Output share capability set */ -static void rdp_out_share_caps(STREAM s) +static void +rdp_out_share_caps(STREAM s) { out_uint16_le(s, RDP_CAPSET_SHARE); out_uint16_le(s, RDP_CAPLEN_SHARE); @@ -358,7 +391,8 @@ } /* Output colour cache capability set */ -static void rdp_out_colcache_caps(STREAM s) +static void +rdp_out_colcache_caps(STREAM s) { out_uint16_le(s, RDP_CAPSET_COLCACHE); out_uint16_le(s, RDP_CAPLEN_COLCACHE); @@ -368,46 +402,59 @@ } static uint8 canned_caps[] = { -0x01,0x00,0x00,0x00,0x09,0x04,0x00,0x00,0x04, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00, -0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x0C,0x00,0x08,0x00,0x01, -0x00,0x00,0x00,0x0E,0x00,0x08,0x00,0x01,0x00,0x00,0x00,0x10,0x00,0x34,0x00,0xFE, -0x00,0x04,0x00,0xFE,0x00,0x04,0x00,0xFE,0x00,0x08,0x00,0xFE,0x00,0x08,0x00,0xFE, -0x00,0x10,0x00,0xFE,0x00,0x20,0x00,0xFE,0x00,0x40,0x00,0xFE,0x00,0x80,0x00,0xFE, -0x00,0x00,0x01,0x40,0x00,0x00,0x08,0x00,0x01,0x00,0x01,0x02,0x00,0x00,0x00 + 0x01, 0x00, 0x00, 0x00, 0x09, 0x04, 0x00, 0x00, 0x04, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x0C, 0x00, 0x08, 0x00, 0x01, + 0x00, 0x00, 0x00, 0x0E, 0x00, 0x08, 0x00, 0x01, 0x00, 0x00, 0x00, + 0x10, 0x00, 0x34, 0x00, 0xFE, + 0x00, 0x04, 0x00, 0xFE, 0x00, 0x04, 0x00, 0xFE, 0x00, 0x08, 0x00, + 0xFE, 0x00, 0x08, 0x00, 0xFE, + 0x00, 0x10, 0x00, 0xFE, 0x00, 0x20, 0x00, 0xFE, 0x00, 0x40, 0x00, + 0xFE, 0x00, 0x80, 0x00, 0xFE, + 0x00, 0x00, 0x01, 0x40, 0x00, 0x00, 0x08, 0x00, 0x01, 0x00, 0x01, + 0x02, 0x00, 0x00, 0x00 }; /* Output unknown capability set */ -static void rdp_out_unknown_caps(STREAM s) +static void +rdp_out_unknown_caps(STREAM s) { out_uint16_le(s, RDP_CAPSET_UNKNOWN); out_uint16_le(s, 0x58); - - out_uint8p(s, canned_caps, RDP_CAPLEN_UNKNOWN-4); + + out_uint8p(s, canned_caps, RDP_CAPLEN_UNKNOWN - 4); } /* Send a confirm active PDU */ -static void rdp_send_confirm_active() +static void +rdp_send_confirm_active() { STREAM s; - 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; + 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? */; s = rdp_init(14 + caplen + sizeof(RDP_SOURCE)); out_uint32_le(s, rdp_shareid); - out_uint16_le(s, 0x3ea); /* userid */ + out_uint16_le(s, 0x3ea); /* userid */ out_uint16_le(s, sizeof(RDP_SOURCE)); out_uint16_le(s, caplen); out_uint8p(s, RDP_SOURCE, sizeof(RDP_SOURCE)); - out_uint16_le(s, 0xd); /* num_caps */ - out_uint8s(s, 2); /* pad */ + out_uint16_le(s, 0xd); /* num_caps */ + out_uint8s(s, 2); /* pad */ rdp_out_general_caps(s); rdp_out_bitmap_caps(s); @@ -425,36 +472,40 @@ } /* Respond to a demand active PDU */ -static void process_demand_active(STREAM s) +static void +process_demand_active(STREAM s) { uint8 type; in_uint32_le(s, rdp_shareid); - DEBUG("DEMAND_ACTIVE(id=0x%x)\n", rdp_shareid); + DEBUG(("DEMAND_ACTIVE(id=0x%x)\n", 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 pointer PDU */ -static void process_pointer_pdu(STREAM s) +static void +process_pointer_pdu(STREAM s) { uint16 message_type; - uint16 x, y; + uint16 x, y, width, height, cache_idx, masklen, datalen; + uint8 *mask, *data; + HCURSOR cursor; in_uint16_le(s, message_type); - in_uint8s(s, 2); /* pad */ + in_uint8s(s, 2); /* pad */ switch (message_type) { @@ -465,18 +516,40 @@ ui_move_pointer(x, y); 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); + break; + + case RDP_POINTER_CACHED: + in_uint16_le(s, cache_idx); + ui_set_cursor(cache_get_cursor(cache_idx)); + break; + default: - DEBUG("Pointer message 0x%x\n", message_type); + DEBUG(("Pointer message 0x%x\n", message_type)); } } /* Process bitmap updates */ -static void process_bitmap_updates(STREAM s) +static 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; + uint8 *data, *bmpdata; int i; in_uint16_le(s, num_updates); @@ -496,49 +569,62 @@ 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(("UPDATE(l=%d,t=%d,r=%d,b=%d,w=%d,h=%d,cmp=%d)\n", + left, top, right, bottom, width, height, compress)); if (!compress) { - in_uint8p(s, data, bufsize); - ui_paint_bitmap(left, top, cx, cy, width, height, data); - return; + int y; + bmpdata = xmalloc(width * height); + for (y = 0; y < height; y++) + { + in_uint8a(s, + &bmpdata[(height - y - 1) * width], + width); + } + ui_paint_bitmap(left, top, cx, cy, width, height, + bmpdata); + xfree(bmpdata); + continue; } - in_uint8s(s, 2); /* pad */ + in_uint8s(s, 2); /* pad */ in_uint16_le(s, size); - in_uint8s(s, 4); /* line_size, final_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)) + bmpdata = xmalloc(width * height); + if (bitmap_decompress(bmpdata, width, height, data, size)) { ui_paint_bitmap(left, top, cx, cy, width, height, - rawdata); + bmpdata); } - xfree(rawdata); + xfree(bmpdata); } } /* Process a palette update */ -static void process_palette(STREAM s) +static void +process_palette(STREAM s) { HCOLOURMAP hmap; COLOURMAP map; + uint8 *colours; - 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)); + 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; hmap = ui_create_colourmap(&map); ui_set_colourmap(hmap); } /* Process an update PDU */ -static void process_update_pdu(STREAM s) +static void +process_update_pdu(STREAM s) { uint16 update_type; @@ -562,19 +648,20 @@ break; default: - NOTIMP("update %d\n", update_type); + unimpl("update %d\n", update_type); } } /* Process data PDU */ -static void process_data_pdu(STREAM s) +static void +process_data_pdu(STREAM s) { uint8 data_pdu_type; - in_uint8s(s, 8); /* shareid, pad, streamid, length */ + in_uint8s(s, 8); /* shareid, pad, streamid, length */ in_uint8(s, data_pdu_type); - in_uint8s(s, 3); /* compress_type, compress_len */ + in_uint8s(s, 3); /* compress_type, compress_len */ switch (data_pdu_type) { @@ -595,12 +682,13 @@ 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() +void +rdp_main_loop() { uint8 type; STREAM s; @@ -621,26 +709,27 @@ break; default: - NOTIMP("PDU %d\n", type); + unimpl("PDU %d\n", type); } } } /* Establish a connection up to the RDP layer */ -BOOL rdp_connect(char *server, uint32 flags, char *domain, char *password, - char *command, char *directory) +BOOL +rdp_connect(char *server, uint32 flags, char *domain, char *password, + char *command, char *directory) { if (!sec_connect(server)) return False; rdp_send_logon_info(flags, domain, username, password, - command, directory); + command, directory); return True; } /* Disconnect from the RDP layer */ -void rdp_disconnect() +void +rdp_disconnect() { sec_disconnect(); } -