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

Change RepeaterID to be a config option

This commit is contained in:
William Lightning 2012-06-22 22:30:05 -07:00
parent 8d0c7fb5ac
commit 12acb663eb
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/rfb.js
View File

@ -39,7 +39,6 @@ var that = {}, // Public API methods
rfb_port = 5900,
rfb_password = '',
rfb_path = '',
rfb_repeaterID = '',
rfb_state = 'disconnected',
rfb_version = 0,
@ -135,6 +134,7 @@ Util.conf_defaults(conf, that, defaults, [
['focusContainer', 'wo', 'dom', document, 'DOM element that captures keyboard input'],
['encrypt', 'rw', 'bool', false, 'Use TLS/SSL/wss encryption'],
['repeaterID', 'rw', 'string', '', 'RepeaterID to connect to'],
['true_color', 'rw', 'bool', true, 'Request true color pixel data'],
['local_cursor', 'rw', 'bool', false, 'Request locally rendered cursor'],
['shared', 'rw', 'bool', true, 'Request shared mode'],
@ -688,7 +688,7 @@ init_msg = function() {
return fail("Invalid server version " + sversion);
}
if (is_repeater) {
repeaterID = rfb_repeaterID;
repeaterID = conf.repeaterID;
while(repeaterID.length < 250)
repeaterID += "\0";
ws.send_string(repeaterID);
@ -1759,14 +1759,13 @@ clientCutText = function(text) {
// Public API interface functions
//
that.connect = function(host, port, password, path, repeaterID) {
that.connect = function(host, port, password, path) {
//Util.Debug(">> connect");
rfb_host = host;
rfb_port = port;
rfb_password = (password !== undefined) ? password : "";
rfb_path = (path !== undefined) ? path : "";
rfb_repeaterID = (repeaterID !== undefined) ? repeaterID : "";
if ((!rfb_host) || (!rfb_port)) {
return fail("Must set host and port");

2
include/util.js
View File

@ -146,6 +146,8 @@ Util.conf_default = function(cfg, api, defaults, v, mode, type, defval, desc) {
}
} else if (type in {'integer':1, 'int':1}) {
val = parseInt(val, 10);
} else if (type === 'string') {
val = String(val);
} else if (type === 'func') {
if (!val) {
val = function () {};