From 6971add15538e5be6ed853f5d477ba6a7cb215b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Moreau?= <marcandre.moreau@gmail.com>
Date: Sun, 2 Sep 2012 23:36:01 -0400
Subject: [PATCH] wfreerdp-server: add select()

---
 .gitignore                |  3 ++
 server/Windows/wf_peer.c  |  1 +
 server/Windows/wfreerdp.c | 58 +++++++++++++++++++++++++++++++++++----
 3 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 73c0bf88c..f5c7f4f1d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,3 +49,6 @@ xcode
 # Other
 *~
 
+default.log
+*Amplifier XE*
+*Inspector XE*
diff --git a/server/Windows/wf_peer.c b/server/Windows/wf_peer.c
index a82bd8bc1..42f11e3c4 100644
--- a/server/Windows/wf_peer.c
+++ b/server/Windows/wf_peer.c
@@ -29,6 +29,7 @@
 #include <freerdp/codec/rfx.h>
 #include <freerdp/utils/stream.h>
 
+#include "wf_input.h"
 #include "wf_mirage.h"
 
 #include "wf_peer.h"
diff --git a/server/Windows/wfreerdp.c b/server/Windows/wfreerdp.c
index f6a20c940..480047fe4 100644
--- a/server/Windows/wfreerdp.c
+++ b/server/Windows/wfreerdp.c
@@ -44,16 +44,20 @@
 HANDLE g_done_event;
 int g_thread_count = 0;
 
-BOOL derp = false;
-
 static DWORD WINAPI wf_peer_main_loop(LPVOID lpParam)
 {
+	int i, fds;
 	int rcount;
+	int max_fds;
 	void* rfds[32];
+	fd_set rfds_set;
+	int select_status;
+	struct timeval timeout;
 	wfPeerContext* context;
 	freerdp_peer* client = (freerdp_peer*) lpParam;
 
 	memset(rfds, 0, sizeof(rfds));
+	memset(&timeout, 0, sizeof(struct timeval));
 
 	wf_peer_init(client);
 
@@ -85,10 +89,33 @@ static DWORD WINAPI wf_peer_main_loop(LPVOID lpParam)
 			break;
 		}
 
-		if (client->CheckFileDescriptor(client) != true)
+		max_fds = 0;
+		FD_ZERO(&rfds_set);
+
+		for (i = 0; i < rcount; i++)
 		{
-			printf("Failed to check FreeRDP file descriptor\n");
+			fds = (int)(long)(rfds[i]);
+
+			if (fds > max_fds)
+				max_fds = fds;
+
+			FD_SET(fds, &rfds_set);
+		}
+		
+
+		if (max_fds == 0)
 			break;
+		
+		timeout.tv_usec = 100 * 1000;
+		select_status = select(max_fds + 1, &rfds_set, NULL, NULL, &timeout);
+
+		if (select_status != 0)
+		{
+			if (client->CheckFileDescriptor(client) != true)
+			{
+				printf("Failed to check FreeRDP file descriptor\n");
+				break;
+			}
 		}
 
 #ifndef WITH_WIN8
@@ -116,8 +143,11 @@ static void wf_peer_accepted(freerdp_listener* instance, freerdp_peer* client)
 
 static void wf_server_main_loop(freerdp_listener* instance)
 {
+	int i, fds;
 	int rcount;
+	int max_fds;
 	void* rfds[32];
+	fd_set rfds_set;
 
 	memset(rfds, 0, sizeof(rfds));
 
@@ -131,13 +161,29 @@ static void wf_server_main_loop(freerdp_listener* instance)
 			break;
 		}
 
+		max_fds = 0;
+		FD_ZERO(&rfds_set);
+
+		for (i = 0; i < rcount; i++)
+		{
+			fds = (int)(long)(rfds[i]);
+
+			if (fds > max_fds)
+				max_fds = fds;
+
+			FD_SET(fds, &rfds_set);
+		}
+
+		if (max_fds == 0)
+			break;
+
+		select(max_fds + 1, &rfds_set, NULL, NULL, NULL);
+
 		if (instance->CheckFileDescriptor(instance) != true)
 		{
 			printf("Failed to check FreeRDP file descriptor\n");
 			break;
 		}
-
-		Sleep(20);
 	}
 
 	instance->Close(instance);