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

GUACAMOLE-1562: Merge correct handling of received tunnel UUIDs.

Browse Source
This commit is contained in:
Virtually Nick
2022-03-26 17:13:27 -04:00
committed by GitHub
parent c63c02d645 b9e79d99c5
commit a3e202e6bf
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1094,7 +1094,7 @@ Guacamole.WebSocketTunnel = function(tunnelURL) {
if (tunnel.uuid === null) { if (tunnel.uuid === null) {
// Associate tunnel UUID if received // Associate tunnel UUID if received
if (opcode === Guacamole.Tunnel.INTERNAL_DATA_OPCODE) if (opcode === Guacamole.Tunnel.INTERNAL_DATA_OPCODE && elements.length === 1)
tunnel.setUUID(elements[0]); tunnel.setUUID(elements[0]);
// Tunnel is now open and UUID is available // Tunnel is now open and UUID is available
@@ -1236,12 +1236,17 @@ Guacamole.ChainedTunnel = function(tunnelChain) {
tunnel.onstatechange = chained_tunnel.onstatechange; tunnel.onstatechange = chained_tunnel.onstatechange;
tunnel.oninstruction = chained_tunnel.oninstruction; tunnel.oninstruction = chained_tunnel.oninstruction;
tunnel.onerror = chained_tunnel.onerror; tunnel.onerror = chained_tunnel.onerror;
tunnel.onuuid = chained_tunnel.onuuid;
// Assign UUID if already known // Assign UUID if already known
if (tunnel.uuid) if (tunnel.uuid)
chained_tunnel.setUUID(tunnel.uuid); chained_tunnel.setUUID(tunnel.uuid);
// Assign any future received UUIDs such that they are
// accessible from the main uuid property of the chained tunnel
tunnel.onuuid = function uuidReceived(uuid) {
chained_tunnel.setUUID(uuid);
};
committedTunnel = tunnel; committedTunnel = tunnel;
} }