X-Git-Url: https://git.sesse.net/?p=rdpsrv;a=blobdiff_plain;f=rdpsrv.c;h=c5cb1876fb397e6f608dc8fb9457ce8b8c3215b2;hp=94f20994376dfbb9b81588ed1809229189b1a9b6;hb=99f2e8c32508ab193c1d42221c86cb7fca4be9ab;hpb=f6cb05500f5c71cbb069daeb26edd5879fd17a99

diff --git a/rdpsrv.c b/rdpsrv.c
index 94f2099..c5cb187 100644
--- a/rdpsrv.c
+++ b/rdpsrv.c
@@ -140,6 +140,8 @@ void handle_input_pdu(STREAM s, int vnc_sock)
 				 mouse1_down = (device_flags & MOUSE_FLAG_DOWN) ? 0x01 : 0;
 			if (device_flags & MOUSE_FLAG_BUTTON2)
 				 mouse2_down = (device_flags & MOUSE_FLAG_DOWN) ? 0x02 : 0;
+		
+			printf("button mask = %x\n", mouse1_down | mouse2_down);
 			
 			buf[0] = 5; // message type
 			buf[1] = mouse1_down | mouse2_down; // button mask
@@ -318,10 +320,11 @@ void handle_vnc_fbupdate(int vnc_sock)
 	}
 }
 
+int listen_on_vnc = 0;
+
 int serve_client()
 {
 	int vnc_sock = vnc_init();
-	int listen_on_vnc = 0;
 	
 	if (!mcs_recv_connect_initial())
 		error("MCS_CONNECT_INITIAL recv failed");
@@ -361,6 +364,8 @@ int serve_client()
 			}
 		}
 
+		printf("LISTEN_ON_VNC=%u\n", listen_on_vnc);
+		
 		// activity on VNC socket?
 		if (FD_ISSET(vnc_sock, &readfs) && listen_on_vnc) {
 			unsigned char buf[256];
@@ -387,7 +392,7 @@ int serve_client()
 					error("short read on vnc_sock\n");
 				if (read(vnc_sock, buf, 4) != 4)
 					error("short read on vnc_sock\n");
-				if (read(vnc_sock, (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3], 4) != 4)
+				if (read(vnc_sock, buf, (buf[0] << 24) | (buf[1] << 16) | (buf[2] << 8) | buf[3]) != 4)
 					error("short read on vnc_sock\n");
 				
 			default: