Parse and send on client updates.

[rdpsrv] / rdpsrv.c

diff --git a/rdpsrv.c b/rdpsrv.c
index 9b198ef41d04c489a8d90402c2040b60b77ed897..edb6299206847ffbefa32a5624b2e239188eb398 100644 (file)
--- a/rdpsrv.c
+++ b/rdpsrv.c
@@ -91,9 +91,6 @@ void handle_input_pdu(STREAM s)
                        printf("- Device flags: %x\n", device_flags);
                        printf("- Position: (%u,%u)\n", param1, param2);
 
-                       // debug
-                       rdp_send_bitmap_update(param1, param2);
-                       
                        break;
                default:
                        printf("- Unknown type %x\n", message_type);
@@ -138,10 +135,10 @@ int vnc_init()
 
        printf("Server is %u x %u\n", ntohs(si.width), ntohs(si.height));
 
-       if (read(vnc_sock, buf, ntohs(si.name_len)) != ntohs(si.name_len))
+       if (read(vnc_sock, buf, ntohl(si.name_len)) != ntohl(si.name_len))
                error("short read on server name\n");
 
-       printf("Server name is '%*s'\n", ntohs(si.name_len), buf);
+       printf("Server name is '%*s' (%u bytes)\n", ntohl(si.name_len), buf, ntohl(si.name_len));
 
        // we can only accept raw encoding
        buf[0] = 2; // message type
@@ -149,8 +146,11 @@ int vnc_init()
        buf[2] = 0; // number of encodings
        buf[3] = 1;
        buf[4] = 0; // raw encoding
+       buf[5] = 0; 
+       buf[6] = 0;
+       buf[7] = 0;
 
-       write(vnc_sock, buf, 5);
+       write(vnc_sock, buf, 8);
        
        // request the entire framebuffer
        buf[0] = 3; // message type
@@ -171,6 +171,48 @@ int vnc_init()
        return vnc_sock;
 }
 
+struct vnc_rectangle {
+       unsigned short x, y, width, height;
+       unsigned int encoding;
+};
+
+void handle_vnc_fbupdate(int vnc_sock)
+{
+       struct vnc_rectangle rect;
+       unsigned char *data, *ptr;
+       unsigned short num_rect;
+       int ret, data_left, i;
+
+       if (read(vnc_sock, &num_rect, 2) != 2)
+               error("short read on num_rect\n");
+
+       for (i = 0; i < ntohs(num_rect); ++i) { 
+               if (read(vnc_sock, &rect, sizeof(struct vnc_rectangle)) != sizeof(struct vnc_rectangle))
+                       error("short read on vnc_rectangle\n");
+               
+               printf("UPDATE: %ux%u at (%u,%u)\n", ntohs(rect.width), ntohs(rect.height),
+                       ntohs(rect.x), ntohs(rect.y));
+               
+               if (ntohl(rect.encoding) != 0)
+                       error("unsupported encoding\n");
+
+               ptr = data = xmalloc(ntohs(rect.width) * ntohs(rect.height) * 3);
+               data_left = ntohs(rect.width) * ntohs(rect.height) * 3;
+
+               while (data_left > 0) {
+                       ret = read(vnc_sock, ptr, data_left);
+                       if (ret <= 0)
+                               error("error on data read\n");
+
+                       ptr += ret;
+                       data_left -= ret;
+               }
+
+               rdp_send_bitmap_update(ntohs(rect.x), ntohs(rect.y), ntohs(rect.width), ntohs(rect.height), data);
+               xfree(data);
+       }
+}
+
 int serve_client()
 {
        int vnc_sock = vnc_init();
@@ -215,7 +257,20 @@ int serve_client()
 
                // activity on VNC socket?
                if (FD_ISSET(vnc_sock, &readfs)) {
+                       unsigned char buf[256];
+
                        printf("Activity on VNC socket!\n");
+                       
+                       read(vnc_sock, buf, 2);
+                       switch (buf[0]) {
+                       case 0:
+                               // frame buffer update!
+                               handle_vnc_fbupdate(vnc_sock);
+                               break;
+                       default:
+                               printf("Unknown server message %x\n", buf[0]);
+                               exit(1);
+                       }
                }
        }
 }