- tor-commits - lists.torproject.org

[flashproxy/master] Completed return_of_the_rtmfpcat client side code, works
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 59ccbab495b24f513c45976b81a318948510d207 Author: ellitron <jdellit(a)stanford.edu> Date: Wed May 25 18:05:13 2011 -0700 Completed return_of_the_rtmfpcat client side code, works --- return_of_the_rtmfpcat.as | 157 +++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 157 insertions(+), 0 deletions(-) diff --git a/return_of_the_rtmfpcat.as b/return_of_the_rtmfpcat.as index e8b786d..9ecc61f 100644 --- a/return_of_the_rtmfpcat.as +++ b/return_of_the_rtmfpcat.as @@ -76,6 +76,9 @@ package /* Cirrus connection timeout ID. */ private var circon_timeo_id:int; + /* Array of connection pairs */ + private var con_pairs:Array; + /* Put a string to the screen. */ public function puts(s:String):void { @@ -175,6 +178,19 @@ package puts("circon_netstatus_event: NetConnection.Connect.Success"); puts("Got id " + circon.nearID + "."); clearInterval(circon_timeo_id); + + if(proxy_mode) { + + } else { + /* Listen for incoming RTMFP connections. */ + var s_r:RTMFPSocket = new RTMFPSocket(circon); + s_r.addEventListener(Event.CONNECT, rtmfp_connect_event); + s_r.listen(); + + /* Register ID with facilitator. */ + register_id(circon.nearID, fac_addr); + } + break; case "NetStream.Connect.Success" : puts("circon_netstatus_event: NetStream.Connect.Success"); @@ -191,6 +207,32 @@ package } } + private function rtmfp_connect_event(e:Event):void + { + puts("VICTORY!"); + } + + private function register_id(id:String, fac_addr:Object):void + { + var s_f:Socket = new Socket(); + s_f.addEventListener(Event.CONNECT, function (e:Event):void { + puts("Facilitator: connected to " + fac_addr.host + ":" + fac_addr.port + "."); + puts("Registering id " + id); + s_f.writeUTFBytes("POST / HTTP/1.0\r\n\r\nclient=" + id + "\r\n"); + }); + s_f.addEventListener(Event.CLOSE, function (e:Event):void { + puts("Facilitator: connection closed."); + }); + s_f.addEventListener(IOErrorEvent.IO_ERROR, function (e:IOErrorEvent):void { + puts("Facilitator: I/O error: " + e.text + "."); + }); + s_f.addEventListener(SecurityErrorEvent.SECURITY_ERROR, function (e:SecurityErrorEvent):void { + puts("Facilitator: security error: " + e.text + "."); + }); + + s_f.connect(fac_addr.host, fac_addr.port); + } + private function circon_timeout():void { puts("Cirrus server connection timed out!"); @@ -215,3 +257,118 @@ package } } +import flash.display.Sprite; +import flash.events.Event; +import flash.events.EventDispatcher; +import flash.events.IOErrorEvent; +import flash.events.ProgressEvent; +import flash.events.SecurityErrorEvent; +import flash.net.Socket; +import flash.utils.ByteArray; +import flash.utils.clearTimeout; +import flash.utils.getTimer; +import flash.utils.setTimeout; +import flash.net.NetConnection; +import flash.net.NetStream; + +class RTMFPSocket extends EventDispatcher +{ + /* The name of the "media" to pass between peers. */ + private static const DATA:String = "data"; + + /* Connection to the Cirrus rendezvous service. + * RTMFPSocket is established using this service. */ + private var circon:NetConnection; + + /* Unidirectional streams composing socket. */ + private var send_stream:NetStream; + private var recv_stream:NetStream; + + public function RTMFPSocket(circon:NetConnection) + { + this.circon = circon; + } + + public function listen():void + { + send_stream = new NetStream(circon, NetStream.DIRECT_CONNECTIONS); + var client:Object = new Object(); + client.onPeerConnect = send_stream_peer_connect; + send_stream.client = client; + send_stream.publish(DATA); + } + + private function send_stream_peer_connect(peer:NetStream):Boolean + { + recv_stream = new NetStream(circon, peer.farID); + var client:RTMFPSocketClient = new RTMFPSocketClient(); + client.addEventListener(ProgressEvent.SOCKET_DATA, function (event:ProgressEvent):void { + dispatchEvent(event); + }, false, 0, true); + client.addEventListener(RTMFPSocketClient.PEER_CONNECT_ACKNOWLEDGED, function (event:Event):void { + dispatchEvent(new Event(Event.CONNECT)); + }, false, 0, true); + recv_stream.client = client; + recv_stream.play(DATA); + + return true; + } + + +} + +dynamic class RTMFPSocketClient extends EventDispatcher +{ + public static const PEER_CONNECT_ACKNOWLEDGED:String = "peerConnectAcknowledged"; + + private var _bytes:ByteArray; + private var _peerID:String; + private var _peerConnectAcknowledged:Boolean; + + public function RTMFPSocketClient() + { + super(); + _bytes = new ByteArray(); + _peerID = null; + _peerConnectAcknowledged = false; + } + + public function get bytes():ByteArray + { + return _bytes; + } + + public function dataAvailable(bytes:ByteArray):void + { + this._bytes.clear(); + bytes.readBytes(this._bytes); + dispatchEvent(new ProgressEvent(ProgressEvent.SOCKET_DATA, false, false, this._bytes.bytesAvailable, this._bytes.length)); + } + + public function get peerConnectAcknowledged():Boolean + { + return _peerConnectAcknowledged; + } + + public function setPeerConnectAcknowledged():void + { + _peerConnectAcknowledged = true; + dispatchEvent(new Event(PEER_CONNECT_ACKNOWLEDGED)); + } + + public function get peerID():String + { + return _peerID; + } + + public function set peerID(id:String):void + { + _peerID = id; + } + +} + +class ConnectionPair extends EventDispatcher +{ + +}

1 0

[flashproxy/master] Merge remote branch 'origin/rtmfp' into rtmfp
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 486fba47f3bf851eb8549c03ff506fece4dc4818 Merge: e178468 0423ede Author: ellitron <jdellit(a)stanford.edu> Date: Thu May 26 13:56:26 2011 -0700 Merge remote branch 'origin/rtmfp' into rtmfp facilitator.py | 106 ++++++++++++++++++++++++++++++++++++++++---------------- 1 files changed, 76 insertions(+), 30 deletions(-)

1 0

[flashproxy/master] Committing updated Makefile to build Proxy.as
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 8ff0c31bff916fdfe7458abe9b3261b0babc3545 Author: Nate Hardison <nate(a)rescomp-09-154551.stanford.edu> Date: Wed May 4 17:01:19 2011 -0700 Committing updated Makefile to build Proxy.as --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index 6f03eb6..baf0e94 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ MXMLC ?= mxmlc -TARGETS = swfcat.swf +TARGETS = swfcat.swf Proxy.swf all: $(TARGETS)

1 0

[flashproxy/master] Add an RTMFPSocket.close method.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit f46a9e3f6844ca996d15bb4434c18ac127ac0a71 Author: David Fifield <david(a)bamsoftware.com> Date: Tue May 24 15:58:16 2011 -0700 Add an RTMFPSocket.close method. --- com/rtmfpcat/rtmfp/RTMFPSocket.as | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/com/rtmfpcat/rtmfp/RTMFPSocket.as b/com/rtmfpcat/rtmfp/RTMFPSocket.as index 6c61781..bb00994 100644 --- a/com/rtmfpcat/rtmfp/RTMFPSocket.as +++ b/com/rtmfpcat/rtmfp/RTMFPSocket.as @@ -67,6 +67,11 @@ package rtmfp connectionTimeout = setInterval(fail, DEFAULT_CONNECT_TIMEOUT); } + public function close():void + { + connection.close(); + } + public function get id():String { if (connection != null && connection.connected) {

1 0

[flashproxy/master] Merge remote branch 'origin/rtmfp' into rtmfp
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 9b7947e9b893ddfb308e467dd2a2d4a6c73caa4b Merge: 6e08bb5 a8e37c5 Author: ellitron <jdellit(a)stanford.edu> Date: Thu May 19 18:03:22 2011 -0700 Merge remote branch 'origin/rtmfp' into rtmfp Conflicts: swfcat.as Makefile | 4 +- com/rtmfpcat/Makefile | 11 + com/rtmfpcat/README | 118 +++++++++ com/rtmfpcat/Utils.as | 25 ++ com/rtmfpcat/connector.py | 326 +++++++++++++++++++++++++ com/rtmfpcat/facilitator.py | 146 +++++++++++ com/rtmfpcat/rtmfp/RTMFPSocket.as | 216 ++++++++++++++++ com/rtmfpcat/rtmfp/RTMFPSocketClient.as | 57 +++++ com/rtmfpcat/rtmfp/events/RTMFPSocketEvent.as | 25 ++ com/rtmfpcat/rtmfpcat.as | 208 ++++++++++++++++ swfcat.as | 82 +++++- 11 files changed, 1202 insertions(+), 16 deletions(-) diff --cc Makefile index 7f81cf9,0c3beba..5390327 --- a/Makefile +++ b/Makefile @@@ -4,10 -4,8 +4,10 @@@ TARGETS = swfcat.swf com/rtmfpcat/rtmfp all: $(TARGETS) +swfcat.swf: badge.png + %.swf: %.as - $(MXMLC) -output $@ -static-link-runtime-shared-libraries $< - $(MXMLC) -output $@ -define=RTMFP::CIRRUS_KEY,\"$(CIRRUS_KEY)\" $^ ++ $(MXMLC) -output $@ -static-link-runtime-shared-libraries -define=RTMFP::CIRRUS_KEY,\"$(CIRRUS_KEY)\" $< clean: rm -f $(TARGETS) diff --cc swfcat.as index 76de948,423f30a..fd3625d --- a/swfcat.as +++ b/swfcat.as @@@ -249,9 -168,10 +249,10 @@@ import flash.events.ProgressEvent import flash.events.SecurityErrorEvent; import flash.net.Socket; import flash.utils.ByteArray; + import flash.utils.setInterval; /* An instance of a client-relay connection. */ -class ProxyPair +class ProxyPair extends EventDispatcher { // Address ({host, port}) of client. private var addr_c:Object; @@@ -265,8 -185,21 +266,21 @@@ // Parent swfcat, for UI updates. private var ui:swfcat; + + // Proxy transfer rate limit in KB/s + private var rate_limit:uint; + + // Default limit is 10KB/s + private const DEFAULT_RATE_LIMIT:uint = 10000; + + private var curr_rate:Number; + private var historical_rate:Number; + private var lifetime:uint; + + // in milliseconds + private const DEFAULT_RATE_TIMEOUT:uint = 1000; - private function log(msg:String):void + public function log(msg:String):void { ui.puts(id() + ": " + msg) }

1 0

[flashproxy/master] New RTMFP research directory holding testing code and packet captures
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit a9448927e49826bc24f7f0632e5199bbce7e9859 Author: Nate Hardison <nate(a)rescomp-09-154551.stanford.edu> Date: Thu May 12 00:40:45 2011 -0700 New RTMFP research directory holding testing code and packet captures --- com/rtmfpcat/rtmfpcat.as | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/com/rtmfpcat/rtmfpcat.as b/com/rtmfpcat/rtmfpcat.as index a2e3e61..c3d3fca 100644 --- a/com/rtmfpcat/rtmfpcat.as +++ b/com/rtmfpcat/rtmfpcat.as @@ -65,7 +65,7 @@ package this.loaderInfo.addEventListener(Event.COMPLETE, onLoaderInfoComplete); } - protected function puts(s:String):void + private function puts(s:String):void { output_text.appendText(s + "\n"); output_text.scrollV = output_text.maxScrollV;

1 0

[flashproxy/master] Adding citation to RTMFPSocket
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit acd156a1362b7f60f5c5b066a26f13724ec069e4 Author: Nate Hardison <nate(a)dn0a208c2d.sunet> Date: Fri May 20 13:00:17 2011 -0700 Adding citation to RTMFPSocket --- com/rtmfpcat/rtmfp/RTMFPSocket.as | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/com/rtmfpcat/rtmfp/RTMFPSocket.as b/com/rtmfpcat/rtmfp/RTMFPSocket.as index 4b83784..6c61781 100644 --- a/com/rtmfpcat/rtmfp/RTMFPSocket.as +++ b/com/rtmfpcat/rtmfp/RTMFPSocket.as @@ -1,3 +1,13 @@ +/* RTMFPSocket abstraction + * Author: Nate Hardison, May 2011 + * + * This code is heavily based off of BelugaFile, an open-source + * Air file-transfer application written by Nicholas Bliyk. + * Website: http://www.belugafile.com/ + * Source: http://code.google.com/p/belugafile/ + * + */ + package rtmfp { import flash.events.Event;

1 0

[flashproxy/master] Replaced tabs with spaces
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit c4093a2b4ab730ddc53163009c0f409dcee41dab Author: ellitron <jdellit(a)stanford.edu> Date: Tue May 24 19:51:41 2011 -0700 Replaced tabs with spaces --- com/rtmfpcat/rtmfp/RTMFPSocket.as | 231 +++++++++++++++++++------------------ 1 files changed, 116 insertions(+), 115 deletions(-) diff --git a/com/rtmfpcat/rtmfp/RTMFPSocket.as b/com/rtmfpcat/rtmfp/RTMFPSocket.as index bb00994..2d634f0 100644 --- a/com/rtmfpcat/rtmfp/RTMFPSocket.as +++ b/com/rtmfpcat/rtmfp/RTMFPSocket.as @@ -27,205 +27,206 @@ package rtmfp import rtmfp.events.RTMFPSocketEvent; [Event(name="connectSuccess", type="com.jscat.rtmfp.events.RTMFPSocketEvent")] - [Event(name="connectFail", type="com.jscat.rtmfp.events.RTMFPSocketEvent")] - [Event(name="publishStart", type="com.jscat.rtmfp.events.RTMFPSocketEvent")] - [Event(name="peerConnected", type="com.jscat.rtmfp.events.RTMFPSocketEvent")] - [Event(name="peeringSuccess", type="com.jscat.rtmfp.events.RTMFPSocketEvent")] - [Event(name="peeringFail", type="com.jscat.rtmfp.events.RTMFPSocketEvent")] - [Event(name="peerDisconnected", type="com.jscat.rtmfp.events.RTMFPSocketEvent")] + [Event(name="connectFail", type="com.jscat.rtmfp.events.RTMFPSocketEvent")] + [Event(name="publishStart", type="com.jscat.rtmfp.events.RTMFPSocketEvent")] + [Event(name="peerConnected", type="com.jscat.rtmfp.events.RTMFPSocketEvent")] + [Event(name="peeringSuccess", type="com.jscat.rtmfp.events.RTMFPSocketEvent")] + [Event(name="peeringFail", type="com.jscat.rtmfp.events.RTMFPSocketEvent")] + [Event(name="peerDisconnected", type="com.jscat.rtmfp.events.RTMFPSocketEvent")] public class RTMFPSocket extends EventDispatcher { /* The name of the "media" to pass between peers */ private static const DATA:String = "data"; - private static const DEFAULT_CIRRUS_ADDRESS:String = "rtmfp://p2p.rtmfp.net"; - private static const DEFAULT_CIRRUS_KEY:String = RTMFP::CIRRUS_KEY; - private static const DEFAULT_CONNECT_TIMEOUT:uint = 4000; - + private static const DEFAULT_CIRRUS_ADDRESS:String = "rtmfp://p2p.rtmfp.net"; + private static const DEFAULT_CIRRUS_KEY:String = RTMFP::CIRRUS_KEY; + private static const DEFAULT_CONNECT_TIMEOUT:uint = 4000; + /* Connection to the Cirrus rendezvous service */ private var connection:NetConnection; - - /* ID of the peer to connect to */ - private var peerID:String; - - /* Data streams to be established with peer */ - private var sendStream:NetStream; - private var recvStream:NetStream; - - /* Timeouts */ - private var connectionTimeout:int; - private var peerConnectTimeout:uint; + + /* ID of the peer to connect to */ + private var peerID:String; + + /* Data streams to be established with peer */ + private var sendStream:NetStream; + private var recvStream:NetStream; + + /* Timeouts */ + private var connectionTimeout:int; + private var peerConnectTimeout:uint; public function RTMFPSocket(){} public function connect(addr:String = DEFAULT_CIRRUS_ADDRESS, key:String = DEFAULT_CIRRUS_KEY):void { - connection = new NetConnection(); - connection.addEventListener(NetStatusEvent.NET_STATUS, onNetStatusEvent); - connection.addEventListener(IOErrorEvent.IO_ERROR, onIOErrorEvent); - connection.addEventListener(SecurityErrorEvent.SECURITY_ERROR, onSecurityErrorEvent); - connection.connect(addr + "/" + key); - connectionTimeout = setInterval(fail, DEFAULT_CONNECT_TIMEOUT); + connection = new NetConnection(); + connection.addEventListener(NetStatusEvent.NET_STATUS, onNetStatusEvent); + connection.addEventListener(IOErrorEvent.IO_ERROR, onIOErrorEvent); + connection.addEventListener(SecurityErrorEvent.SECURITY_ERROR, onSecurityErrorEvent); + connection.connect(addr + "/" + key); + connectionTimeout = setInterval(fail, DEFAULT_CONNECT_TIMEOUT); } public function close():void { - connection.close(); + connection.close(); } public function get id():String { - if (connection != null && connection.connected) { - return connection.nearID; - } + if (connection != null && connection.connected) { + return connection.nearID; + } - return null; + return null; } public function get connected():Boolean { - return (connection != null && connection.connected); + return (connection != null && connection.connected); } public function readBytes(bytes:ByteArray):void { - recvStream.client.bytes.readBytes(bytes); + recvStream.client.bytes.readBytes(bytes); } public function writeBytes(bytes:ByteArray):void { - sendStream.send("dataAvailable", bytes); + sendStream.send("dataAvailable", bytes); } public function get peer():String { - return this.peerID; + return this.peerID; } public function set peer(peerID:String):void { - if (peerID == null || peerID.length == 0) { - throw new Error("Peer ID is null/empty.") - } else if (peerID == connection.nearID) { - throw new Error("Peer ID cannot be the same as our ID."); - } else if (this.peerID == peerID) { - throw new Error("Already connected to peer " + peerID + "."); - } else if (this.recvStream != null) { - throw new Error("Cannot connect to a second peer."); - } + if (peerID == null || peerID.length == 0) { + throw new Error("Peer ID is null/empty.") + } else if (peerID == connection.nearID) { + throw new Error("Peer ID cannot be the same as our ID."); + } else if (this.peerID == peerID) { + throw new Error("Already connected to peer " + peerID + "."); + } else if (this.recvStream != null) { + throw new Error("Cannot connect to a second peer."); + } - this.peerID = peerID; + this.peerID = peerID; - recvStream = new NetStream(connection, peerID); - var client:RTMFPSocketClient = new RTMFPSocketClient(); - client.addEventListener(ProgressEvent.SOCKET_DATA, onDataAvailable, false, 0, true); - client.addEventListener(RTMFPSocketClient.PEER_CONNECT_ACKNOWLEDGED, onPeerConnectAcknowledged, false, 0, true); - recvStream.client = client; - recvStream.addEventListener(NetStatusEvent.NET_STATUS, onRecvStreamEvent); - recvStream.play(DATA); - setTimeout(onPeerConnectTimeout, peerConnectTimeout, recvStream); + recvStream = new NetStream(connection, peerID); + var client:RTMFPSocketClient = new RTMFPSocketClient(); + client.addEventListener(ProgressEvent.SOCKET_DATA, onDataAvailable, false, 0, true); + client.addEventListener(RTMFPSocketClient.PEER_CONNECT_ACKNOWLEDGED, onPeerConnectAcknowledged, false, 0, true); + recvStream.client = client; + recvStream.addEventListener(NetStatusEvent.NET_STATUS, onRecvStreamEvent); + recvStream.play(DATA); + setTimeout(onPeerConnectTimeout, peerConnectTimeout, recvStream); } private function startPublishStream():void { - sendStream = new NetStream(connection, NetStream.DIRECT_CONNECTIONS); - sendStream.addEventListener(NetStatusEvent.NET_STATUS, onSendStreamEvent); - var o:Object = new Object(); - o.onPeerConnect = onPeerConnect; - sendStream.client = o; - sendStream.publish(DATA); + sendStream = new NetStream(connection, NetStream.DIRECT_CONNECTIONS); + sendStream.addEventListener(NetStatusEvent.NET_STATUS, onSendStreamEvent); + var o:Object = new Object(); + o.onPeerConnect = onPeerConnect; + sendStream.client = o; + sendStream.publish(DATA); } private function fail():void { - clearInterval(connectionTimeout); - dispatchEvent(new RTMFPSocketEvent(RTMFPSocketEvent.CONNECT_FAIL)); + clearInterval(connectionTimeout); + dispatchEvent(new RTMFPSocketEvent(RTMFPSocketEvent.CONNECT_FAIL)); } private function onDataAvailable(event:ProgressEvent):void { - dispatchEvent(event); + dispatchEvent(event); } private function onIOErrorEvent(event:IOErrorEvent):void { - fail(); + fail(); } private function onNetStatusEvent(event:NetStatusEvent):void { - switch (event.info.code) { - case "NetConnection.Connect.Success" : - clearInterval(connectionTimeout); - startPublishStream(); - dispatchEvent(new RTMFPSocketEvent(RTMFPSocketEvent.CONNECT_SUCCESS)); - break; - case "NetStream.Connect.Success" : - break; - case "NetStream.Publish.BadName" : - fail(); - break; - case "NetStream.Connect.Closed" : - // we've disconnected from the peer - // can reset to accept another - // clear the publish stream and re-publish another - dispatchEvent(new RTMFPSocketEvent(RTMFPSocketEvent.PEER_DISCONNECTED, recvStream)); - break; - } + switch (event.info.code) { + case "NetConnection.Connect.Success" : + clearInterval(connectionTimeout); + startPublishStream(); + dispatchEvent(new RTMFPSocketEvent(RTMFPSocketEvent.CONNECT_SUCCESS)); + break; + case "NetStream.Connect.Success" : + break; + case "NetStream.Publish.BadName" : + fail(); + break; + case "NetStream.Connect.Closed" : + // we've disconnected from the peer + // can reset to accept another + // clear the publish stream and re-publish another + dispatchEvent(new RTMFPSocketEvent(RTMFPSocketEvent.PEER_DISCONNECTED, recvStream)); + break; + } } private function onPeerConnect(peer:NetStream):Boolean { - // establish a bidirectional stream with the peer - if (peerID == null) { - this.peer = peer.farID; - } + // establish a bidirectional stream with the peer + if (peerID == null) { + this.peer = peer.farID; + } - // disallow additional peers connecting to us - if (peer.farID != peerID) return false; + // disallow additional peers connecting to us + if (peer.farID != peerID) return false; - peer.send("setPeerConnectAcknowledged"); - dispatchEvent(new RTMFPSocketEvent(RTMFPSocketEvent.PEER_CONNECTED, peer)); + peer.send("setPeerConnectAcknowledged"); + dispatchEvent(new RTMFPSocketEvent(RTMFPSocketEvent.PEER_CONNECTED, peer)); - return true; + return true; } private function onPeerConnectAcknowledged(event:Event):void { - dispatchEvent(new RTMFPSocketEvent(RTMFPSocketEvent.PEERING_SUCCESS, recvStream)); + dispatchEvent(new RTMFPSocketEvent(RTMFPSocketEvent.PEERING_SUCCESS, recvStream)); } private function onPeerConnectTimeout(peer:NetStream):void { - if (!recvStream.client) return; - if (!RTMFPSocketClient(recvStream.client).peerConnectAcknowledged) { - dispatchEvent(new RTMFPSocketEvent(RTMFPSocketEvent.PEERING_FAIL, recvStream)); - } + if (!recvStream.client) return; + if (!RTMFPSocketClient(recvStream.client).peerConnectAcknowledged) { + dispatchEvent(new RTMFPSocketEvent(RTMFPSocketEvent.PEERING_FAIL, recvStream)); + } } private function onSecurityErrorEvent(event:SecurityErrorEvent):void { - fail(); + fail(); } private function onSendStreamEvent(event:NetStatusEvent):void { - switch (event.info.code) { - case ("NetStream.Publish.Start") : - dispatchEvent(new RTMFPSocketEvent(RTMFPSocketEvent.PUBLISH_START)); - break; - case ("NetStream.Play.Reset") : - case ("NetStream.Play.Start") : - break; - } - } - private function onRecvStreamEvent(event:NetStatusEvent):void - { - switch (event.info.code) { - case ("NetStream.Publish.Start") : - case ("NetStream.Play.Reset") : - case ("NetStream.Play.Start") : - break; - } - } + switch (event.info.code) { + case ("NetStream.Publish.Start") : + dispatchEvent(new RTMFPSocketEvent(RTMFPSocketEvent.PUBLISH_START)); + break; + case ("NetStream.Play.Reset") : + case ("NetStream.Play.Start") : + break; + } + } + + private function onRecvStreamEvent(event:NetStatusEvent):void + { + switch (event.info.code) { + case ("NetStream.Publish.Start") : + case ("NetStream.Play.Reset") : + case ("NetStream.Play.Start") : + break; + } + } } }

1 0

[flashproxy/master] Merge branch 'master' of http://www.bamsoftware.com/git/jscat
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit aedb495716f40ffe425b1d32abcbf40f77bdc736 Merge: a944892 384ad67 Author: Nate Hardison <nate(a)dn5221d4.sunet> Date: Fri May 13 16:00:28 2011 -0700 Merge branch 'master' of http://www.bamsoftware.com/git/jscat README | 2 +- badge.png | Bin 0 -> 170 bytes swfcat.as | 45 +++++++++++++++++++++++++++++++-------------- 3 files changed, 32 insertions(+), 15 deletions(-)

1 0

[flashproxy/master] Merge branch 'master' of http://www.bamsoftware.com/git/jscat
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit f346b59702f05d60d891398a4879fbf4254f7605 Merge: 858801c 1f76c4a Author: Nate Hardison <nate(a)rescomp-09-154551.stanford.edu> Date: Mon May 9 14:43:54 2011 -0700 Merge branch 'master' of http://www.bamsoftware.com/git/jscat .gitignore | 2 +- README | 20 +++-- connector.py | 178 +++++++++++++++++++++++++++++++++++++---- crossdomain.xml | Bin 91 -> 0 bytes facilitator.py | 26 ++++-- notes.txt | 5 + reconnector.py | 98 +++++++++++++++++++++++ swfcat.as | 237 +++++++++++++++++++++++++++++++++++-------------------- 8 files changed, 444 insertions(+), 122 deletions(-)

1 0