diff --git a/noVNC/LICENSE.txt b/noVNC/LICENSE.txt
new file mode 100644
index 0000000..2d09408
--- /dev/null
+++ b/noVNC/LICENSE.txt
@@ -0,0 +1,82 @@
+noVNC is Copyright (C) 2011 Joel Martin 
+
+See more screenshots here.
+
+
+### Browser Requirements
+
+* HTML5 Canvas (with createImageData): Chrome, Firefox 3.6+, iOS
+ Safari, Opera 11+, Internet Explorer 9+, etc.
+
+* HTML5 WebSockets: For browsers that do not have builtin
+ WebSockets support, the project includes
+ web-socket-js,
+ a WebSockets emulator using Adobe Flash. iOS 4.2+ has built-in
+ WebSocket support.
+
+* Fast Javascript Engine: this is not strictly a requirement, but
+ without a fast Javascript engine, noVNC might be painfully slow.
+
+* See the more detailed [browser compatibility wiki page](https://github.com/kanaka/noVNC/wiki/Browser-support).
+
+
+### Server Requirements
+
+Unless you are using a VNC server with support for WebSockets
+connections (such as
+[x11vnc/libvncserver](http://libvncserver.sourceforge.net/),
+[QEMU](http://www.qemu.org/), or
+[PocketVNC](http://www.pocketvnc.com/blog/?page_id=866)), you need to
+use a WebSockets to TCP socket proxy. There is a python proxy included
+('websockify').
+
+
+### Quick Start
+
+* Use the launch script to start a mini-webserver and the WebSockets
+ proxy (websockify). The `--vnc` option is used to specify the location of
+ a running VNC server:
+
+ `./utils/launch.sh --vnc localhost:5901`
+
+* Point your browser to the cut-and-paste URL that is output by the
+ launch script. Enter a password if the VNC server has one
+ configured. Hit the Connect button and enjoy!
+
+
+### Other Pages
+
+* [Encrypted Connections](https://github.com/kanaka/websockify/wiki/Encrypted-Connections). How to setup websockify so that you can use encrypted connections from noVNC.
+
+* [Advanced Usage](https://github.com/kanaka/noVNC/wiki/Advanced-usage). Starting a VNC server, advanced websockify usage, etc.
+
+* [Integrating noVNC](https://github.com/kanaka/noVNC/wiki/Integration) into existing projects.
+
+* [Troubleshooting noVNC](https://github.com/kanaka/noVNC/wiki/Troubleshooting) problems.
+
+
+### Authors/Contributors
+
+* Core team:
+ * [Joel Martin](https://github.com/kanaka)
+ * [Samuel Mannehed](https://github.com/samhed) (Cendio)
+ * [Peter Åstrand](https://github.com/astrand) (Cendio)
+ * [Solly Ross](https://github.com/DirectXMan12) (Red Hat / OpenStack)
+
+* Notable contributions:
+ * UI and Icons : Chris Gordon
+ * Original Logo : Michael Sersen
+ * tight encoding : Michael Tinglof (Mercuri.ca)
+
+* Included libraries:
+ * web-socket-js : Hiroshi Ichikawa (github.com/gimite/web-socket-js)
+ * as3crypto : Henri Torgemane (code.google.com/p/as3crypto)
+ * base64 : Martijn Pieters (Digital Creations 2), Samuel Sieb (sieb.net)
+ * jsunzip : Erik Moller (github.com/operasoftware/jsunzip),
+ * tinflate : Joergen Ibsen (ibsensoftware.com)
+ * DES : Dave Zimmerman (Widget Workshop), Jef Poskanzer (ACME Labs)
diff --git a/noVNC/debian/changelog b/noVNC/debian/changelog
new file mode 100644
index 0000000..4d30742
--- /dev/null
+++ b/noVNC/debian/changelog
@@ -0,0 +1,35 @@
+novnc (0.4) maverick; urgency=low
+
+ * Clarify permissive licenses of HTML, CSS, images.
+ * Use render queue and requestAnimationFrame
+ * UltraVNC repeater support
+
+ -- Joel Martin Javascript Arrays Performance Test
+ Iterations: + Array Size: *1024 + + + ++ Results:
+ + + + + + + + diff --git a/noVNC/tests/arrays.js b/noVNC/tests/arrays.js new file mode 100644 index 0000000..69da7fb --- /dev/null +++ b/noVNC/tests/arrays.js @@ -0,0 +1,375 @@ +/* + * Javascript binary array performance tests + * Copyright (C) 2012 Joel Martin + * Licensed under MPL 2.0 (see LICENSE.txt) + */ + +var ctx, i, j, randlist, + new_normal, new_imageData, new_arrayBuffer, + browser = Browser.browser + " " + + Browser.version + " on " + + Browser.OS, + do_imageData = false, + do_arrayBuffer = false, + conf = { + 'create_cnt' : 2000, + 'read_cnt' : 5000000, + 'write_cnt' : 5000000, + 'iterations' : 0, + 'order_l1' : [browser], + 'order_l2' : ['normal', + 'imageData', + 'arrayBuffer'], + 'order_l3' : ['create', + 'sequentialRead', + 'randomRead', + 'sequentialWrite'] + }, + stats = {}, + testFunc = {}, + iteration, arraySize; + +var newline = "\n"; +if (Util.Engine.trident) { + var newline = "
\n"; +} +function message(str) { + //console.log(str); + cell = $D('messages'); + cell.innerHTML += str + newline; + cell.scrollTop = cell.scrollHeight; +} + +function vmessage(str) { + if (verbose) { + message(str); + } else { + console.log(str); + } +} + +new_normal = function() { + var arr = [], i; + for (i = 0; i < arraySize; i++) { + arr[i] = 0; + } + return arr; +} + +/* Will be overridden with real function */ +new_imageData = function() { + throw("imageData not supported"); +}; + +new_imageData_createImageData = function() { + var imageData = ctx.createImageData(1024/4, arraySize / 1024); + return imageData.data; +}; + +new_imageData_getImageData = function() { + var imageData = ctx.getImageData(0, 0, 1024/4, arraySize / 1024), + arr = imageData.data; + for (i = 0; i < arraySize; i++) { + arr[i] = 0; + } + return arr; +}; + +new_arrayBuffer = function() { + var arr = new ArrayBuffer(arraySize); + return new Uint8Array(arr); +} + +function init_randlist() { + randlist = []; + for (var i=0; i < arraySize; i++) { + randlist[i] = parseInt(Math.random() * 256, 10); + } +} +function copy_randlist(arr) { + for (var i=0; i < arraySize; i++) { + arr[i] = randlist[i]; + } +} + +function begin() { + var i, j; + conf.iterations = parseInt($D('iterations').value, 10); + arraySize = parseInt($D('arraySize').value, 10) * 1024; + + init_randlist(); + + // TODO: randomize test_list + + stats = {}; + for (i = 0; i < conf.order_l2.length; i++) { + stats[conf.order_l2[i]] = {}; + for (j = 0; j < conf.order_l3.length; j++) { + stats[conf.order_l2[i]][conf.order_l3[j]] = []; + } + } + + $D('startButton').value = "Running"; + $D('startButton').disabled = true; + + message("running " + conf.iterations + " test iterations"); + iteration = 1; + setTimeout(run_next_iteration, 250); +} + +function finish() { + var totalTime, arrayType, testType, times; + message("tests finished"); + + for (j = 0; j < conf.order_l3.length; j++) { + testType = conf.order_l3[j]; + message("Test '" + testType + "'"); + for (i = 0; i < conf.order_l2.length; i++) { + arrayType = conf.order_l2[i]; + message(" Array Type '" + arrayType); + times = stats[arrayType][testType]; + message(" Average : " + times.mean() + "ms" + + " (Total: " + times.sum() + "ms)"); + message(" Min/Max : " + times.min() + "ms/" + + times.max() + "ms"); + message(" StdDev : " + times.stdDev() + "ms"); + } + } + + vmessage("array_chart.py JSON data:"); + chart_data = {'conf' : conf, 'stats' : { } }; + chart_data.stats[browser] = stats; + chart_data.stats['next_browser'] = {}; + vmessage(JSON.stringify(chart_data, null, 2)); + + $D('startButton').disabled = false; + $D('startButton').value = "Run Tests"; +} + +function run_next_iteration() { + var arrayType, testType, deltaTime; + + for (i = 0; i < conf.order_l2.length; i++) { + arrayType = conf.order_l2[i]; + if (arrayType === 'imageData' && (!do_imageData)) { + continue; + } + if (arrayType === 'arrayBuffer' && (!do_arrayBuffer)) { + continue; + } + for (j = 0; j < conf.order_l3.length; j++) { + testType = conf.order_l3[j]; + + deltaTime = testFunc[arrayType + "_" + testType](); + + stats[arrayType][testType].push(deltaTime); + vmessage("test " + (arrayType + "_" + testType) + + " time: " + (deltaTime) + "ms"); + } + } + + message("finished test iteration " + iteration); + if (iteration >= conf.iterations) { + setTimeout(finish, 1); + return; + } + iteration++; + setTimeout(run_next_iteration, 1); +} + +/* + * Test functions + */ + +testFunc["normal_create"] = function() { + var cnt, arrNormal, startTime, endTime; + vmessage("create normal array " + conf.create_cnt + "x, initialized to 0"); + + startTime = (new Date()).getTime(); + for (cnt = 0; cnt < conf.create_cnt; cnt++) { + arrNormal = new_normal(); + } + endTime = (new Date()).getTime(); + + return endTime - startTime; +}; + +testFunc["imageData_create"] = function() { + var cnt, arrImage, startTime, endTime; + vmessage("create imageData array " + conf.create_cnt + "x, initialized to 0"); + + startTime = (new Date()).getTime(); + for (cnt = 0; cnt < conf.create_cnt; cnt++) { + arrImage = new_imageData(); + } + endTime = (new Date()).getTime(); + + if (arrImage[103] !== 0) { + message("Initialization failed, arrImage[103] is: " + arrImage[103]); + throw("Initialization failed, arrImage[103] is: " + arrImage[103]); + } + return endTime - startTime; +}; + +testFunc["arrayBuffer_create"] = function() { + var cnt, arrBuffer, startTime, endTime; + vmessage("create arrayBuffer array " + conf.create_cnt + "x, initialized to 0"); + + startTime = (new Date()).getTime(); + for (cnt = 0; cnt < conf.create_cnt; cnt++) { + arrBuffer = new_arrayBuffer(); + } + endTime = (new Date()).getTime(); + + if (arrBuffer[103] !== 0) { + message("Initialization failed, arrBuffer[103] is: " + arrBuffer[103]); + throw("Initialization failed, arrBuffer[103] is: " + arrBuffer[103]); + } + return endTime - startTime; +}; + +function test_sequentialRead(arr) { + var i, j, cnt, startTime, endTime; + /* Initialize the array */ + copy_randlist(arr); + + startTime = (new Date()).getTime(); + i = 0; + j = 0; + for (cnt = 0; cnt < conf.read_cnt; cnt++) { + j = arr[i]; + i++; + if (i >= arraySize) { + i = 0; + } + } + endTime = (new Date()).getTime(); + + return endTime - startTime; +} + +function test_randomRead(arr) { + var i, cnt, startTime, endTime; + /* Initialize the array */ + copy_randlist(arr); // used as jumplist + + startTime = (new Date()).getTime(); + i = 0; + for (cnt = 0; cnt < conf.read_cnt; cnt++) { + i = (arr[i] + cnt) % arraySize; + } + endTime = (new Date()).getTime(); + + return endTime - startTime; +} + +function test_sequentialWrite(arr) { + var i, cnt, startTime, endTime; + /* Initialize the array */ + copy_randlist(arr); + + startTime = (new Date()).getTime(); + i = 0; + for (cnt = 0; cnt < conf.write_cnt; cnt++) { + arr[i] = (cnt % 256); + i++; + if (i >= arraySize) { + i = 0; + } + } + endTime = (new Date()).getTime(); + + return endTime - startTime; +} + +/* Sequential Read Tests */ +testFunc["normal_sequentialRead"] = function() { + vmessage("read normal array " + conf.read_cnt + "x"); + return test_sequentialRead(new_normal()); +}; + +testFunc["imageData_sequentialRead"] = function() { + vmessage("read imageData array " + conf.read_cnt + "x"); + return test_sequentialRead(new_imageData()); +}; + +testFunc["arrayBuffer_sequentialRead"] = function() { + vmessage("read arrayBuffer array " + conf.read_cnt + "x"); + return test_sequentialRead(new_arrayBuffer()); +}; + + +/* Random Read Tests */ +testFunc["normal_randomRead"] = function() { + vmessage("read normal array " + conf.read_cnt + "x"); + return test_randomRead(new_normal()); +}; + +testFunc["imageData_randomRead"] = function() { + vmessage("read imageData array " + conf.read_cnt + "x"); + return test_randomRead(new_imageData()); +}; + +testFunc["arrayBuffer_randomRead"] = function() { + vmessage("read arrayBuffer array " + conf.read_cnt + "x"); + return test_randomRead(new_arrayBuffer()); +}; + + +/* Sequential Write Tests */ +testFunc["normal_sequentialWrite"] = function() { + vmessage("write normal array " + conf.write_cnt + "x"); + return test_sequentialWrite(new_normal()); +}; + +testFunc["imageData_sequentialWrite"] = function() { + vmessage("write imageData array " + conf.write_cnt + "x"); + return test_sequentialWrite(new_imageData()); +}; + +testFunc["arrayBuffer_sequentialWrite"] = function() { + vmessage("write arrayBuffer array " + conf.write_cnt + "x"); + return test_sequentialWrite(new_arrayBuffer()); +}; + +init = function() { + vmessage(">> init"); + + $D('iterations').value = 10; + $D('arraySize').value = 10; + arraySize = parseInt($D('arraySize').value, 10) * 1024; + + message("Browser: " + browser); + + /* Determine browser binary array support */ + try { + ctx = $D('canvas').getContext('2d'); + new_imageData = new_imageData_createImageData; + new_imageData(); + do_imageData = true; + } catch (exc) { + vmessage("createImageData not supported: " + exc); + try { + ctx = $D('canvas').getContext('2d'); + new_imageData = new_imageData_getImageData; + blah = new_imageData(); + do_imageData = true; + } catch (exc) { + vmessage("getImageData not supported: " + exc); + } + } + if (! do_imageData) { + message("imageData arrays not supported"); + } + + try { + new_arrayBuffer(); + do_arrayBuffer = true; + } catch (exc) { + vmessage("Typed Arrays not supported: " + exc); + } + if (! do_arrayBuffer) { + message("Typed Arrays (ArrayBuffers) not suppoted"); + } + vmessage("<< init"); +} diff --git a/noVNC/tests/base64.html b/noVNC/tests/base64.html new file mode 100644 index 0000000..dc45fdd --- /dev/null +++ b/noVNC/tests/base64.html @@ -0,0 +1,91 @@ + + + +
Native Base64 Tests
+ ++ Messages:
+ + +
+ + + diff --git a/noVNC/tests/base64.js b/noVNC/tests/base64.js new file mode 100644 index 0000000..6ade00a --- /dev/null +++ b/noVNC/tests/base64.js @@ -0,0 +1,12 @@ +// The following results in 'hello [MANGLED]' +// +// Filed as https://github.com/ry/node/issues/issue/402 + +var sys = require("sys"), + buf = new Buffer(1024), len, + str1 = "aGVsbG8g", // 'hello ' + str2 = "d29ybGQ=", // 'world' + +len = buf.write(str1, 0, 'base64'); +len += buf.write(str2, len, 'base64'); +sys.log("decoded result: " + buf.toString('binary', 0, len)); diff --git a/noVNC/tests/browser.js b/noVNC/tests/browser.js new file mode 100644 index 0000000..7cf8279 --- /dev/null +++ b/noVNC/tests/browser.js @@ -0,0 +1,134 @@ +/* + * From: + * http://www.quirksmode.org/js/detect.html + */ + +var Browser = { + init: function () { + this.browser = this.searchString(this.dataBrowser) || "An unknown browser"; + this.version = this.searchVersion(navigator.userAgent) + || this.searchVersion(navigator.appVersion) + || "an unknown version"; + this.majorVersion = this.searchMajorVersion(navigator.userAgent) + || this.searchMajorVersion(navigator.appVersion) + || "an unknown version"; + this.fullVersion = this.searchFullVersion(navigator.userAgent) + || this.searchFullVersion(navigator.appVersion) + || "an unknown version"; + this.OS = this.searchString(this.dataOS) || "an unknown OS"; + }, + searchString: function (data) { + for (var i=0;i
+ + Canvas (should see three squares and two happy faces):
+ + +
+ Results:
+ + + + + diff --git a/noVNC/tests/cursor.html b/noVNC/tests/cursor.html new file mode 100644 index 0000000..91e621b --- /dev/null +++ b/noVNC/tests/cursor.html @@ -0,0 +1,135 @@ + + + +
Roll over the buttons to test cursors
++ + + +
+
+
+ Debug:
+ +
+
+ + + + + diff --git a/noVNC/tests/face.png b/noVNC/tests/face.png new file mode 100644 index 0000000..74c30d8 Binary files /dev/null and b/noVNC/tests/face.png differ diff --git a/noVNC/tests/face.png.js b/noVNC/tests/face.png.js new file mode 100644 index 0000000..e0b5d6c --- /dev/null +++ b/noVNC/tests/face.png.js @@ -0,0 +1 @@ +var face64 = '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'; diff --git a/noVNC/tests/input.html b/noVNC/tests/input.html new file mode 100644 index 0000000..bc5d2e1 --- /dev/null +++ b/noVNC/tests/input.html @@ -0,0 +1,131 @@ + + +
+ + Canvas: + +
+ + +
+ Results:
+ + + + + + + + + + + + + diff --git a/noVNC/tests/keyboard-tests.html b/noVNC/tests/keyboard-tests.html new file mode 100644 index 0000000..a30aa6e --- /dev/null +++ b/noVNC/tests/keyboard-tests.html @@ -0,0 +1,29 @@ + + + + +
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/noVNC/tests/vnc_perf.html b/noVNC/tests/vnc_perf.html
new file mode 100644
index 0000000..18aba35
--- /dev/null
+++ b/noVNC/tests/vnc_perf.html
@@ -0,0 +1,209 @@
+
+
+
+
+ Canvas:
+
+
+
+ +
+
+
+
+ +
+
+ Results:
+ +
+ + Results:
+ +
+ + Results:
+ + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/noVNC/tests/vnc_playback.html b/noVNC/tests/vnc_playback.html
new file mode 100644
index 0000000..9d7f31f
--- /dev/null
+++ b/noVNC/tests/vnc_playback.html
@@ -0,0 +1,138 @@
+
+
+
+ + + Results:
+ + +
+ +
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/noVNC/utils/Makefile b/noVNC/utils/Makefile
new file mode 100644
index 0000000..7dc1bc4
--- /dev/null
+++ b/noVNC/utils/Makefile
@@ -0,0 +1,11 @@
+TARGETS=rebind.so
+CFLAGS += -fPIC
+
+all: $(TARGETS)
+
+rebind.so: rebind.o
+ $(CC) $(LDFLAGS) $^ -shared -fPIC -ldl -o $@
+
+clean:
+ rm -f rebind.o rebind.so
+
diff --git a/noVNC/utils/README.md b/noVNC/utils/README.md
new file mode 100644
index 0000000..b90a387
--- /dev/null
+++ b/noVNC/utils/README.md
@@ -0,0 +1,10 @@
+## WebSockets Proxy/Bridge
+
+For more detailed description and usage information please refer to
+the [websockify README](https://github.com/kanaka/websockify/blob/master/README.md).
+
+The other versions of websockify (C, Node.js) and the associated test
+programs have been moved to
+[websockify](https://github.com/kanaka/websockify). Websockify was
+formerly named wsproxy.
+
diff --git a/noVNC/utils/img2js.py b/noVNC/utils/img2js.py
new file mode 100755
index 0000000..4d21342
--- /dev/null
+++ b/noVNC/utils/img2js.py
@@ -0,0 +1,40 @@
+#!/usr/bin/env python
+
+#
+# Convert image to Javascript compatible base64 Data URI
+# Copyright 2011 Joel Martin
+# Licensed under MPL 2.0 (see docs/LICENSE.MPL-2.0)
+#
+
+import sys, base64
+
+try:
+ from PIL import Image
+except:
+ print "python PIL module required (python-imaging package)"
+ sys.exit(1)
+
+
+if len(sys.argv) < 3:
+ print "Usage: %s IMAGE JS_VARIABLE" % sys.argv[0]
+ sys.exit(1)
+
+fname = sys.argv[1]
+var = sys.argv[2]
+
+ext = fname.lower().split('.')[-1]
+if ext == "png": mime = "image/png"
+elif ext in ["jpg", "jpeg"]: mime = "image/jpeg"
+elif ext == "gif": mime = "image/gif"
+else:
+ print "Only PNG, JPEG and GIF images are supported"
+ sys.exit(1)
+uri = "data:%s;base64," % mime
+
+im = Image.open(fname)
+w, h = im.size
+
+raw = open(fname).read()
+
+print '%s = {"width": %s, "height": %s, "data": "%s%s"};' % (
+ var, w, h, uri, base64.b64encode(raw))
diff --git a/noVNC/utils/json2graph.py b/noVNC/utils/json2graph.py
new file mode 100755
index 0000000..f9ae27d
--- /dev/null
+++ b/noVNC/utils/json2graph.py
@@ -0,0 +1,206 @@
+#!/usr/bin/env python
+
+'''
+Use matplotlib to generate performance charts
+Copyright 2011 Joel Martin
+Licensed under MPL-2.0 (see docs/LICENSE.MPL-2.0)
+'''
+
+# a bar plot with errorbars
+import sys, json, pprint
+import numpy as np
+import matplotlib.pyplot as plt
+from matplotlib.font_manager import FontProperties
+
+def usage():
+ print "%s json_file level1 level2 level3 [legend_height]\n\n" % sys.argv[0]
+ print "Description:\n"
+ print "level1, level2, and level3 are one each of the following:\n";
+ print " select=ITEM - select only ITEM at this level";
+ print " bar - each item on this level becomes a graph bar";
+ print " group - items on this level become groups of bars";
+ print "\n";
+ print "json_file is a file containing json data in the following format:\n"
+ print ' {';
+ print ' "conf": {';
+ print ' "order_l1": [';
+ print ' "level1_label1",';
+ print ' "level1_label2",';
+ print ' ...';
+ print ' ],';
+ print ' "order_l2": [';
+ print ' "level2_label1",';
+ print ' "level2_label2",';
+ print ' ...';
+ print ' ],';
+ print ' "order_l3": [';
+ print ' "level3_label1",';
+ print ' "level3_label2",';
+ print ' ...';
+ print ' ]';
+ print ' },';
+ print ' "stats": {';
+ print ' "level1_label1": {';
+ print ' "level2_label1": {';
+ print ' "level3_label1": [val1, val2, val3],';
+ print ' "level3_label2": [val1, val2, val3],';
+ print ' ...';
+ print ' },';
+ print ' "level2_label2": {';
+ print ' ...';
+ print ' },';
+ print ' },';
+ print ' "level1_label2": {';
+ print ' ...';
+ print ' },';
+ print ' ...';
+ print ' },';
+ print ' }';
+ sys.exit(2)
+
+def error(msg):
+ print msg
+ sys.exit(1)
+
+
+#colors = ['#ff0000', '#0863e9', '#00f200', '#ffa100',
+# '#800000', '#805100', '#013075', '#007900']
+colors = ['#ff0000', '#00ff00', '#0000ff',
+ '#dddd00', '#dd00dd', '#00dddd',
+ '#dd6622', '#dd2266', '#66dd22',
+ '#8844dd', '#44dd88', '#4488dd']
+
+if len(sys.argv) < 5:
+ usage()
+
+filename = sys.argv[1]
+L1 = sys.argv[2]
+L2 = sys.argv[3]
+L3 = sys.argv[4]
+if len(sys.argv) > 5:
+ legendHeight = float(sys.argv[5])
+else:
+ legendHeight = 0.75
+
+# Load the JSON data from the file
+data = json.loads(file(filename).read())
+conf = data['conf']
+stats = data['stats']
+
+# Sanity check data hierarchy
+if len(conf['order_l1']) != len(stats.keys()):
+ error("conf.order_l1 does not match stats level 1")
+for l1 in stats.keys():
+ if len(conf['order_l2']) != len(stats[l1].keys()):
+ error("conf.order_l2 does not match stats level 2 for %s" % l1)
+ if conf['order_l1'].count(l1) < 1:
+ error("%s not found in conf.order_l1" % l1)
+ for l2 in stats[l1].keys():
+ if len(conf['order_l3']) != len(stats[l1][l2].keys()):
+ error("conf.order_l3 does not match stats level 3")
+ if conf['order_l2'].count(l2) < 1:
+ error("%s not found in conf.order_l2" % l2)
+ for l3 in stats[l1][l2].keys():
+ if conf['order_l3'].count(l3) < 1:
+ error("%s not found in conf.order_l3" % l3)
+
+#
+# Generate the data based on the level specifications
+#
+bar_labels = None
+group_labels = None
+bar_vals = []
+bar_sdvs = []
+if L3.startswith("select="):
+ select_label = l3 = L3.split("=")[1]
+ bar_labels = conf['order_l1']
+ group_labels = conf['order_l2']
+ bar_vals = [[0]*len(group_labels) for i in bar_labels]
+ bar_sdvs = [[0]*len(group_labels) for i in bar_labels]
+ for b in range(len(bar_labels)):
+ l1 = bar_labels[b]
+ for g in range(len(group_labels)):
+ l2 = group_labels[g]
+ bar_vals[b][g] = np.mean(stats[l1][l2][l3])
+ bar_sdvs[b][g] = np.std(stats[l1][l2][l3])
+elif L2.startswith("select="):
+ select_label = l2 = L2.split("=")[1]
+ bar_labels = conf['order_l1']
+ group_labels = conf['order_l3']
+ bar_vals = [[0]*len(group_labels) for i in bar_labels]
+ bar_sdvs = [[0]*len(group_labels) for i in bar_labels]
+ for b in range(len(bar_labels)):
+ l1 = bar_labels[b]
+ for g in range(len(group_labels)):
+ l3 = group_labels[g]
+ bar_vals[b][g] = np.mean(stats[l1][l2][l3])
+ bar_sdvs[b][g] = np.std(stats[l1][l2][l3])
+elif L1.startswith("select="):
+ select_label = l1 = L1.split("=")[1]
+ bar_labels = conf['order_l2']
+ group_labels = conf['order_l3']
+ bar_vals = [[0]*len(group_labels) for i in bar_labels]
+ bar_sdvs = [[0]*len(group_labels) for i in bar_labels]
+ for b in range(len(bar_labels)):
+ l2 = bar_labels[b]
+ for g in range(len(group_labels)):
+ l3 = group_labels[g]
+ bar_vals[b][g] = np.mean(stats[l1][l2][l3])
+ bar_sdvs[b][g] = np.std(stats[l1][l2][l3])
+else:
+ usage()
+
+# If group is before bar then flip (zip) the data
+if [L1, L2, L3].index("group") < [L1, L2, L3].index("bar"):
+ bar_labels, group_labels = group_labels, bar_labels
+ bar_vals = zip(*bar_vals)
+ bar_sdvs = zip(*bar_sdvs)
+
+print "bar_vals:", bar_vals
+
+#
+# Now render the bar graph
+#
+ind = np.arange(len(group_labels)) # the x locations for the groups
+width = 0.8 * (1.0/len(bar_labels)) # the width of the bars
+
+fig = plt.figure(figsize=(10,6), dpi=80)
+plot = fig.add_subplot(1, 1, 1)
+
+rects = []
+for i in range(len(bar_vals)):
+ rects.append(plot.bar(ind+width*i, bar_vals[i], width, color=colors[i],
+ yerr=bar_sdvs[i], align='center'))
+
+# add some
+plot.set_ylabel('Milliseconds (less is better)')
+plot.set_title("Javascript array test: %s" % select_label)
+plot.set_xticks(ind+width)
+plot.set_xticklabels( group_labels )
+
+fontP = FontProperties()
+fontP.set_size('small')
+plot.legend( [r[0] for r in rects], bar_labels, prop=fontP,
+ loc = 'center right', bbox_to_anchor = (1.0, legendHeight))
+
+def autolabel(rects):
+ # attach some text labels
+ for rect in rects:
+ height = rect.get_height()
+ if np.isnan(height):
+ height = 0.0
+ plot.text(rect.get_x()+rect.get_width()/2., height+20, '%d'%int(height),
+ ha='center', va='bottom', size='7')
+
+for rect in rects:
+ autolabel(rect)
+
+# Adjust axis sizes
+axis = list(plot.axis())
+axis[0] = -width # Make sure left side has enough for bar
+#axis[1] = axis[1] * 1.20 # Add 20% to the right to make sure it fits
+axis[2] = 0 # Make y-axis start at 0
+axis[3] = axis[3] * 1.10 # Add 10% to the top
+plot.axis(axis)
+
+plt.show()
diff --git a/noVNC/utils/launch.sh b/noVNC/utils/launch.sh
new file mode 100755
index 0000000..1581f17
--- /dev/null
+++ b/noVNC/utils/launch.sh
@@ -0,0 +1,118 @@
+#!/usr/bin/env bash
+
+usage() {
+ if [ "$*" ]; then
+ echo "$*"
+ echo
+ fi
+ echo "Usage: ${NAME} [--listen PORT] [--vnc VNC_HOST:PORT] [--cert CERT]"
+ echo
+ echo "Starts the WebSockets proxy and a mini-webserver and "
+ echo "provides a cut-and-paste URL to go to."
+ echo
+ echo " --listen PORT Port for proxy/webserver to listen on"
+ echo " Default: 6080"
+ echo " --vnc VNC_HOST:PORT VNC server host:port proxy target"
+ echo " Default: localhost:5900"
+ echo " --cert CERT Path to combined cert/key file"
+ echo " Default: self.pem"
+ echo " --web WEB Path to web files (e.g. vnc.html)"
+ echo " Default: ./"
+ exit 2
+}
+
+NAME="$(basename $0)"
+HERE="$(cd "$(dirname "$0")" && pwd)"
+PORT="6080"
+VNC_DEST="localhost:5900"
+CERT=""
+WEB=""
+proxy_pid=""
+
+die() {
+ echo "$*"
+ exit 1
+}
+
+cleanup() {
+ trap - TERM QUIT INT EXIT
+ trap "true" CHLD # Ignore cleanup messages
+ echo
+ if [ -n "${proxy_pid}" ]; then
+ echo "Terminating WebSockets proxy (${proxy_pid})"
+ kill ${proxy_pid}
+ fi
+}
+
+# Process Arguments
+
+# Arguments that only apply to chrooter itself
+while [ "$*" ]; do
+ param=$1; shift; OPTARG=$1
+ case $param in
+ --listen) PORT="${OPTARG}"; shift ;;
+ --vnc) VNC_DEST="${OPTARG}"; shift ;;
+ --cert) CERT="${OPTARG}"; shift ;;
+ --web) WEB="${OPTARG}"; shift ;;
+ -h|--help) usage ;;
+ -*) usage "Unknown chrooter option: ${param}" ;;
+ *) break ;;
+ esac
+done
+
+# Sanity checks
+which netstat >/dev/null 2>&1 \
+ || die "Must have netstat installed"
+
+netstat -ltn | grep -qs "${PORT} .*LISTEN" \
+ && die "Port ${PORT} in use. Try --listen PORT"
+
+trap "cleanup" TERM QUIT INT EXIT
+
+# Find vnc.html
+if [ -n "${WEB}" ]; then
+ if [ ! -e "${WEB}/vnc.html" ]; then
+ die "Could not find ${WEB}/vnc.html"
+ fi
+elif [ -e "$(pwd)/vnc.html" ]; then
+ WEB=$(pwd)
+elif [ -e "${HERE}/../vnc.html" ]; then
+ WEB=${HERE}/../
+elif [ -e "${HERE}/vnc.html" ]; then
+ WEB=${HERE}
+elif [ -e "${HERE}/../share/novnc/vnc.html" ]; then
+ WEB=${HERE}/../share/novnc/
+else
+ die "Could not find vnc.html"
+fi
+
+# Find self.pem
+if [ -n "${CERT}" ]; then
+ if [ ! -e "${CERT}" ]; then
+ die "Could not find ${CERT}"
+ fi
+elif [ -e "$(pwd)/self.pem" ]; then
+ CERT="$(pwd)/self.pem"
+elif [ -e "${HERE}/../self.pem" ]; then
+ CERT="${HERE}/../self.pem"
+elif [ -e "${HERE}/self.pem" ]; then
+ CERT="${HERE}/self.pem"
+else
+ echo "Warning: could not find self.pem"
+fi
+
+echo "Starting webserver and WebSockets proxy on port ${PORT}"
+${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
+proxy_pid="$!"
+sleep 1
+if ! ps -p ${proxy_pid} >/dev/null; then
+ proxy_pid=
+ echo "Failed to start WebSockets proxy"
+ exit 1
+fi
+
+echo -e "\n\nNavigate to this URL:\n"
+echo -e " http://$(hostname):${PORT}/vnc.html?host=$(hostname)&port=${PORT}\n"
+echo -e "Press Ctrl-C to exit\n\n"
+
+wait ${proxy_pid}
diff --git a/noVNC/utils/nova-novncproxy b/noVNC/utils/nova-novncproxy
new file mode 100755
index 0000000..7e5afbd
--- /dev/null
+++ b/noVNC/utils/nova-novncproxy
@@ -0,0 +1,152 @@
+#!/usr/bin/env python
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2012 Openstack, LLC.
+# All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+#!/usr/bin/env python
+
+'''
+Websocket proxy that is compatible with Openstack Nova.
+Leverages websockify by Joel Martin
+'''
+
+import Cookie
+from oslo.config import cfg
+import socket
+import sys
+
+import websockify
+
+from nova import config
+from nova import context
+from nova import utils
+from nova.openstack.common import rpc
+
+
+opts = [
+ cfg.BoolOpt('record',
+ default=False,
+ help='Record sessions to FILE.[session_number]'),
+ cfg.BoolOpt('daemon',
+ default=False,
+ help='Become a daemon (background process)'),
+ cfg.BoolOpt('ssl_only',
+ default=False,
+ help='Disallow non-encrypted connections'),
+ cfg.BoolOpt('source_is_ipv6',
+ default=False,
+ help='Source is ipv6'),
+ cfg.StrOpt('cert',
+ default='self.pem',
+ help='SSL certificate file'),
+ cfg.StrOpt('key',
+ default=None,
+ help='SSL key file (if separate from cert)'),
+ cfg.StrOpt('web',
+ default='.',
+ help='Run webserver on same port. Serve files from DIR.'),
+ cfg.StrOpt('novncproxy_host',
+ default='0.0.0.0',
+ help='Host on which to listen for incoming requests'),
+ cfg.IntOpt('novncproxy_port',
+ default=6080,
+ help='Port on which to listen for incoming requests'),
+ ]
+CONF = cfg.CONF
+CONF.register_cli_opts(opts)
+
+# As of nova commit 0b11668e64450039dc071a4a123abd02206f865f we must
+# manually register the rpc library
+if hasattr(rpc, 'register_opts'):
+ rpc.register_opts(CONF)
+
+
+class NovaWebSocketProxy(websockify.WebSocketProxy):
+ def __init__(self, *args, **kwargs):
+ websockify.WebSocketProxy.__init__(self, *args, **kwargs)
+
+ def new_client(self):
+ """
+ Called after a new WebSocket connection has been established.
+ """
+ cookie = Cookie.SimpleCookie()
+ cookie.load(self.headers.getheader('cookie'))
+ token = cookie['token'].value
+ ctxt = context.get_admin_context()
+ connect_info = rpc.call(ctxt, 'consoleauth',
+ {'method': 'check_token',
+ 'args': {'token': token}})
+
+ if not connect_info:
+ raise Exception("Invalid Token")
+
+ host = connect_info['host']
+ port = int(connect_info['port'])
+
+ # Connect to the target
+ self.msg("connecting to: %s:%s" % (
+ host, port))
+ tsock = self.socket(host, port,
+ connect=True)
+
+ # Handshake as necessary
+ if connect_info.get('internal_access_path'):
+ tsock.send("CONNECT %s HTTP/1.1\r\n\r\n" %
+ connect_info['internal_access_path'])
+ while True:
+ data = tsock.recv(4096, socket.MSG_PEEK)
+ if data.find("\r\n\r\n") != -1:
+ if not data.split("\r\n")[0].find("200"):
+ raise Exception("Invalid Connection Info")
+ tsock.recv(len(data))
+ break
+
+ if self.verbose and not self.daemon:
+ print(self.traffic_legend)
+
+ # Start proxying
+ try:
+ self.do_proxy(tsock)
+ except:
+ if tsock:
+ tsock.shutdown(socket.SHUT_RDWR)
+ tsock.close()
+ self.vmsg("%s:%s: Target closed" % (host, port))
+ raise
+
+
+if __name__ == '__main__':
+ if CONF.ssl_only and not os.path.exists(CONF.cert):
+ parser.error("SSL only and %s not found" % CONF.cert)
+
+ # Setup flags
+ config.parse_args(sys.argv)
+
+ # Create and start the NovaWebSockets proxy
+ server = NovaWebSocketProxy(listen_host=CONF.novncproxy_host,
+ listen_port=CONF.novncproxy_port,
+ source_is_ipv6=CONF.source_is_ipv6,
+ verbose=CONF.verbose,
+ cert=CONF.cert,
+ key=CONF.key,
+ ssl_only=CONF.ssl_only,
+ daemon=CONF.daemon,
+ record=CONF.record,
+ web=CONF.web,
+ target_host='ignore',
+ target_port='ignore',
+ wrap_mode='exit',
+ wrap_cmd=None)
+ server.start_server()
diff --git a/noVNC/utils/parse.js b/noVNC/utils/parse.js
new file mode 100644
index 0000000..02ac66c
--- /dev/null
+++ b/noVNC/utils/parse.js
@@ -0,0 +1,97 @@
+// Utility to parse keysymdef.h to produce mappings from Unicode codepoints to keysyms
+"use strict";
+
+var fs = require('fs');
+
+var show_help = process.argv.length === 2;
+var use_keynames = false;
+var filename;
+
+for (var i = 2; i < process.argv.length; ++i) {
+ switch (process.argv[i]) {
+ case "--help":
+ case "-h":
+ show_help = true;
+ break;
+ case "--debug-names":
+ case "-d":
+ use_keynames = true;
+ break;
+ case "--file":
+ case "-f":
+ default:
+ filename = process.argv[i];
+ }
+}
+
+if (!filename) {
+ show_help = true;
+ console.log("Error: No filename specified\n");
+}
+
+if (show_help) {
+ console.log("Parses a *nix keysymdef.h to generate Unicode code point mappings");
+ console.log("Usage: node parse.js [options] filename:");
+ console.log(" -h [ --help ] Produce this help message");
+ console.log(" -d [ --debug-names ] Preserve keysym names for debugging (Increases file size by ~40KB)");
+ console.log(" filename The keysymdef.h file to parse");
+ return;
+}
+
+// Set this to false to omit key names from the generated keysymdef.js
+// This reduces the file size by around 40kb, but may hinder debugging
+
+var buf = fs.readFileSync(filename);
+var str = buf.toString('utf8');
+
+var re = /^\#define XK_([a-zA-Z_0-9]+)\s+0x([0-9a-fA-F]+)\s*(\/\*\s*(.*)\s*\*\/)?\s*$/m;
+
+var arr = str.split('\n');
+
+var keysyms = {};
+var codepoints = {};
+
+for (var i = 0; i < arr.length; ++i) {
+ var result = re.exec(arr[i]);
+ if (result){
+ var keyname = result[1];
+ var keysym = parseInt(result[2], 16);
+ var remainder = result[3];
+
+ keysyms[keysym] = keyname;
+
+ var unicodeRes = /U\+([0-9a-fA-F]+)/.exec(remainder);
+ if (unicodeRes) {
+ var unicode = parseInt(unicodeRes[1], 16);
+ if (!codepoints[unicode]){
+ codepoints[unicode] = keysym;
+ }
+ }
+ else {
+ console.log("no unicode codepoint found:", arr[i]);
+ }
+ }
+ else {
+ console.log("line is not a keysym:", arr[i]);
+ }
+}
+
+var out = "// This file describes mappings from Unicode codepoints to the keysym values\n" +
+"// (and optionally, key names) expected by the RFB protocol\n" +
+"// How this file was generated:\n" +
+"// " + process.argv.join(" ") + "\n" +
+"var keysyms = (function(){\n" +
+" \"use strict\";\n" +
+" var keynames = {keysyms};\n" +
+" var codepoints = {codepoints};\n" +
+"\n" +
+" function lookup(k) { return k ? {keysym: k, keyname: keynames ? keynames[k] : k} : undefined; }\n" +
+" return {\n" +
+" fromUnicode : function(u) { return lookup(codepoints[u]); },\n" +
+" lookup : lookup\n" +
+" };\n" +
+"})();\n";
+out = out.replace('{keysyms}', use_keynames ? JSON.stringify(keysyms) : "null");
+out = out.replace('{codepoints}', JSON.stringify(codepoints));
+
+fs.writeFileSync("keysymdef.js", out);
diff --git a/noVNC/utils/rebind b/noVNC/utils/rebind
new file mode 100755
index 0000000..2289aaa
--- /dev/null
+++ b/noVNC/utils/rebind
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+usage() {
+ echo "Usage: $(basename $0) OLD_PORT NEW_PORT COMMAND_LINE"
+ echo
+ echo "Launch COMMAND_LINE, but intercept system calls to bind"
+ echo "to OLD_PORT and instead bind them to localhost:NEW_PORT"
+ exit 2
+}
+
+# Parameter defaults
+mydir=$(readlink -f $(dirname ${0}))
+
+export REBIND_PORT_OLD="${1}"; shift
+export REBIND_PORT_NEW="${1}"; shift
+
+LD_PRELOAD=${mydir}/rebind.so "${@}"
+
diff --git a/noVNC/utils/rebind.c b/noVNC/utils/rebind.c
new file mode 100644
index 0000000..69b9ff9
--- /dev/null
+++ b/noVNC/utils/rebind.c
@@ -0,0 +1,94 @@
+/*
+ * rebind: Intercept bind calls and bind to a different port
+ * Copyright 2010 Joel Martin
+ * Licensed under MPL-2.0 (see docs/LICENSE.MPL-2.0)
+ *
+ * Overload (LD_PRELOAD) bind system call. If REBIND_PORT_OLD and
+ * REBIND_PORT_NEW environment variables are set then bind on the new
+ * port (of localhost) instead of the old port.
+ *
+ * This allows a bridge/proxy (such as websockify) to run on the old port and
+ * translate traffic to/from the new port.
+ *
+ * Usage:
+ * LD_PRELOAD=./rebind.so \
+ * REBIND_PORT_OLD=23 \
+ * REBIND_PORT_NEW=2023 \
+ * program
+ */
+
+//#define DO_DEBUG 1
+
+#include
+
+
+
+
+
+
+
+ Loading
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ +
+
+
+ + +
+
+
+
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+ no
+
+
+
+
+
+
+
+
diff --git a/noVNC/vnc_auto.html b/noVNC/vnc_auto.html
new file mode 100644
index 0000000..53b8220
--- /dev/null
+++ b/noVNC/vnc_auto.html
@@ -0,0 +1,209 @@
+
+
+
+
+
+ no
VNC
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/screenshots/lxde.png b/screenshots/lxde.png
new file mode 100644
index 0000000..a59cd8d
Binary files /dev/null and b/screenshots/lxde.png differ
diff --git a/supervisord.conf b/supervisord.conf
index d3d1d96..1a6b2c0 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -44,3 +44,14 @@ autorestart=true
stopsignal=QUIT
stdout_logfile=/var/log/x11vnc.log
stderr_logfile=/var/log/x11vnc.err
+
+[program:novnc]
+priority=25
+directory=/noVNC
+command=/noVNC/utils/launch.sh
+user=root
+autostart=true
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/novnc.log
+stderr_logfile=/var/log/novnc.err