From 77c4c9b3748ff2c43ab17d2df88a38c47abd5659 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 23 Jan 2011 15:22:06 -0800 Subject: [PATCH] Using new tunnel servlet API --- .../src/main/resources/guacamole.js | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/guacamole-common-js/src/main/resources/guacamole.js b/guacamole-common-js/src/main/resources/guacamole.js index 8cf692fc2..fc5be607b 100644 --- a/guacamole-common-js/src/main/resources/guacamole.js +++ b/guacamole-common-js/src/main/resources/guacamole.js @@ -17,7 +17,11 @@ * along with this program. If not, see . */ -function GuacamoleClient(display) { +function GuacamoleClient(display, tunnelURL) { + + var TUNNEL_CONNECT = tunnelURL + "?connect"; + var TUNNEL_READ = tunnelURL + "?read"; + var TUNNEL_WRITE = tunnelURL + "?write"; var STATE_IDLE = 0; var STATE_CONNECTING = 1; @@ -198,7 +202,7 @@ function GuacamoleClient(display) { sendingMessages = 1; var message_xmlhttprequest = new XMLHttpRequest(); - message_xmlhttprequest.open("POST", "inbound"); + message_xmlhttprequest.open("POST", TUNNEL_WRITE); message_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); message_xmlhttprequest.setRequestHeader("Content-length", outputMessageBuffer.length); @@ -377,7 +381,7 @@ function GuacamoleClient(display) { // Download self var xmlhttprequest = new XMLHttpRequest(); - xmlhttprequest.open("POST", "outbound"); + xmlhttprequest.open("POST", TUNNEL_READ); xmlhttprequest.send(null); return xmlhttprequest; @@ -560,7 +564,7 @@ function GuacamoleClient(display) { // Start tunnel and connect synchronously var connect_xmlhttprequest = new XMLHttpRequest(); - connect_xmlhttprequest.open("POST", "connect", false); + connect_xmlhttprequest.open("POST", TUNNEL_CONNECT, false); connect_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); connect_xmlhttprequest.setRequestHeader("Content-length", 0); connect_xmlhttprequest.send(null); @@ -583,7 +587,7 @@ function GuacamoleClient(display) { // Send disconnect message (synchronously... as necessary until handoff is implemented) var disconnect_xmlhttprequest = new XMLHttpRequest(); - disconnect_xmlhttprequest.open("POST", "inbound", false); + disconnect_xmlhttprequest.open("POST", TUNNEL_WRITE, false); disconnect_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded"); disconnect_xmlhttprequest.setRequestHeader("Content-length", message.length); disconnect_xmlhttprequest.send(message);