joshua
/
websockify
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

wstest*. Fix Opera problems. Flash policy. Misc bugs. 

Lame. Opera doesn't support javascript reduce().

Also, Opera seems to just plain be pathetic when it comes to
delivering the web-socket-js events. Around 1/5 to 1/3 of all received
packets are never received as an event at all.

- Change default delay for send side to 10ms.

- Use a textarea for errors so that even without console.* support
  (ala firebug) we still see the errors that are happening.
This commit is contained in:
Joel Martin 2010-04-19 10:41:06 -05:00
parent 9e12c1a941
commit 1e633bc8ee
2 changed files with 48 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
wstest.html
View File

@ -24,14 +24,30 @@
</tr>
</table>
<br>
Errors:<br>
<textarea id="error" style="font-size: 9;" cols=80 rows=25></textarea>
</body>
<!-- Uncomment to activate firebug lite -->
<!--
<script type='text/javascript'
src='http://getfirebug.com/releases/lite/1.2/firebug-lite-compressed.js'></script>
-->
<script src="include/mootools.js"></script>
<script src="include/base64.js"></script>
<script src="include/util.js"></script>
<script>
function error(str) {
cell = $('error');
cell.innerHTML += errors + ": " + str + "\n";
cell.scrollTop = cell.scrollHeight;
}
var host = null, port = null, sendDelay = 0;
var ws = null, update_ref = null, send_ref = null;
var sent = 0, received = 0, errors = 0;
@ -59,13 +75,13 @@
last = String.fromCharCode(decoded.pop());
if (first != "^") {
console.error("Packet missing start char '^'");
errors++;
error("Packet missing start char '^'");
return;
}
if (last != "$") {
console.error("Packet missing end char '$'");
errors++;
error("Packet missing end char '$'");
return;
}
arr = decoded.map(function(num) {
@ -74,24 +90,29 @@
cnt = arr[0];
length = arr[1];
chksum = arr[2];
nums = arr[3];
nums = arr[3];
//console.log(" length:" + length + " chksum:" + chksum + " nums:" + nums);
if (cnt != recv_cnt) {
console.error("Expected count " + recv_cnt + " but got " + cnt);
recv_cnt = parseInt(cnt,10) + 1; // Back on track
errors++;
error("Expected count " + recv_cnt + " but got " + cnt);
recv_cnt = parseInt(cnt,10) + 1; // Back on track
return;
}
recv_cnt++;
if (nums.length != length) {
console.error("Expected length " + length + " but got " + nums.length);
errors++;
error("Expected length " + length + " but got " + nums.length);
return;
}
real_chksum = nums.split('').reduce(add);
//real_chksum = nums.reduce(add);
real_chksum = 0;
for (var i=0; i < nums.length; i++) {
real_chksum += parseInt(nums.charAt(i), 10);
}
if (real_chksum != chksum) {
console.error("Expected chksum " + chksum + " but real chksum is " + real_chksum);
errors++
error("Expected chksum " + chksum + " but real chksum is " + real_chksum);
return;
}
received++;
@ -109,7 +130,11 @@
for (var i=0; i < length; i++) {
numlist.push( Math.floor(Math.random()*10) );
}
chksum = numlist.reduce(add);
//chksum = numlist.reduce(add);
chksum = 0;
for (var i=0; i < numlist.length; i++) {
chksum += parseInt(numlist[i], 10);
}
var nums = numlist.join('');
arr.pushStr("^" + send_cnt + ":" + length + ":" + chksum + ":" + nums + "$")
send_cnt ++;
@ -191,14 +216,14 @@
/* If no builtin websockets then load web_socket.js */
if (! window.WebSocket) {
console.log("Loading web-socket-js flash bridge");
var extra = "<script src='web-socket-js/swfobject.js'><\/script>";
extra += "<script src='web-socket-js/FABridge.js'><\/script>";
extra += "<script src='web-socket-js/web_socket.js'><\/script>";
var extra = "<script src='include/web-socket-js/swfobject.js'><\/script>";
extra += "<script src='include/web-socket-js/FABridge.js'><\/script>";
extra += "<script src='include/web-socket-js/web_socket.js'><\/script>";
document.write(extra);
}
window.onload = function() {
WebSocket.__swfLocation = "web-socket-js/WebSocketMain.swf";
WebSocket.__swfLocation = "include/web-socket-js/WebSocketMain.swf";
console.log("onload");
var url = document.location.href;
$('host').value = (url.match(/host=([^&#]*)/) || ['',''])[1];

18
wstest.py
View File

@ -18,19 +18,20 @@ WebSocket-Protocol: sample\r
policy_response = """<cross-domain-policy><allow-access-from domain="*" to-ports="*" /></cross-domain-policy>"""
def handshake(client):
def do_handshake(client):
handshake = client.recv(1024)
print "Handshake [%s]" % handshake
if handshake.startswith("<policy-file-request/>"):
print "Sending:", policy_response
print "Sending flash policy response"
client.send(policy_response)
handshake = client.recv(1024)
print "Handshake [%s]" % handshake
client.close()
return False
req_lines = handshake.split("\r\n")
_, path, _ = req_lines[0].split(" ")
_, origin = req_lines[4].split(" ")
_, host = req_lines[3].split(" ")
client.send(server_handshake % (origin, host, path))
return True
def traffic(token="."):
sys.stdout.write(token)
@ -117,7 +118,7 @@ def generate():
buf = "\x00" + b64encode(data) + "\xff"
return buf
def responder(client, delay=500):
def responder(client, delay=10):
global errors
cqueue = []
cpartial = ""
@ -155,7 +156,7 @@ def responder(client, delay=500):
client.send(generate())
traffic("<")
def start_server(listen_port, delay=500):
def start_server(listen_port, delay=10):
global errors, send_cnt, recv_cnt
lsock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
lsock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
@ -167,7 +168,8 @@ def start_server(listen_port, delay=500):
print 'listening on port %s' % listen_port
csock, address = lsock.accept()
print 'Got client connection from %s' % address[0]
handshake(csock)
if not do_handshake(csock):
continue
send_cnt = 0
recv_cnt = 0
@ -188,7 +190,7 @@ if __name__ == '__main__':
if len(sys.argv) == 3:
delay = int(sys.argv[2])
else:
delay = 500
delay = 10
except:
print "Usage: <listen_port> [delay_ms]"
sys.exit(1)