jcarr
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #336 from samhed/removeConnectionTimeout 

Remove the connection timeouts
This commit is contained in:
Samuel 2014-02-07 10:15:04 +01:00
parent 98c1275d80 20074a49eb
commit afbeb98cfb
4 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/base.css
View File

@ -41,9 +41,6 @@ html {
} }
#noVNC_encrypt { #noVNC_encrypt {
} }
#noVNC_connectTimeout {
width: 30px;
}
#noVNC_path { #noVNC_path {
width: 100px; width: 100px;
} }

15
include/rfb.js
View File

@ -76,7 +76,6 @@ var that = {}, // Public API methods
keyboard = null, // Keyboard input handler object keyboard = null, // Keyboard input handler object
mouse = null, // Mouse input handler object mouse = null, // Mouse input handler object
sendTimer = null, // Send Queue check timer sendTimer = null, // Send Queue check timer
connTimer = null, // connection timer
disconnTimer = null, // disconnection timer disconnTimer = null, // disconnection timer
msgTimer = null, // queued handle_message timer msgTimer = null, // queued handle_message timer
@ -120,8 +119,6 @@ var that = {}, // Public API methods
test_mode = false, test_mode = false,
def_con_timeout = Websock_native ? 2 : 5,
/* Mouse state */ /* Mouse state */
mouse_buttonMask = 0, mouse_buttonMask = 0,
mouse_arr = [], mouse_arr = [],
@ -138,8 +135,6 @@ Util.conf_defaults(conf, that, defaults, [
['local_cursor', 'rw', 'bool', false, 'Request locally rendered cursor'], ['local_cursor', 'rw', 'bool', false, 'Request locally rendered cursor'],
['shared', 'rw', 'bool', true, 'Request shared mode'], ['shared', 'rw', 'bool', true, 'Request shared mode'],
['view_only', 'rw', 'bool', false, 'Disable client mouse/keyboard'], ['view_only', 'rw', 'bool', false, 'Disable client mouse/keyboard'],
['connectTimeout', 'rw', 'int', def_con_timeout, 'Time (s) to wait for connection'],
['disconnectTimeout', 'rw', 'int', 3, 'Time (s) to wait for disconnection'], ['disconnectTimeout', 'rw', 'int', 3, 'Time (s) to wait for disconnection'],
// UltraVNC repeater ID to connect to // UltraVNC repeater ID to connect to
@ -439,12 +434,6 @@ updateState = function(state, statusMsg) {
rfb_state = state; rfb_state = state;
} }
if (connTimer && (rfb_state !== 'connect')) {
Util.Debug("Clearing connect timer");
clearTimeout(connTimer);
connTimer = null;
}
if (disconnTimer && (rfb_state !== 'disconnect')) { if (disconnTimer && (rfb_state !== 'disconnect')) {
Util.Debug("Clearing disconnect timer"); Util.Debug("Clearing disconnect timer");
clearTimeout(disconnTimer); clearTimeout(disconnTimer);
@ -462,10 +451,6 @@ updateState = function(state, statusMsg) {
case 'connect': case 'connect':
connTimer = setTimeout(function () {
fail("Connect timeout");
}, conf.connectTimeout * 1000);
init_vars(); init_vars();
connect(); connect();

5
include/ui.js
View File

@ -86,7 +86,6 @@ start: function(callback) {
UI.initSetting('cursor', !UI.isTouchDevice); UI.initSetting('cursor', !UI.isTouchDevice);
UI.initSetting('shared', true); UI.initSetting('shared', true);
UI.initSetting('view_only', false); UI.initSetting('view_only', false);
UI.initSetting('connectTimeout', 2);
UI.initSetting('path', 'websockify'); UI.initSetting('path', 'websockify');
UI.initSetting('repeaterID', ''); UI.initSetting('repeaterID', '');
@ -388,7 +387,6 @@ toggleSettingsPanel: function() {
UI.updateSetting('clip'); UI.updateSetting('clip');
UI.updateSetting('shared'); UI.updateSetting('shared');
UI.updateSetting('view_only'); UI.updateSetting('view_only');
UI.updateSetting('connectTimeout');
UI.updateSetting('path'); UI.updateSetting('path');
UI.updateSetting('repeaterID'); UI.updateSetting('repeaterID');
UI.updateSetting('stylesheet'); UI.updateSetting('stylesheet');
@ -437,7 +435,6 @@ settingsApply: function() {
UI.saveSetting('clip'); UI.saveSetting('clip');
UI.saveSetting('shared'); UI.saveSetting('shared');
UI.saveSetting('view_only'); UI.saveSetting('view_only');
UI.saveSetting('connectTimeout');
UI.saveSetting('path'); UI.saveSetting('path');
UI.saveSetting('repeaterID'); UI.saveSetting('repeaterID');
UI.saveSetting('stylesheet'); UI.saveSetting('stylesheet');
@ -549,7 +546,6 @@ updateVisualState: function() {
} }
$D('noVNC_shared').disabled = connected; $D('noVNC_shared').disabled = connected;
$D('noVNC_view_only').disabled = connected; $D('noVNC_view_only').disabled = connected;
$D('noVNC_connectTimeout').disabled = connected;
$D('noVNC_path').disabled = connected; $D('noVNC_path').disabled = connected;
$D('noVNC_repeaterID').disabled = connected; $D('noVNC_repeaterID').disabled = connected;
@ -622,7 +618,6 @@ connect: function() {
UI.rfb.set_local_cursor(UI.getSetting('cursor')); UI.rfb.set_local_cursor(UI.getSetting('cursor'));
UI.rfb.set_shared(UI.getSetting('shared')); UI.rfb.set_shared(UI.getSetting('shared'));
UI.rfb.set_view_only(UI.getSetting('view_only')); UI.rfb.set_view_only(UI.getSetting('view_only'));
UI.rfb.set_connectTimeout(UI.getSetting('connectTimeout'));
UI.rfb.set_repeaterID(UI.getSetting('repeaterID')); UI.rfb.set_repeaterID(UI.getSetting('repeaterID'));
UI.rfb.connect(host, port, password, path); UI.rfb.connect(host, port, password, path);

1
vnc.html
View File

@ -148,7 +148,6 @@
<li><input id="noVNC_clip" type="checkbox"> Clip to Window</li> <li><input id="noVNC_clip" type="checkbox"> Clip to Window</li>
<li><input id="noVNC_shared" type="checkbox"> Shared Mode</li> <li><input id="noVNC_shared" type="checkbox"> Shared Mode</li>
<li><input id="noVNC_view_only" type="checkbox"> View Only</li> <li><input id="noVNC_view_only" type="checkbox"> View Only</li>
<li><input id="noVNC_connectTimeout" type="input"> Connect Timeout (s)</li>
<li><input id="noVNC_path" type="input" value="websockify"> Path</li> <li><input id="noVNC_path" type="input" value="websockify"> Path</li>
<li><input id="noVNC_repeaterID" type="input" value=""> Repeater ID</li> <li><input id="noVNC_repeaterID" type="input" value=""> Repeater ID</li>
<hr> <hr>