X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=rdp.c;h=49ff6a9722394fee3cb0f3cc3a7fe1787dd26a54;hb=2b90e41918be23158e9d56c60b9736ccf107ba52;hp=e0ce66af31662f88b529c6a514980997082b6ce9;hpb=d7f4fdca92c39405a79d71d3910ff114e0a692f0;p=rdpsrv

diff --git a/rdp.c b/rdp.c
index e0ce66a..49ff6a9 100644
--- a/rdp.c
+++ b/rdp.c
@@ -72,7 +72,7 @@ rdp_recv(uint8 * type)
 
 #if WITH_DEBUG
 	DEBUG(("RDP packet #%d, (type %x, length %u)\n", ++g_packetno, *type, length));
-	//hexdump(g_next_packet, length);
+	hexdump(g_next_packet, length);
 #endif /*  */
 
 	g_next_packet += length;
@@ -152,14 +152,9 @@ void rdp_send_bitmap_update(unsigned x, unsigned y, unsigned width, unsigned hei
 {
 	STREAM s;
 
-	int length = 10*2 + width*height*3 + 8;
+	int length = 10*2 + width*height*3 + 5;
 
-	printf("RDP5 chunk length: %u\n", 10*2 + width*height*3 + 2);
-	
-	s = tcp_init(length);
-	out_uint8(s, 0); // version (RDP5)
-	out_uint8(s, 0x80 | (length >> 8));
-	out_uint8(s, length & 0xff);
+	s = rdp5_init(length, 1);
 
 	out_uint8(s, 1); // process bitmap update
 	out_uint16_le(s, 10*2 + width*height*3 + 2); // RDP5 chunk length
@@ -179,7 +174,7 @@ void rdp_send_bitmap_update(unsigned x, unsigned y, unsigned width, unsigned hei
 	out_uint8p(s, data, width*height*3);
 	
 	s_mark_end(s);
-	tcp_send(s);
+	rdp5_send(s, 1);
 }
 
 #define EXPECT16(value) { in_uint16_le(s, unknown); if (unknown != (value)) printf("Unknown value on code line %u; expected 0x%x, got 0x%x\n", __LINE__, (value), unknown); }
@@ -292,7 +287,7 @@ rdp_get_logon_info(STREAM s)
 }
 
 /* Send a control PDU */
-static void
+void
 rdp_send_control(uint16 action)
 {
 	STREAM s;
@@ -308,7 +303,7 @@ rdp_send_control(uint16 action)
 }
 
 /* Send a synchronisation PDU */
-static void
+void
 rdp_send_synchronise(void)
 {
 	STREAM s;