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

Merge branch 'merge_kevinykchan' 

Conflicts:
	wsproxy.py

Fix auth mode selection typo.
This commit is contained in:
Joel Martin 2010-05-11 09:23:55 -05:00
parent 2cec49d439 3ec5d7c0a3
commit 4ce2696d52
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vnc.js
View File

@ -267,9 +267,9 @@ init_msg: function () {
} }
if (RFB.password.length == 0) { if (RFB.password.length == 0) {
RFB.auth_scheme = 1; RFB.auth_scheme = 1;
} else { } else {
RFB.auth_scheme = type[0]; RFB.auth_scheme = types[0];
} }
RFB.send_array([RFB.auth_scheme]); RFB.send_array([RFB.auth_scheme]);
} else if (RFB.version == 3.3) { } else if (RFB.version == 3.3) {

4
wsproxy.py
View File

@ -9,7 +9,7 @@ as taken from http://docs.python.org/dev/library/ssl.html#certificates
''' '''
import sys, socket, ssl import sys, socket, ssl, time
from select import select from select import select
from websocket import * from websocket import *
@ -35,6 +35,8 @@ def do_proxy(client, target):
socks = [client, target] socks = [client, target]
while True: while True:
time.sleep(0.01) # 10ms
ins, outs, excepts = select(socks, socks, socks, 1) ins, outs, excepts = select(socks, socks, socks, 1)
if excepts: raise Exception("Socket exception") if excepts: raise Exception("Socket exception")