safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 13:41:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUAC-1430: Do not move on to the next chained tunnel on upstream timeout.

Browse Source
This commit is contained in:
James Muehlner
2015-12-09 21:15:15 -08:00
parent 8cf4b61720
commit 1b4181a200
1 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
guacamole-common-js/src/main/webapp/modules/Tunnel.js
View File

@@ -884,12 +884,23 @@ Guacamole.ChainedTunnel = function(tunnel_chain) {
/** /**
* Fails the currently-attached tunnel, attaching a new tunnel if * Fails the currently-attached tunnel, attaching a new tunnel if
* possible. * possible.
* *
* @private * @private
* @return {Guacamole.Tunnel} The next tunnel, or null if there are no * @param {Guacamole.Status} [status]
* more tunnels to try. * An object representing the failure that occured in the
* currently-attached tunnel, if known.
*
* @return {Guacamole.Tunnel}
* The next tunnel, or null if there are no more tunnels to try or
* if no more tunnels should be tried.
*/ */
function fail_tunnel() { var failTunnel = function failTunnel(status) {
// Do not attempt to continue using next tunnel on server timeout
if (status && status.code === Guacamole.Status.Code.UPSTREAM_TIMEOUT) {
tunnels = [];
return null;
}
// Get next tunnel // Get next tunnel
var next_tunnel = tunnels.shift(); var next_tunnel = tunnels.shift();
@@ -904,7 +915,7 @@ Guacamole.ChainedTunnel = function(tunnel_chain) {
return next_tunnel; return next_tunnel;
} };
/** /**
* Use the current tunnel from this point forward. Do not try any more * Use the current tunnel from this point forward. Do not try any more
@@ -933,7 +944,7 @@ Guacamole.ChainedTunnel = function(tunnel_chain) {
// If closed, mark failure, attempt next tunnel // If closed, mark failure, attempt next tunnel
case Guacamole.Tunnel.State.CLOSED: case Guacamole.Tunnel.State.CLOSED:
if (!fail_tunnel() && chained_tunnel.onstatechange) if (!failTunnel() && chained_tunnel.onstatechange)
chained_tunnel.onstatechange(state); chained_tunnel.onstatechange(state);
break; break;
@@ -957,7 +968,7 @@ Guacamole.ChainedTunnel = function(tunnel_chain) {
tunnel.onerror = function(status) { tunnel.onerror = function(status) {
// Mark failure, attempt next tunnel // Mark failure, attempt next tunnel
if (!fail_tunnel() && chained_tunnel.onerror) if (!failTunnel(status) && chained_tunnel.onerror)
chained_tunnel.onerror(status); chained_tunnel.onerror(status);
}; };