From 62332e9f65e367918152f6f16e5688a1dd39c41c Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 2 Jan 2011 14:28:06 -0800 Subject: [PATCH] Implementing API improvements made in guacamole-common --- .../basic/BasicGuacamoleClientProvider.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/guacamole/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleClientProvider.java b/guacamole/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleClientProvider.java index bbef84b94..f48af3874 100644 --- a/guacamole/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleClientProvider.java +++ b/guacamole/src/main/java/net/sourceforge/guacamole/net/authentication/basic/BasicGuacamoleClientProvider.java @@ -2,10 +2,10 @@ package net.sourceforge.guacamole.net.authentication.basic; import javax.servlet.http.HttpSession; -import net.sourceforge.guacamole.GuacamoleClient; +import net.sourceforge.guacamole.GuacamoleTCPClient; import net.sourceforge.guacamole.GuacamoleException; import net.sourceforge.guacamole.net.Configuration; -import net.sourceforge.guacamole.net.GuacamoleSession; +import net.sourceforge.guacamole.net.GuacamoleProperties; import net.sourceforge.guacamole.net.authentication.GuacamoleClientProvider; /* @@ -28,7 +28,7 @@ import net.sourceforge.guacamole.net.authentication.GuacamoleClientProvider; public class BasicGuacamoleClientProvider implements GuacamoleClientProvider { - public GuacamoleClient createClient(HttpSession session) throws GuacamoleException { + public GuacamoleTCPClient createClient(HttpSession session) throws GuacamoleException { // Retrieve authorized config data from session Configuration config = (Configuration) session.getAttribute("BASIC-LOGIN-AUTH"); @@ -37,11 +37,10 @@ public class BasicGuacamoleClientProvider implements GuacamoleClientProvider { if (config == null) throw new GuacamoleException("Unauthorized"); - GuacamoleClient client = new GuacamoleClient("localhost", 4822); + String hostname = GuacamoleProperties.getProperty("guacd-hostname"); + int port = GuacamoleProperties.getIntProperty("guacd-port", null); - // TODO: Send "select" and "connect" messages in client connect function (based on config) ... to be implemented. - char[] initMessages = "select:vnc;connect:localhost,5901,potato;".toCharArray(); - client.write(initMessages, 0, initMessages.length); + GuacamoleTCPClient client = new GuacamoleTCPClient(hostname, port); // Return authorized session return client;