Try to send the odd 0x03 RDP5 data before bitmap updates.

[rdpsrv] / rdpsrv.c

diff --git a/rdpsrv.c b/rdpsrv.c
index 94f20994376dfbb9b81588ed1809229189b1a9b6..f8ef8f218e30af7f141e40e2eb29c1d416ee281f 100644 (file)
--- 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
@@ -172,6 +174,45 @@ void handle_input_pdu(STREAM s, int vnc_sock)
        write(vnc_sock, buf, 10);
 }
 
+void handle_control_pdu(STREAM s)
+{
+       uint16 action, userid;
+       uint32 control_id;
+
+       in_uint16_le(s, action);
+       in_uint16_le(s, userid);
+       in_uint32(s, control_id);
+       
+       printf("Control PDU: action=%hu userid=%hu control_id=%u\n", action, userid, control_id);
+
+       switch (action) {
+       case RDP_CTL_COOPERATE:
+               printf("Cooperate\n");
+               rdp_send_control(RDP_CTL_COOPERATE);
+               break;
+       case RDP_CTL_REQUEST_CONTROL:
+               printf("Client requesting control; granting\n");
+               rdp_send_control(RDP_CTL_GRANT_CONTROL);
+               break;
+       default:
+               printf("Unhandled\n");
+       }
+}
+
+void
+handle_font2_pdu(STREAM s)
+{
+       printf("FONT2 PDU, responding with magic\n");
+
+       s = rdp_init_data(8);
+       out_uint16_le(s, 0);
+       out_uint16_le(s, 0);
+       out_uint16_le(s, 3);
+       out_uint16_le(s, 4);
+       s_mark_end(s);
+       rdp_send_data(s, 0x28);
+}
+
 struct ServerInitialization {
        unsigned short width;
        unsigned short height;
@@ -318,10 +359,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");
@@ -329,6 +371,7 @@ int serve_client()
 
        for ( ;; ) {
                uint8 type, data_pdu_type;
+               uint16 id;
                STREAM s;
 
                fd_set readfs;
@@ -341,23 +384,38 @@ int serve_client()
                // activity on RDP socket?
                if (FD_ISSET(tcp_get_socket(), &readfs)) {
                        if ((s = rdp_recv(&type)) != NULL) {
-                               if (type != RDP_PDU_DATA) {
-                                       printf("Unknown RDP packet of type %u\n", type);
-                                       continue;
-                               }
-
-                               in_uint8s(s, 8);        /* shareid, pad, streamid, length */
-                               in_uint8(s, data_pdu_type);
-                               in_uint8s(s, 3);        /* compress_type, compress_len */
-
-                               switch (data_pdu_type) {
-                               case RDP_DATA_PDU_INPUT:
-                                       handle_input_pdu(s, vnc_sock);
-                                       listen_on_vnc = 1;
+                               switch (type) {
+                               case RDP_PDU_DATA:
+                                       in_uint8s(s, 8);        /* shareid, pad, streamid, length */
+                                       in_uint8(s, data_pdu_type);
+                                       in_uint8s(s, 3);        /* compress_type, compress_len */
+
+                                       switch (data_pdu_type) {
+                                       case RDP_DATA_PDU_INPUT:
+                                               handle_input_pdu(s, vnc_sock);
+                                               listen_on_vnc = 1;
+                                               break;
+                                       case RDP_DATA_PDU_CONTROL:
+                                               handle_control_pdu(s);
+                                               break;
+                                       case RDP_DATA_PDU_SYNCHRONISE:
+                                               in_uint16_le(s, id);
+                                               printf("Synchronise, id=%u\n", id);
+                                               rdp_send_synchronise(id);
+                                               break;
+                                       case RDP_DATA_PDU_FONT2:
+                                               handle_font2_pdu(s);
+                                               break;
+                                       default:
+                                               printf("Unknown data PDU type %u\n", data_pdu_type);
+                                       };
+                                       break;
+                               case RDP_PDU_CONFIRM_ACTIVE:
+                                       printf("Client confirms activity\n");
                                        break;
                                default:
-                                       printf("Unknown data PDU type %u\n", data_pdu_type);
-                               };
+                                       printf("Unknown RDP PDU type %u\n", type);
+                               }
                        }
                }
 
@@ -387,7 +445,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: