Added support for multiple tunnels (tunnel UUID returned by connect).

diff --git a/src/main/resources/tunnel.js b/src/main/resources/tunnel.js
index 3ab4bf3..70b139d 100644 (file)
--- a/src/main/resources/tunnel.js
+++ b/src/main/resources/tunnel.js
@@ -18,9 +18,11 @@
 
 function GuacamoleHTTPTunnel(tunnelURL) {
 
+    var tunnel_uuid;
+
     var TUNNEL_CONNECT = tunnelURL + "?connect";
-    var TUNNEL_READ    = tunnelURL + "?read";
-    var TUNNEL_WRITE   = tunnelURL + "?write";
+    var TUNNEL_READ    = tunnelURL + "?read:";
+    var TUNNEL_WRITE   = tunnelURL + "?write:";
 
     var STATE_IDLE          = 0;
     var STATE_CONNECTED     = 1;
@@ -59,7 +61,7 @@ function GuacamoleHTTPTunnel(tunnelURL) {
             sendingMessages = 1;
 
             var message_xmlhttprequest = new XMLHttpRequest();
-            message_xmlhttprequest.open("POST", TUNNEL_WRITE);
+            message_xmlhttprequest.open("POST", TUNNEL_WRITE + tunnel_uuid);
             message_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
 
             // Once response received, send next queued event.
@@ -204,7 +206,7 @@ function GuacamoleHTTPTunnel(tunnelURL) {
 
         // Download self
         var xmlhttprequest = new XMLHttpRequest();
-        xmlhttprequest.open("POST", TUNNEL_READ);
+        xmlhttprequest.open("POST", TUNNEL_READ + tunnel_uuid);
         xmlhttprequest.send(null);
 
         return xmlhttprequest;
@@ -219,6 +221,9 @@ function GuacamoleHTTPTunnel(tunnelURL) {
         connect_xmlhttprequest.setRequestHeader("Content-type", "application/x-www-form-urlencoded");
         connect_xmlhttprequest.send(null);
 
+        // Get UUID from response
+        tunnel_uuid = connect_xmlhttprequest.responseText;
+
         // Start reading data
         currentState = STATE_CONNECTED;
         handleResponse(makeRequest());