From cfebdb2cf3a1a9f4cc60307d7386cf4ea7cf7b81 Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Tue, 8 Mar 2011 21:08:59 -0800
Subject: [PATCH] Added disconnect function to tunnel, added automatic
 disconnect on error receipt in client.

---
 .../src/main/resources/guacamole.js           |  2 ++
 .../src/main/resources/tunnel.js              | 31 ++++++++++++++-----
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/guacamole-common-js/src/main/resources/guacamole.js b/guacamole-common-js/src/main/resources/guacamole.js
index 6afc25212..2506579ed 100644
--- a/guacamole-common-js/src/main/resources/guacamole.js
+++ b/guacamole-common-js/src/main/resources/guacamole.js
@@ -218,6 +218,7 @@ function GuacamoleClient(display, tunnel) {
 
         "error": function(parameters) {
             if (errorHandler) errorHandler(tunnel.unescapeGuacamoleString(parameters[0]));
+            disconnect();
         },
 
         "name": function(parameters) {
@@ -337,6 +338,7 @@ function GuacamoleClient(display, tunnel) {
 
             setState(STATE_DISCONNECTING);
             tunnel.sendMessage("disconnect;");
+            tunnel.disconnect();
             setState(STATE_DISCONNECTED);
         }
 
diff --git a/guacamole-common-js/src/main/resources/tunnel.js b/guacamole-common-js/src/main/resources/tunnel.js
index e11bb0b35..fab421fd0 100644
--- a/guacamole-common-js/src/main/resources/tunnel.js
+++ b/guacamole-common-js/src/main/resources/tunnel.js
@@ -22,6 +22,7 @@ function GuacamoleHTTPTunnel(tunnelURL) {
     var TUNNEL_READ    = tunnelURL + "?read";
     var TUNNEL_WRITE   = tunnelURL + "?write";
 
+    var connected = 0;
     var pollResponse = 1; // Default to polling - will be turned off automatically if not needed
     var instructionHandler = null;
 
@@ -30,6 +31,10 @@ function GuacamoleHTTPTunnel(tunnelURL) {
 
     function sendMessage(message) {
 
+        // Do not attempt to send messages if not connected
+        if (!connected)
+            return;
+
         // Add event to queue, restart send loop if finished.
         outputMessageBuffer += message;
         if (sendingMessages == 0)
@@ -75,6 +80,16 @@ function GuacamoleHTTPTunnel(tunnelURL) {
 
         function parseResponse() {
 
+            // Do not handle responses if not connected
+            if (!connected) {
+                
+                // Clean up interval if polling
+                if (interval != null)
+                    clearInterval(interval);
+                
+                return;
+            }
+
             // Start next request as soon as possible
             if (xmlhttprequest.readyState >= 2 && nextRequest == null)
                 nextRequest = makeRequest();
@@ -92,12 +107,8 @@ function GuacamoleHTTPTunnel(tunnelURL) {
                 }
 
                 // Halt on error during request
-                if (xmlhttprequest.status == 0) {
-                    showError("Request canceled by browser.");
-                    return;
-                }
-                else if (xmlhttprequest.status != 200) {
-                    showError("Error during request (HTTP " + xmlhttprequest.status + "): " + xmlhttprequest.statusText);
+                if (xmlhttprequest.status == 0 || xmlhttprequest.status != 200) {
+                    disconnect();
                     return;
                 }
 
@@ -201,12 +212,18 @@ function GuacamoleHTTPTunnel(tunnelURL) {
         connect_xmlhttprequest.send(null);
 
         // Start reading data
+        connected = 1;
         handleResponse(makeRequest());
 
-    };
+    }
+
+    function disconnect() {
+        connected = 0;
+    }
 
     // External API
     this.connect = connect;
+    this.disconnect = disconnect;
     this.sendMessage = sendMessage;
     this.setInstructionHandler = function(handler) {
         instructionHandler = handler;