summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md2
-rw-r--r--WebSocketMain.swfbin175928 -> 175519 bytes
-rw-r--r--WebSocketMainInsecure.zipbin166736 -> 166111 bytes
-rw-r--r--flash-src/com/gsolo/encryption/SHA1.as218
-rw-r--r--flash-src/net/gimite/websocket/WebSocket.as257
-rw-r--r--flash-src/net/gimite/websocket/WebSocketMain.as5
-rw-r--r--flash-src/net/gimite/websocket/WebSocketMainInsecure.as2
-rw-r--r--web_socket.js2
8 files changed, 362 insertions, 124 deletions
diff --git a/README.md b/README.md
index 7b34ace..bb6db68 100644
--- a/README.md
+++ b/README.md
@@ -121,7 +121,7 @@ Note that it's technically possible that client sends arbitrary string as Cookie
### Proxy support
-[The WebSocket spec](http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol) specifies instructions for User Agents to support proxied connections by implementing the HTTP CONNECT method.
+[The WebSocket spec](http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07) specifies instructions for User Agents to support proxied connections by implementing the HTTP CONNECT method.
The AS3 Socket class doesn't implement this mechanism, which renders it useless for the scenarios where the user trying to open a socket is behind a proxy.
diff --git a/WebSocketMain.swf b/WebSocketMain.swf
index 657c762..073d923 100644
--- a/WebSocketMain.swf
+++ b/WebSocketMain.swf
Binary files differ
diff --git a/WebSocketMainInsecure.zip b/WebSocketMainInsecure.zip
index 560a8d4..c0ce704 100644
--- a/WebSocketMainInsecure.zip
+++ b/WebSocketMainInsecure.zip
Binary files differ
diff --git a/flash-src/com/gsolo/encryption/SHA1.as b/flash-src/com/gsolo/encryption/SHA1.as
new file mode 100644
index 0000000..12f64c5
--- /dev/null
+++ b/flash-src/com/gsolo/encryption/SHA1.as
@@ -0,0 +1,218 @@
+package com.gsolo.encryption {
+ public class SHA1 {
+ /*
+ * A JavaScript implementation of the Secure Hash Algorithm, SHA-1, as defined
+ * in FIPS PUB 180-1
+ * Version 2.1a Copyright Paul Johnston 2000 - 2002.
+ * Other contributors: Greg Holt, Andrew Kepert, Ydnar, Lostinet
+ * Distributed under the BSD License
+ * See http://pajhome.org.uk/crypt/md5 for details.
+ *
+ * Converted to AS3 By Geoffrey Williams
+ */
+
+ /*
+ * Configurable variables. You may need to tweak these to be compatible with
+ * the server-side, but the defaults work in most cases.
+ */
+
+ public static const HEX_FORMAT_LOWERCASE:uint = 0;
+ public static const HEX_FORMAT_UPPERCASE:uint = 1;
+
+ public static const BASE64_PAD_CHARACTER_DEFAULT_COMPLIANCE:String = "";
+ public static const BASE64_PAD_CHARACTER_RFC_COMPLIANCE:String = "=";
+
+ public static const BITS_PER_CHAR_ASCII:uint = 8;
+ public static const BITS_PER_CHAR_UNICODE:uint = 8;
+
+ public static var hexcase:uint = 0; /* hex output format. 0 - lowercase; 1 - uppercase */
+ public static var b64pad:String = ""; /* base-64 pad character. "=" for strict RFC compliance */
+ public static var chrsz:uint = 8; /* bits per input character. 8 - ASCII; 16 - Unicode */
+
+ public static function encrypt (string:String):String {
+ return hex_sha1 (string);
+ }
+
+ /*
+ * These are the functions you'll usually want to call
+ * They take string arguments and return either hex or base-64 encoded strings
+ */
+ public static function hex_sha1 (string:String):String {
+ return binb2hex (core_sha1( str2binb(string), string.length * chrsz));
+ }
+
+ public static function b64_sha1 (string:String):String {
+ return binb2b64 (core_sha1 (str2binb (string), string.length * chrsz));
+ }
+
+ public static function str_sha1 (string:String):String {
+ return binb2str (core_sha1 (str2binb (string), string.length * chrsz));
+ }
+
+ public static function hex_hmac_sha1 (key:String, data:String):String {
+ return binb2hex (core_hmac_sha1 (key, data));
+ }
+
+ public static function b64_hmac_sha1 (key:String, data:String):String {
+ return binb2b64 (core_hmac_sha1 (key, data));
+ }
+
+ public static function str_hmac_sha1 (key:String, data:String):String {
+ return binb2str (core_hmac_sha1 (key, data));
+ }
+
+ /*
+ * Perform a simple self-test to see if the VM is working
+ */
+ public static function sha1_vm_test ():Boolean {
+ return hex_sha1 ("abc") == "a9993e364706816aba3e25717850c26c9cd0d89d";
+ }
+
+ /*
+ * Calculate the SHA-1 of an array of big-endian words, and a bit length
+ */
+ public static function core_sha1 (x:Array, len:Number):Array {
+ /* append padding */
+ x[len >> 5] |= 0x80 << (24 - len % 32);
+ x[((len + 64 >> 9) << 4) + 15] = len;
+
+ var w:Array = new Array(80);
+ var a:Number = 1732584193;
+ var b:Number = -271733879;
+ var c:Number = -1732584194;
+ var d:Number = 271733878;
+ var e:Number = -1009589776;
+
+ for(var i:Number = 0; i < x.length; i += 16) {
+ var olda:Number = a;
+ var oldb:Number = b;
+ var oldc:Number = c;
+ var oldd:Number = d;
+ var olde:Number = e;
+
+ for(var j:Number = 0; j < 80; j++) {
+ if(j < 16) w[j] = x[i + j];
+ else w[j] = rol(w[j-3] ^ w[j-8] ^ w[j-14] ^ w[j-16], 1);
+ var t:Number = safe_add (safe_add (rol (a, 5), sha1_ft (j, b, c, d)), safe_add (safe_add (e, w[j]), sha1_kt (j)));
+ e = d;
+ d = c;
+ c = rol(b, 30);
+ b = a;
+ a = t;
+ }
+
+ a = safe_add(a, olda);
+ b = safe_add(b, oldb);
+ c = safe_add(c, oldc);
+ d = safe_add(d, oldd);
+ e = safe_add(e, olde);
+ }
+
+ return [a, b, c, d, e];
+ }
+
+ /*
+ * Perform the appropriate triplet combination function for the current
+ * iteration
+ */
+ public static function sha1_ft (t:Number, b:Number, c:Number, d:Number):Number {
+ if(t < 20) return (b & c) | ((~b) & d);
+ if(t < 40) return b ^ c ^ d;
+ if(t < 60) return (b & c) | (b & d) | (c & d);
+ return b ^ c ^ d;
+ }
+
+ /*
+ * Determine the appropriate additive constant for the current iteration
+ */
+ public static function sha1_kt (t:Number):Number {
+ return (t < 20) ? 1518500249 : (t < 40) ? 1859775393 : (t < 60) ? -1894007588 : -899497514;
+ }
+
+ /*
+ * Calculate the HMAC-SHA1 of a key and some data
+ */
+ public static function core_hmac_sha1 (key:String, data:String):Array {
+ var bkey:Array = str2binb (key);
+ if (bkey.length > 16) bkey = core_sha1 (bkey, key.length * chrsz);
+
+ var ipad:Array = new Array(16), opad:Array = new Array(16);
+ for(var i:Number = 0; i < 16; i++) {
+ ipad[i] = bkey[i] ^ 0x36363636;
+ opad[i] = bkey[i] ^ 0x5C5C5C5C;
+ }
+
+ var hash:Array = core_sha1 (ipad.concat (str2binb(data)), 512 + data.length * chrsz);
+ return core_sha1 (opad.concat (hash), 512 + 160);
+ }
+
+ /*
+ * Add integers, wrapping at 2^32. This uses 16-bit operations internally
+ * to work around bugs in some JS interpreters.
+ */
+ public static function safe_add (x:Number, y:Number):Number {
+ var lsw:Number = (x & 0xFFFF) + (y & 0xFFFF);
+ var msw:Number = (x >> 16) + (y >> 16) + (lsw >> 16);
+ return (msw << 16) | (lsw & 0xFFFF);
+ }
+
+ /*
+ * Bitwise rotate a 32-bit number to the left.
+ */
+ public static function rol (num:Number, cnt:Number):Number {
+ return (num << cnt) | (num >>> (32 - cnt));
+ }
+
+ /*
+ * Convert an 8-bit or 16-bit string to an array of big-endian words
+ * In 8-bit function, characters >255 have their hi-byte silently ignored.
+ */
+ public static function str2binb (str:String):Array {
+ var bin:Array = new Array ();
+ var mask:Number = (1 << chrsz) - 1;
+ for (var i:Number = 0; i < str.length * chrsz; i += chrsz) bin[i>>5] |= (str.charCodeAt (i / chrsz) & mask) << (32 - chrsz - i%32);
+ return bin;
+ }
+
+ /*
+ * Convert an array of big-endian words to a string
+ */
+ public static function binb2str (bin:Array):String {
+ var str:String = "";
+ var mask:Number = (1 << chrsz) - 1;
+ for (var i:Number = 0; i < bin.length * 32; i += chrsz) str += String.fromCharCode((bin[i>>5] >>> (32 - chrsz - i%32)) & mask);
+ return str;
+ }
+
+ /*
+ * Convert an array of big-endian words to a hex string.
+ */
+ public static function binb2hex (binarray:Array):String {
+ var hex_tab:String = hexcase ? "0123456789ABCDEF" : "0123456789abcdef";
+ var str:String = "";
+ for(var i:Number = 0; i < binarray.length * 4; i++) {
+ str += hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8+4)) & 0xF) +
+ hex_tab.charAt((binarray[i>>2] >> ((3 - i%4)*8 )) & 0xF);
+ }
+ return str;
+ }
+
+ /*
+ * Convert an array of big-endian words to a base-64 string
+ */
+ public static function binb2b64 (binarray:Array):String {
+ var tab:String = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+ var str:String = "";
+ for(var i:Number = 0; i < binarray.length * 4; i += 3) {
+ var triplet:Number = (((binarray[i >> 2] >> 8 * (3 - i %4)) & 0xFF) << 16)
+ | (((binarray[i+1 >> 2] >> 8 * (3 - (i+1)%4)) & 0xFF) << 8 )
+ | ((binarray[i+2 >> 2] >> 8 * (3 - (i+2)%4)) & 0xFF);
+ for(var j:Number = 0; j < 4; j++) {
+ if (i * 8 + j * 6 > binarray.length * 32) str += b64pad;
+ else str += tab.charAt((triplet >> 6*(3-j)) & 0x3F);
+ }
+ }
+ return str;
+ }
+ }
+}
diff --git a/flash-src/net/gimite/websocket/WebSocket.as b/flash-src/net/gimite/websocket/WebSocket.as
index f043b60..3bafd63 100644
--- a/flash-src/net/gimite/websocket/WebSocket.as
+++ b/flash-src/net/gimite/websocket/WebSocket.as
@@ -1,12 +1,13 @@
// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
// License: New BSD License
// Reference: http://dev.w3.org/html5/websockets/
-// Reference: http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76
+// Reference: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07
package net.gimite.websocket {
import com.adobe.net.proxies.RFC2817Socket;
import com.gsolo.encryption.MD5;
+import com.gsolo.encryption.SHA1;
import com.hurlant.crypto.tls.TLSConfig;
import com.hurlant.crypto.tls.TLSEngine;
import com.hurlant.crypto.tls.TLSSecurityParameters;
@@ -30,6 +31,7 @@ public class WebSocket extends EventDispatcher {
private static var OPEN:int = 1;
private static var CLOSING:int = 2;
private static var CLOSED:int = 3;
+ private static var GUID:String = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11";
private var id:int;
private var rawSocket:Socket;
@@ -49,9 +51,14 @@ public class WebSocket extends EventDispatcher {
private var readyState:int = CONNECTING;
private var cookie:String;
private var headers:String;
- private var noiseChars:Array;
private var expectedDigest:String;
private var logger:IWebSocketLogger;
+ private var b64encoder:Base64Encoder = new Base64Encoder();
+
+ private var frame_fin:int = -1;
+ private var frame_opcode:int = -1;
+ private var frame_hlength:uint = 0;
+ private var frame_plength:uint = 0;
public function WebSocket(
id:int, url:String, protocols:Array, origin:String,
@@ -60,7 +67,6 @@ public class WebSocket extends EventDispatcher {
logger:IWebSocketLogger) {
this.logger = logger;
this.id = id;
- initNoiseChars();
this.url = url;
var m:Array = url.match(/^(\w+):\/\/([^\/:]+)(:(\d+))?(\/.*)?(\?.*)?$/);
if (!m) fatal("SYNTAX_ERR: invalid url: " + url);
@@ -127,30 +133,109 @@ public class WebSocket extends EventDispatcher {
}
public function send(encData:String):int {
- var data:String = decodeURIComponent(encData);
+ var raw_str:String = decodeURIComponent(encData);
+ var data:ByteArray = new ByteArray();
+ data.writeUTFBytes(raw_str);
+ var plength:uint = data.length;
+
if (readyState == OPEN) {
- socket.writeByte(0x00);
- socket.writeUTFBytes(data);
- socket.writeByte(0xff);
+ // TODO: binary API support
+ var header:ByteArray = new ByteArray();
+
+ header.writeByte(0x80 | 0x01); // FIN + text opcode
+
+ if (plength <= 125) {
+ header.writeByte(0x80 | plength); // Masked + length
+ } else if (plength > 125 && plength < 65536) {
+ header.writeByte(0x80 | 126); // Masked + 126
+ header.writeShort(plength);
+ } else if (plength >= 65536 && plength < 4294967296) {
+ header.writeByte(0x80 | 127); // Masked + 127
+ header.writeUnsignedInt(0); // zero high order bits
+ header.writeUnsignedInt(plength);
+ } else {
+ fatal("Send frame size too large");
+ return 0;
+ }
+
+ // Generate a mask
+ var mask:Array = new Array(4);
+ for (var i:int = 0; i < 4; i++) {
+ mask[i] = randomInt(0, 255);
+ header.writeByte(mask[i]);
+ }
+ for (i = 0; i < data.length; i++) {
+ data[i] = mask[i%4] ^ data[i];
+ }
+
+ socket.writeBytes(header);
+ socket.writeBytes(data);
socket.flush();
logger.log("sent: " + data);
return -1;
} else if (readyState == CLOSING || readyState == CLOSED) {
- var bytes:ByteArray = new ByteArray();
- bytes.writeUTFBytes(data);
- return bytes.length; // not sure whether it should include \x00 and \xff
+ return plength;
} else {
fatal("invalid state");
return 0;
}
}
+
+ public function parseFrame():int {
+ var cur_pos:int = buffer.position;
+
+ frame_hlength = 2;
+ if (buffer.length < frame_hlength) {
+ return -1;
+ }
+
+ frame_opcode = buffer[0] & 0x0f;
+ frame_fin = (buffer[0] & 0x80) >> 7;
+ frame_plength = buffer[1] & 0x7f;
+
+ if (frame_plength == 126) {
+ frame_hlength = 4;
+ if (buffer.length < frame_hlength) {
+ return -1;
+ }
+
+ buffer.endian = Endian.BIG_ENDIAN;
+ buffer.position = 2;
+ frame_plength = buffer.readUnsignedShort();
+ buffer.position = cur_pos;
+ } else if (frame_plength == 127) {
+ frame_hlength = 10;
+ if (buffer.length < frame_hlength) {
+ return -1;
+ }
+
+ buffer.endian = Endian.BIG_ENDIAN;
+ buffer.position = 2;
+ // Protocol allows 64-bit length, but we only handle 32-bit
+ var big:uint = buffer.readUnsignedInt(); // Skip high 32-bits
+ frame_plength = buffer.readUnsignedInt(); // Low 32-bits
+ buffer.position = cur_pos;
+ if (big != 0) {
+ onError("Frame length exceeds 4294967295. Bailing out!");
+ return -1;
+ }
+ }
+
+ if (buffer.length < frame_hlength + frame_plength) {
+ return -1;
+ }
+
+ return 1;
+ }
public function close(isError:Boolean = false):void {
logger.log("close");
try {
if (readyState == OPEN && !isError) {
- socket.writeByte(0xff);
- socket.writeByte(0x00);
+ // TODO: send code and reason
+ socket.writeByte(0x80 | 0x08); // FIN + close opcode
+ socket.writeByte(0x80 | 0x00); // Masked + no payload
+ socket.writeUnsignedInt(0x00); // Mask
socket.flush();
}
socket.close();
@@ -169,10 +254,11 @@ public class WebSocket extends EventDispatcher {
var defaultPort:int = scheme == "wss" ? 443 : 80;
var hostValue:String = host + (port == defaultPort ? "" : ":" + port);
- var key1:String = generateKey();
- var key2:String = generateKey();
- var key3:String = generateKey3();
- expectedDigest = getSecurityDigest(key1, key2, key3);
+ var key:String = generateKey();
+
+ SHA1.b64pad = "=";
+ expectedDigest = SHA1.b64_sha1(key + GUID);
+
var opt:String = "";
if (requestedProtocols.length > 0) {
opt += "Sec-WebSocket-Protocol: " + requestedProtocols.join(",") + "\r\n";
@@ -182,20 +268,18 @@ public class WebSocket extends EventDispatcher {
var req:String = StringUtil.substitute(
"GET {0} HTTP/1.1\r\n" +
- "Upgrade: WebSocket\r\n" +
- "Connection: Upgrade\r\n" +
"Host: {1}\r\n" +
- "Origin: {2}\r\n" +
- "Cookie: {3}\r\n" +
- "Sec-WebSocket-Key1: {4}\r\n" +
- "Sec-WebSocket-Key2: {5}\r\n" +
- "{6}" +
+ "Upgrade: websocket\r\n" +
+ "Connection: Upgrade\r\n" +
+ "Sec-WebSocket-Key: {2}\r\n" +
+ "Sec-WebSocket-Origin: {3}\r\n" +
+ "Sec-WebSocket-Version: 7\r\n" +
+ "Cookie: {4}\r\n" +
+ "{5}" +
"\r\n",
- path, hostValue, origin, cookie, key1, key2, opt);
+ path, hostValue, key, origin, cookie, opt);
logger.log("request header:\n" + req);
socket.writeUTFBytes(req);
- logger.log("sent key3: " + key3);
- writeBytes(key3);
socket.flush();
}
@@ -253,46 +337,30 @@ public class WebSocket extends EventDispatcher {
if (headerState == 4) {
var headerStr:String = readUTFBytes(buffer, 0, pos + 1);
logger.log("response header:\n" + headerStr);
- if (!validateHeader(headerStr)) return;
- removeBufferBefore(pos + 1);
- pos = -1;
- }
- } else if (headerState == 4) {
- if (pos == 15) {
- var replyDigest:String = readBytes(buffer, 0, 16);
- logger.log("reply digest: " + replyDigest);
- if (replyDigest != expectedDigest) {
- onError("digest doesn't match: " + replyDigest + " != " + expectedDigest);
- return;
- }
- headerState = 5;
+ if (!validateHandshake(headerStr)) return;
removeBufferBefore(pos + 1);
pos = -1;
readyState = OPEN;
this.dispatchEvent(new WebSocketEvent("open"));
}
} else {
- if (buffer[pos] == 0xff && pos > 0) {
- if (buffer[0] != 0x00) {
- onError("data must start with \\x00");
- return;
- }
- var data:String = readUTFBytes(buffer, 1, pos - 1);
- logger.log("received: " + data);
- this.dispatchEvent(new WebSocketEvent("message", encodeURIComponent(data)));
- removeBufferBefore(pos + 1);
+ if (parseFrame() == 1) {
+ var data:String = readUTFBytes(buffer, frame_hlength, frame_plength);
+ removeBufferBefore(frame_hlength + frame_plength);
pos = -1;
- } else if (pos == 1 && buffer[0] == 0xff && buffer[1] == 0x00) { // closing
- logger.log("received closing packet");
- removeBufferBefore(pos + 1);
- pos = -1;
- close();
+ if (frame_opcode == 0x01 || frame_opcode == 0x02) {
+ this.dispatchEvent(new WebSocketEvent("message", encodeURIComponent(data)));
+ } else if (frame_opcode == 0x08) {
+ // TODO: extract code and reason string
+ logger.log("received closing packet");
+ close();
+ }
}
}
}
}
- private function validateHeader(headerStr:String):Boolean {
+ private function validateHandshake(headerStr:String):Boolean {
var lines:Array = headerStr.split(/\r\n/);
if (!lines[0].match(/^HTTP\/1.1 101 /)) {
onError("bad response: " + lines[0]);
@@ -318,21 +386,17 @@ public class WebSocket extends EventDispatcher {
onError("invalid Connection: " + header["Connection"]);
return false;
}
- if (!lowerHeader["sec-websocket-origin"]) {
- if (lowerHeader["websocket-origin"]) {
- onError(
- "The WebSocket server speaks old WebSocket protocol, " +
- "which is not supported by web-socket-js. " +
- "It requires WebSocket protocol 76 or later. " +
- "Try newer version of the server if available.");
- } else {
- onError("header Sec-WebSocket-Origin is missing");
- }
+ if (!lowerHeader["sec-websocket-accept"]) {
+ onError(
+ "The WebSocket server speaks old WebSocket protocol, " +
+ "which is not supported by web-socket-js. " +
+ "It requires WebSocket protocol HyBi 7. " +
+ "Try newer version of the server if available.");
return false;
}
- var resOrigin:String = lowerHeader["sec-websocket-origin"];
- if (resOrigin != origin) {
- onError("origin doesn't match: '" + resOrigin + "' != '" + origin + "'");
+ var replyDigest:String = header["sec-websocket-accept"]
+ if (replyDigest != expectedDigest) {
+ onError("digest doesn't match: " + replyDigest + " != " + expectedDigest);
return false;
}
if (requestedProtocols.length > 0) {
@@ -354,61 +418,14 @@ public class WebSocket extends EventDispatcher {
buffer = nextBuffer;
}
- private function initNoiseChars():void {
- noiseChars = new Array();
- for (var i:int = 0x21; i <= 0x2f; ++i) {
- noiseChars.push(String.fromCharCode(i));
- }
- for (var j:int = 0x3a; j <= 0x7a; ++j) {
- noiseChars.push(String.fromCharCode(j));
- }
- }
-
private function generateKey():String {
- var spaces:uint = randomInt(1, 12);
- var max:uint = uint.MAX_VALUE / spaces;
- var number:uint = randomInt(0, max);
- var key:String = (number * spaces).toString();
- var noises:int = randomInt(1, 12);
- var pos:int;
- for (var i:int = 0; i < noises; ++i) {
- var char:String = noiseChars[randomInt(0, noiseChars.length - 1)];
- pos = randomInt(0, key.length);
- key = key.substr(0, pos) + char + key.substr(pos);
- }
- for (var j:int = 0; j < spaces; ++j) {
- pos = randomInt(1, key.length - 1);
- key = key.substr(0, pos) + " " + key.substr(pos);
- }
- return key;
- }
-
- private function generateKey3():String {
- var key3:String = "";
- for (var i:int = 0; i < 8; ++i) {
- key3 += String.fromCharCode(randomInt(0, 255));
- }
- return key3;
- }
-
- private function getSecurityDigest(key1:String, key2:String, key3:String):String {
- var bytes1:String = keyToBytes(key1);
- var bytes2:String = keyToBytes(key2);
- return MD5.rstr_md5(bytes1 + bytes2 + key3);
- }
-
- private function keyToBytes(key:String):String {
- var keyNum:uint = parseInt(key.replace(/[^\d]/g, ""));
- var spaces:uint = 0;
- for (var i:int = 0; i < key.length; ++i) {
- if (key.charAt(i) == " ") ++spaces;
+ var vals:String = "";
+ for (var i:int = 0; i < 16; i++) {
+ vals = vals + randomInt(0, 127).toString();
}
- var resultNum:uint = keyNum / spaces;
- var bytes:String = "";
- for (var j:int = 3; j >= 0; --j) {
- bytes += String.fromCharCode((resultNum >> (j * 8)) & 0xff);
- }
- return bytes;
+ b64encoder.reset();
+ b64encoder.encode(vals);
+ return b64encoder.toString();
}
// Writes byte sequence to socket.
diff --git a/flash-src/net/gimite/websocket/WebSocketMain.as b/flash-src/net/gimite/websocket/WebSocketMain.as
index 28cd66d..891a5d1 100644
--- a/flash-src/net/gimite/websocket/WebSocketMain.as
+++ b/flash-src/net/gimite/websocket/WebSocketMain.as
@@ -1,7 +1,7 @@
// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
// License: New BSD License
// Reference: http://dev.w3.org/html5/websockets/
-// Reference: http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76
+// Reference: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07
package net.gimite.websocket {
@@ -40,6 +40,9 @@ public class WebSocketMain extends Sprite implements IWebSocketLogger{
public function setDebug(val:Boolean):void {
debug = val;
+ if (val) {
+ log("debug enabled");
+ }
}
private function loadDefaultPolicyFile(wsUrl:String):void {
diff --git a/flash-src/net/gimite/websocket/WebSocketMainInsecure.as b/flash-src/net/gimite/websocket/WebSocketMainInsecure.as
index e845839..eb4f426 100644
--- a/flash-src/net/gimite/websocket/WebSocketMainInsecure.as
+++ b/flash-src/net/gimite/websocket/WebSocketMainInsecure.as
@@ -1,7 +1,7 @@
// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
// License: New BSD License
// Reference: http://dev.w3.org/html5/websockets/
-// Reference: http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol-76
+// Reference: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07
package net.gimite.websocket {
diff --git a/web_socket.js b/web_socket.js
index 5397332..8503cc2 100644
--- a/web_socket.js
+++ b/web_socket.js
@@ -1,7 +1,7 @@
// Copyright: Hiroshi Ichikawa <http://gimite.net/en/>
// License: New BSD License
// Reference: http://dev.w3.org/html5/websockets/
-// Reference: http://tools.ietf.org/html/draft-hixie-thewebsocketprotocol
+// Reference: http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-07
(function() {
View Lorry Controller Status