Pull in rdp.c from rdesktop, use rdp_recv().

[rdpsrv] / rdpsrv.c

diff --git a/rdpsrv.c b/rdpsrv.c
index 5b1603d12f1919f0575a094b4523ba9dfd07ca67..dda4a173ad0856c0e27bc2e4482a06fdc8540b20 100644 (file)
--- a/rdpsrv.c
+++ b/rdpsrv.c
@@ -6,26 +6,20 @@
 #include <sys/ioctl.h>
 #include <arpa/inet.h>
 
+#include "rdesktop.h"
+
 const int tcp_port_rdp = 3389;
 int create_server_socket();
-int serve_client(int sock);
+int serve_client();
 
 int main()
 {
        int server_sock = create_server_socket();
        for ( ;; ) {
-               struct sockaddr_in sin;
-               socklen_t len;
-               int sock = accept(server_sock, (struct sockaddr *)&sin, &len);
-       
-               if (sock == -1) {
-                       perror("accept()");
-                       exit(1);
-               }
-
-               serve_client(sock);
-
-               close(sock);
+               iso_recv_connect(server_sock);
+               printf("Got connection.\n");
+               serve_client();
+               printf("Client closed.\n");
        }
 }
 
@@ -65,12 +59,18 @@ int create_server_socket()
 }
 
 
-int serve_client(int sock)
+int serve_client()
 {
+       if (!mcs_recv_connect_initial())
+               error("MCS_CONNECT_INITIAL recv failed");
+       mcs_send_connect_response();
+       
        for ( ;; ) {
-               unsigned char buf[4096];
-               
-               /* receive ISO packets */
-               
+               uint8 type;
+               STREAM s;
+
+               while ((s = rdp_recv(&type)) != NULL) {
+                       printf("RDP packet! type %u\n", type);
+               }
        }
 }