select() both the RDP and VNC sockets.

diff --git a/proto.h b/proto.h
index 00ab7a0bc194868ef397fd2a3cb9e6afedfe8d18..7170509e325e375de4bc3a4f2858bb1695125b02 100644 (file)
--- a/proto.h
+++ b/proto.h
@@ -121,6 +121,7 @@ STREAM tcp_recv(STREAM s, uint32 length);
 BOOL tcp_recv_connect(int server_sock);
 int tcp_connect(char *server, int port);
 void tcp_disconnect(void);
 BOOL tcp_recv_connect(int server_sock);
 int tcp_connect(char *server, int port);
 void tcp_disconnect(void);

+int tcp_get_socket(void);

 /* xclip.c */
 void ui_clip_format_announce(uint8 * data, uint32 length);
 void ui_clip_handle_data(uint8 * data, uint32 length);
 /* xclip.c */
 void ui_clip_format_announce(uint8 * data, uint32 length);
 void ui_clip_handle_data(uint8 * data, uint32 length);

diff --git a/rdpsrv.c b/rdpsrv.c
index b1b5ea78663c4e7ad06e87a9da73e1ec91d5e573..9b198ef41d04c489a8d90402c2040b60b77ed897 100644 (file)
--- a/rdpsrv.c
+++ b/rdpsrv.c
@@ -2,6 +2,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>
 #include <stdlib.h>
 #include <unistd.h>
 #include <errno.h>

+#include <sys/select.h>

 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <arpa/inet.h>
 #include <sys/socket.h>
 #include <sys/ioctl.h>
 #include <arpa/inet.h>


@@ -182,24 +183,39 @@ int serve_client()
                uint8 type, data_pdu_type;
                STREAM s;
 
                uint8 type, data_pdu_type;
                STREAM s;
 

-               while ((s = rdp_recv(&type)) != NULL) {
-                       if (type != RDP_PDU_DATA) {
-                               printf("Unknown RDP packet of type %u\n", type);
-                               continue;
+               fd_set readfs;
+               FD_ZERO(&readfs);
+               FD_SET(tcp_get_socket(), &readfs);
+               FD_SET(vnc_sock, &readfs);
+               
+               select(FD_SETSIZE, &readfs, NULL, NULL, NULL);
+
+               // 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:
+                                       printf("Input PDU\n");
+                                       handle_input_pdu(s);
+                                       break;
+                               default:
+                                       printf("Unknown data PDU type %u\n", data_pdu_type);
+                               };

                        }
                        }

+               }

 
 

-                       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:
-                               printf("Input PDU\n");
-                               handle_input_pdu(s);
-                               break;
-                       default:
-                               printf("Unknown data PDU type %u\n", data_pdu_type);
-                       };
+               // activity on VNC socket?
+               if (FD_ISSET(vnc_sock, &readfs)) {
+                       printf("Activity on VNC socket!\n");

                }
        }
 }
                }
        }
 }

diff --git a/tcp.c b/tcp.c
index 30aecadf668f726d7467d2c4cafd476ed8d9dcfb..0ae0d763f2f200e55facb0b4151d29990002ea82 100644 (file)
--- a/tcp.c
+++ b/tcp.c
@@ -256,3 +256,9 @@ tcp_disconnect(void)
 {
        close(sock);
 }
 {
        close(sock);
 }

+
+// hack? :-)
+int tcp_get_socket(void)
+{
+       return sock;
+}