Endianness fixes. Sets encoding. Requests entire area.

[rdpsrv] / rdpsrv.c

diff --git a/rdpsrv.c b/rdpsrv.c
index e97515b53d965d29f04594b7f678aeb80de7e98a..b1b5ea78663c4e7ad06e87a9da73e1ec91d5e573 100644 (file)
--- a/rdpsrv.c
+++ b/rdpsrv.c
@@ -102,12 +102,82 @@ void handle_input_pdu(STREAM s)
        }
 }
 
+struct ServerInitialization {
+       unsigned short width;
+       unsigned short height;
+       unsigned char pixelformat[16]; // FIXME
+       unsigned int name_len;
+};
+
+int vnc_init()
+{
+       char buf[256];
+       int vnc_sock = tcp_connect("127.0.0.1", 5901);
+       struct ServerInitialization si;
+
+       // get handshake
+       if (read(vnc_sock, buf, 12) != 12)
+               error("short read on handshake\n");
+       write(vnc_sock, "RFB 003.003\n", 12);
+
+       // get auth
+       if (read(vnc_sock, buf, 4) != 4)
+               error("short read on auth\n");
+
+       if (buf[3] != 1)
+               error("auth needed or connection failed\n");
+
+       // send shared flag
+       buf[0] = 1;
+       write(vnc_sock, buf, 1);
+
+       // read the server initialization
+       if (read(vnc_sock, &si, sizeof(struct ServerInitialization)) != sizeof(struct ServerInitialization))
+               error("short read on SI");
+
+       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))
+               error("short read on server name\n");
+
+       printf("Server name is '%*s'\n", ntohs(si.name_len), buf);
+
+       // we can only accept raw encoding
+       buf[0] = 2; // message type
+       buf[1] = 0; // padding
+       buf[2] = 0; // number of encodings
+       buf[3] = 1;
+       buf[4] = 0; // raw encoding
+
+       write(vnc_sock, buf, 5);
+       
+       // request the entire framebuffer
+       buf[0] = 3; // message type
+       buf[1] = 0; // incremental
+       buf[2] = 0; // xpos
+       buf[3] = 0;
+       buf[4] = 0; // ypos
+       buf[5] = 0;
+       buf[6] = 640 >> 8; // width
+       buf[7] = 640 % 0xff;
+       buf[8] = 480 >> 8; // height
+       buf[9] = 480 % 0xff;
+
+       write(vnc_sock, buf, 10);
+       
+       printf("Connected to VNC!\n");
+
+       return vnc_sock;
+}
+
 int serve_client()
 {
+       int vnc_sock = vnc_init();
+       
        if (!mcs_recv_connect_initial())
                error("MCS_CONNECT_INITIAL recv failed");
        mcs_send_connect_response();
-       
+
        for ( ;; ) {
                uint8 type, data_pdu_type;
                STREAM s;