- tor-commits - lists.torproject.org

[flashproxy/master] Beginnings of bandwidth limiting
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit a8e37c5a2ecf19e5762318c1f076f17028f66a25 Author: Nate Hardison <nate(a)dn0a20293b.sunet> Date: Sat May 14 15:13:22 2011 -0700 Beginnings of bandwidth limiting --- swfcat.as | 90 ++++++++++++++++++++++++++++++++++++++++++++++++------------ 1 files changed, 72 insertions(+), 18 deletions(-) diff --git a/swfcat.as b/swfcat.as index fa55b51..423f30a 100644 --- a/swfcat.as +++ b/swfcat.as @@ -36,8 +36,8 @@ package private var fac_addr:Object; - [Embed(source="badge.png")] - private var BadgeImage:Class; + //[Embed(source="badge.png")] + //private var BadgeImage:Class; public function puts(s:String):void { @@ -71,8 +71,8 @@ package if (this.loaderInfo.parameters["debug"]) addChild(output_text); - else - addChild(new BadgeImage()); + //else + // addChild(new BadgeImage()); fac_spec = this.loaderInfo.parameters["facilitator"]; if (fac_spec) { @@ -168,6 +168,7 @@ 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 @@ -184,6 +185,19 @@ class ProxyPair // 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 { @@ -197,11 +211,16 @@ class ProxyPair "," + this.addr_r.host + ":" + this.addr_r.port + ">"; } - public function ProxyPair(ui:swfcat, addr_c:Object, addr_r:Object) + public function ProxyPair(ui:swfcat, addr_c:Object, addr_r:Object, rate_limit:uint = DEFAULT_RATE_LIMIT) { this.ui = ui; this.addr_c = addr_c; this.addr_r = addr_r; + this.rate_limit = rate_limit; + this.curr_rate = 0.0; + this.historical_rate = 0.0; + this.lifetime = 0; + setInterval(update_transfer_rate, DEFAULT_RATE_TIMEOUT) } public function connect():void @@ -259,18 +278,53 @@ class ProxyPair private function client_connected(e:Event):void { log("Client: connected."); - - s_r.addEventListener(ProgressEvent.SOCKET_DATA, function (e:ProgressEvent):void { - var bytes:ByteArray = new ByteArray(); - s_r.readBytes(bytes, 0, e.bytesLoaded); - log("Tor: read " + bytes.length + "."); - s_c.writeBytes(bytes); - }); - s_c.addEventListener(ProgressEvent.SOCKET_DATA, function (e:ProgressEvent):void { - var bytes:ByteArray = new ByteArray(); - s_c.readBytes(bytes, 0, e.bytesLoaded); - log("Client: read " + bytes.length + "."); - s_r.writeBytes(bytes); - }); + add_data_listeners(); + } + + private function add_data_listeners():void + { + s_r.addEventListener(ProgressEvent.SOCKET_DATA, transfer_to_client); + s_c.addEventListener(ProgressEvent.SOCKET_DATA, transfer_to_relay); + } + + private function remove_data_listeners():void + { + s_r.removeEventListener(ProgressEvent.SOCKET_DATA, transfer_to_client); + s_c.removeEventListener(ProgressEvent.SOCKET_DATA, transfer_to_relay); + } + + private function transfer_to_client(e:ProgressEvent):void + { + log("Tor: read " + e.bytesLoaded + "."); + transfer_bytes(s_r, s_c, e.bytesLoaded); + } + + private function transfer_to_relay(e:ProgressEvent):void + { + log("Client: read " + e.bytesLoaded + "."); + transfer_bytes(s_c, s_r, e.bytesLoaded); + } + + private function transfer_bytes(src:Socket, dst:Socket, num_bytes:uint):void + { + var bytes:ByteArray = new ByteArray(); + src.readBytes(bytes, 0, num_bytes); + dst.writeBytes(bytes); + curr_rate += num_bytes; + if (rate_limit_exceeded()) remove_data_listeners(); + } + + private function rate_limit_exceeded():Boolean + { + return curr_rate > rate_limit; + } + + private function update_transfer_rate():void + { + lifetime++; + historical_rate = (0.7 * historical_rate + 0.3 * curr_rate) / lifetime; + curr_rate = historical_rate; + log("Historical rate: " + historical_rate); + log("Current rate: " + curr_rate); } }

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 28e15b7a445404273e6488243827b4a85b9253e1 Merge: aedb495 1f773dd Author: Nate Hardison <nate(a)dn0a20293b.sunet> Date: Sat May 14 13:53:54 2011 -0700 Merge branch 'master' of http://www.bamsoftware.com/git/jscat .gitignore | 1 + connector.py | 8 +- crossdomaind.py | 14 +++- facilitator.py | 279 +++++++++++++++++++++++++++++++++---------------------- reconnector.py | 8 +- 5 files changed, 187 insertions(+), 123 deletions(-)

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] 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] Merge branch 'rtmfp' of ssh://upload.bamsoftware.com/~dcf/flashproxy into rtmfp
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 761a300ed9545faebcbfa35e06fb4369c06ae3dd Merge: acd156a 9b7947e Author: Nate Hardison <nate(a)dn0a208c2d.sunet> Date: Fri May 20 13:00:36 2011 -0700 Merge branch 'rtmfp' of ssh://upload.bamsoftware.com/~dcf/flashproxy into rtmfp Makefile | 4 +- README | 9 ++ badge.png | Bin 170 -> 264 bytes badge_con_counter.png | Bin 0 -> 270 bytes connector.py | 206 +++++++++++++++++++++++++++++++++---------------- crossdomaind.py | 1 - design.txt | 164 +++++++++++++++++++++++++++++++++++++++ facilitator.py | 101 +++++++++++++++---------- notes.txt | 4 + reconnector.py | 8 +- swfcat.as | 115 ++++++++++++++++++++++++---- 11 files changed, 485 insertions(+), 127 deletions(-)

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] Switch back to the public relay.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 5570e265c210b44c539707aae7398f75630d5388 Author: David Fifield <david(a)bamsoftware.com> Date: Tue May 24 15:58:28 2011 -0700 Switch back to the public relay. --- com/rtmfpcat/rtmfpcat.as | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/com/rtmfpcat/rtmfpcat.as b/com/rtmfpcat/rtmfpcat.as index c3d3fca..328274a 100644 --- a/com/rtmfpcat/rtmfpcat.as +++ b/com/rtmfpcat/rtmfpcat.as @@ -29,10 +29,10 @@ package port: 3333 }; - /* David's bridge (nickname eRYaZuvY02FpExln) that also serves a + /* David's relay (nickname 3VXRyxz67OeRoqHn) that also serves a crossdomain policy. */ private const DEFAULT_TOR_PROXY_ADDR:Object = { - host: "69.164.193.231", + host: "173.255.221.44", port: 9001 };

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

[arm/master] Moving menu generation into a dedicated file
by atagar＠torproject.org 12 Jun '11

12 Jun '11

commit af0580268ef996be857eb8300aecf1848894b724 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 11 18:53:02 2011 -0700 Moving menu generation into a dedicated file --- src/cli/menu/__init__.py | 2 +- src/cli/menu/actions.py | 73 ++++++++++++++++++++++++++++++++++++++++++++++ src/cli/menu/menu.py | 69 +------------------------------------------ 3 files changed, 76 insertions(+), 68 deletions(-) diff --git a/src/cli/menu/__init__.py b/src/cli/menu/__init__.py index e6b5f10..f6d43ec 100644 --- a/src/cli/menu/__init__.py +++ b/src/cli/menu/__init__.py @@ -2,5 +2,5 @@ Resources for displaying the menu. """ -__all__ = ["item", "menu"] +__all__ = ["actions", "item", "menu"] diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py new file mode 100644 index 0000000..f6f88ba --- /dev/null +++ b/src/cli/menu/actions.py @@ -0,0 +1,73 @@ +""" +Generates the menu for arm, binding options with their related actions. +""" + +import cli.menu.item + +def makeMenu(): + """ + Constructs the base menu and all of its contents. + """ + + baseMenu = cli.menu.item.Submenu("") + + fileMenu = cli.menu.item.Submenu("File") + fileMenu.add(cli.menu.item.MenuItem("Exit", None)) + baseMenu.add(fileMenu) + + logsMenu = cli.menu.item.Submenu("Logs") + logsMenu.add(cli.menu.item.MenuItem("Events", None)) + logsMenu.add(cli.menu.item.MenuItem("Clear", None)) + logsMenu.add(cli.menu.item.MenuItem("Save", None)) + logsMenu.add(cli.menu.item.MenuItem("Filter", None)) + + duplicatesSubmenu = cli.menu.item.Submenu("Duplicates") + duplicatesSubmenu.add(cli.menu.item.MenuItem("Hidden", None)) + duplicatesSubmenu.add(cli.menu.item.MenuItem("Visible", None)) + logsMenu.add(duplicatesSubmenu) + baseMenu.add(logsMenu) + + viewMenu = cli.menu.item.Submenu("View") + viewMenu.add(cli.menu.item.MenuItem("Graph", None)) + viewMenu.add(cli.menu.item.MenuItem("Connections", None)) + viewMenu.add(cli.menu.item.MenuItem("Configuration", None)) + viewMenu.add(cli.menu.item.MenuItem("Configuration File", None)) + baseMenu.add(viewMenu) + + graphMenu = cli.menu.item.Submenu("Graph") + graphMenu.add(cli.menu.item.MenuItem("Stats", None)) + + sizeSubmenu = cli.menu.item.Submenu("Size") + sizeSubmenu.add(cli.menu.item.MenuItem("Increase", None)) + sizeSubmenu.add(cli.menu.item.MenuItem("Decrease", None)) + graphMenu.add(sizeSubmenu) + + graphMenu.add(cli.menu.item.MenuItem("Update Interval", None)) + + boundsSubmenu = cli.menu.item.Submenu("Bounds") + boundsSubmenu.add(cli.menu.item.MenuItem("Local Max", None)) + boundsSubmenu.add(cli.menu.item.MenuItem("Global Max", None)) + boundsSubmenu.add(cli.menu.item.MenuItem("Tight", None)) + graphMenu.add(boundsSubmenu) + baseMenu.add(graphMenu) + + connectionsMenu = cli.menu.item.Submenu("Connections") + connectionsMenu.add(cli.menu.item.MenuItem("Identity", None)) + connectionsMenu.add(cli.menu.item.MenuItem("Resolver", None)) + connectionsMenu.add(cli.menu.item.MenuItem("Sort Order", None)) + baseMenu.add(connectionsMenu) + + configurationMenu = cli.menu.item.Submenu("Configuration") + + commentsSubmenu = cli.menu.item.Submenu("Comments") + commentsSubmenu.add(cli.menu.item.MenuItem("Hidden", None)) + commentsSubmenu.add(cli.menu.item.MenuItem("Visible", None)) + configurationMenu.add(commentsSubmenu) + + configurationMenu.add(cli.menu.item.MenuItem("Reload", None)) + configurationMenu.add(cli.menu.item.MenuItem("Reset Tor", None)) + baseMenu.add(configurationMenu) + + return baseMenu + + diff --git a/src/cli/menu/menu.py b/src/cli/menu/menu.py index f83b76d..e0728e8 100644 --- a/src/cli/menu/menu.py +++ b/src/cli/menu/menu.py @@ -4,75 +4,10 @@ import curses import cli.popups import cli.controller import cli.menu.item +import cli.menu.actions from util import uiTools -def makeMenu(): - """ - Constructs the base menu and all of its contents. - """ - - baseMenu = cli.menu.item.Submenu("") - - fileMenu = cli.menu.item.Submenu("File") - fileMenu.add(cli.menu.item.MenuItem("Exit", None)) - baseMenu.add(fileMenu) - - logsMenu = cli.menu.item.Submenu("Logs") - logsMenu.add(cli.menu.item.MenuItem("Events", None)) - logsMenu.add(cli.menu.item.MenuItem("Clear", None)) - logsMenu.add(cli.menu.item.MenuItem("Save", None)) - logsMenu.add(cli.menu.item.MenuItem("Filter", None)) - - duplicatesSubmenu = cli.menu.item.Submenu("Duplicates") - duplicatesSubmenu.add(cli.menu.item.MenuItem("Hidden", None)) - duplicatesSubmenu.add(cli.menu.item.MenuItem("Visible", None)) - logsMenu.add(duplicatesSubmenu) - baseMenu.add(logsMenu) - - viewMenu = cli.menu.item.Submenu("View") - viewMenu.add(cli.menu.item.MenuItem("Graph", None)) - viewMenu.add(cli.menu.item.MenuItem("Connections", None)) - viewMenu.add(cli.menu.item.MenuItem("Configuration", None)) - viewMenu.add(cli.menu.item.MenuItem("Configuration File", None)) - baseMenu.add(viewMenu) - - graphMenu = cli.menu.item.Submenu("Graph") - graphMenu.add(cli.menu.item.MenuItem("Stats", None)) - - sizeSubmenu = cli.menu.item.Submenu("Size") - sizeSubmenu.add(cli.menu.item.MenuItem("Increase", None)) - sizeSubmenu.add(cli.menu.item.MenuItem("Decrease", None)) - graphMenu.add(sizeSubmenu) - - graphMenu.add(cli.menu.item.MenuItem("Update Interval", None)) - - boundsSubmenu = cli.menu.item.Submenu("Bounds") - boundsSubmenu.add(cli.menu.item.MenuItem("Local Max", None)) - boundsSubmenu.add(cli.menu.item.MenuItem("Global Max", None)) - boundsSubmenu.add(cli.menu.item.MenuItem("Tight", None)) - graphMenu.add(boundsSubmenu) - baseMenu.add(graphMenu) - - connectionsMenu = cli.menu.item.Submenu("Connections") - connectionsMenu.add(cli.menu.item.MenuItem("Identity", None)) - connectionsMenu.add(cli.menu.item.MenuItem("Resolver", None)) - connectionsMenu.add(cli.menu.item.MenuItem("Sort Order", None)) - baseMenu.add(connectionsMenu) - - configurationMenu = cli.menu.item.Submenu("Configuration") - - commentsSubmenu = cli.menu.item.Submenu("Comments") - commentsSubmenu.add(cli.menu.item.MenuItem("Hidden", None)) - commentsSubmenu.add(cli.menu.item.MenuItem("Visible", None)) - configurationMenu.add(commentsSubmenu) - - configurationMenu.add(cli.menu.item.MenuItem("Reload", None)) - configurationMenu.add(cli.menu.item.MenuItem("Reset Tor", None)) - baseMenu.add(configurationMenu) - - return baseMenu - class MenuCursor: """ Tracks selection and key handling in the menu. @@ -139,7 +74,7 @@ def showMenu(): try: # generates the menu and uses the initial selection of the first item in # the file menu - menu = makeMenu() + menu = cli.menu.actions.makeMenu() cursor = MenuCursor(menu.getChildren()[0].getChildren()[0]) while not cursor.isDone():

1 0

[arm/master] Binding handlers for the actions submenu
by atagar＠torproject.org 12 Jun '11

12 Jun '11

commit 66e10cc08f300e46d8c6eb9857a664d824bf1159 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 11 19:19:41 2011 -0700 Binding handlers for the actions submenu Making a functional actions submenu which includes options for... - Close Menu - Pause / Unpause - Reset Tor - Quit --- src/cli/controller.py | 23 +++++++++++++++++++---- src/cli/menu/actions.py | 30 ++++++++++++++++++++++++++---- src/cli/menu/item.py | 7 +++++-- 3 files changed, 50 insertions(+), 10 deletions(-) diff --git a/src/cli/controller.py b/src/cli/controller.py index 997d9d3..faf9248 100644 --- a/src/cli/controller.py +++ b/src/cli/controller.py @@ -150,6 +150,7 @@ class Controller: self._page = 0 self._isPaused = False self._forceRedraw = False + self._isDone = False self.setMsg() # initializes our control message def getScreen(self): @@ -312,6 +313,20 @@ class Controller: if redraw: controlPanel.redraw(True) else: self._forceRedraw = True + + def isDone(self): + """ + True if arm should be terminated, false otherwise. + """ + + return self._isDone + + def quit(self): + """ + Terminates arm after the input is processed. + """ + + self._isDone = True def shutdownDaemons(): """ @@ -477,7 +492,7 @@ def drawTorMonitor(stdscr, startTime): menuKeys = [] - while True: + while not control.isDone(): displayPanels = control.getDisplayPanels() isUnresponsive = heartbeatCheck(isUnresponsive) @@ -529,9 +544,7 @@ def drawTorMonitor(stdscr, startTime): quitConfirmed = confirmationKey in (ord('q'), ord('Q')) else: quitConfirmed = True - if quitConfirmed: - shutdownDaemons() - break + if quitConfirmed: control.quit() elif key == ord('x') or key == ord('X'): # provides prompt to confirm that arm should issue a sighup msg = "This will reset Tor's internal state. Are you sure (x again to confirm)?" @@ -547,4 +560,6 @@ def drawTorMonitor(stdscr, startTime): for panelImpl in displayPanels: isKeystrokeConsumed = panelImpl.handleKey(key) if isKeystrokeConsumed: break + + shutdownDaemons() diff --git a/src/cli/menu/actions.py b/src/cli/menu/actions.py index f6f88ba..751751f 100644 --- a/src/cli/menu/actions.py +++ b/src/cli/menu/actions.py @@ -2,18 +2,20 @@ Generates the menu for arm, binding options with their related actions. """ +import functools + +import cli.controller import cli.menu.item +from util import torTools + def makeMenu(): """ Constructs the base menu and all of its contents. """ baseMenu = cli.menu.item.Submenu("") - - fileMenu = cli.menu.item.Submenu("File") - fileMenu.add(cli.menu.item.MenuItem("Exit", None)) - baseMenu.add(fileMenu) + baseMenu.add(makeActionsMenu()) logsMenu = cli.menu.item.Submenu("Logs") logsMenu.add(cli.menu.item.MenuItem("Events", None)) @@ -70,4 +72,24 @@ def makeMenu(): return baseMenu +def makeActionsMenu(): + """ + Submenu consisting of... + Close Menu + Pause / Unpause + Reset Tor + Exit + """ + + control = cli.controller.getController() + actionsMenu = cli.menu.item.Submenu("Actions") + actionsMenu.add(cli.menu.item.MenuItem("Close Menu", None)) + + if control.isPaused(): label, arg = "Unpause", False + else: label, arg = "Pause", True + actionsMenu.add(cli.menu.item.MenuItem(label, functools.partial(control.setPaused, arg))) + + actionsMenu.add(cli.menu.item.MenuItem("Reset Tor", torTools.getConn().reload)) + actionsMenu.add(cli.menu.item.MenuItem("Exit", control.quit)) + return actionsMenu diff --git a/src/cli/menu/item.py b/src/cli/menu/item.py index bfc7ffd..8c5d314 100644 --- a/src/cli/menu/item.py +++ b/src/cli/menu/item.py @@ -53,8 +53,8 @@ class MenuItem(): the menu and false otherwise. """ - if self._callback: return self._callback() - else: return False + if self._callback: self._callback() + return True def next(self): """ @@ -143,4 +143,7 @@ class Submenu(MenuItem): """ return not bool(self._children) + + def select(self): + return False

1 0