Remove references to wsproxy.

Also, update nova-novncproxy to import websockify instead of wsproxy.
This commit is contained in:
Joel Martin 2013-04-15 12:22:34 -05:00
parent 7dc038efd9
commit 7c1cd93744
7 changed files with 14 additions and 17 deletions

1
.gitignore vendored
View File

@ -1,5 +1,4 @@
*.pyc
*.o
wsproxy
tests/data_*.js
utils/rebind.so

View File

@ -6,7 +6,6 @@ utils/Makefile /usr/share/novnc/utils
utils/launch.sh /usr/share/novnc/utils
utils/websocket.py /usr/share/novnc/utils
utils/websockify /usr/share/novnc/utils
utils/wsproxy.py /usr/share/novnc/utils
utils/rebind.c /usr/share/novnc/utils
utils/rebind.so /usr/share/novnc/utils
images /usr/share/novnc

View File

@ -8,7 +8,7 @@ Javascript doesn't have a bytearray type, so what you get out of
a WebSocket object is just Javascript strings. Javascript has UTF-16
unicode strings and anything sent through the WebSocket gets converted
to UTF-8 and vice-versa. So, one additional (and necessary) function
of wsproxy is base64 encoding/decoding what is sent to/from the
of websockify is base64 encoding/decoding what is sent to/from the
browser.
Building web-socket-js emulator:

View File

@ -1,11 +1,10 @@
## WebSockets Proxy
wsproxy has become [websockify](https://github.com/kanaka/websockify).
A copy of the python version of websockify (named wsproxy.py) is kept
here for ease of use. The other versions of websockify (C, Node.js)
and the associated test programs have been moved to
[websockify](https://github.com/kanaka/websockify).
## 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.

View File

@ -102,7 +102,7 @@ else
fi
echo "Starting webserver and WebSockets proxy on port ${PORT}"
${HERE}/wsproxy.py --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
${HERE}/websockify --web ${WEB} ${CERT:+--cert ${CERT}} ${PORT} ${VNC_DEST} &
proxy_pid="$!"
sleep 1
if ! ps -p ${proxy_pid} >/dev/null; then

View File

@ -19,7 +19,7 @@
'''
Websocket proxy that is compatible with Openstack Nova.
Leverages wsproxy.py by Joel Martin
Leverages websockify by Joel Martin
'''
import Cookie
@ -27,7 +27,7 @@ from oslo.config import cfg
import socket
import sys
import wsproxy
import websockify
from nova import config
from nova import context
@ -73,9 +73,9 @@ if hasattr(rpc, 'register_opts'):
rpc.register_opts(CONF)
class NovaWebSocketProxy(wsproxy.WebSocketProxy):
class NovaWebSocketProxy(websockify.WebSocketProxy):
def __init__(self, *args, **kwargs):
wsproxy.WebSocketProxy.__init__(self, *args, **kwargs)
websockify.WebSocketProxy.__init__(self, *args, **kwargs)
def new_client(self):
"""

View File

@ -7,8 +7,8 @@
* REBIND_PORT_NEW environment variables are set then bind on the new
* port (of localhost) instead of the old port.
*
* This allows a proxy (such as wsproxy) to run on the old port and translate
* traffic to/from the new 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 \