June 2011 - tor-commits - lists.torproject.org

[flashproxy/rtmfp] Make parse_addr_spec static.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 3cfcc0dcab1f8235bc847b12b03e265006575382 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 13:47:53 2011 -0700 Make parse_addr_spec static. Uniformity with master. --- swfcat.as | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/swfcat.as b/swfcat.as index d24c833..e75ffac 100644 --- a/swfcat.as +++ b/swfcat.as @@ -260,7 +260,7 @@ package /* Parse an address in the form "host:port". Returns an Object with keys "host" (String) and "port" (int). Returns null on error. */ - private function parse_addr_spec(spec:String):Object + private static function parse_addr_spec(spec:String):Object { var parts:Array; var addr:Object;

1 0

[flashproxy/rtmfp] Move the rate limit back into swfcat from ProxyPair.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 832f6bcf7fda65054a553aeeaf569d493030bf85 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 14:03:08 2011 -0700 Move the rate limit back into swfcat from ProxyPair. It should be global, not per-ProxyPair. Also uniformity with master. --- ProxyPair.as | 117 ++-------------------------------------------------------- swfcat.as | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 113 deletions(-) diff --git a/ProxyPair.as b/ProxyPair.as index 6ca60ef..fa51933 100644 --- a/ProxyPair.as +++ b/ProxyPair.as @@ -30,13 +30,6 @@ package private var relay_socket:Socket; private var r2c_schedule:Array; - // Bytes per second. Set to undefined to disable limit. - private const RATE_LIMIT:Number = undefined; //10000; - // Seconds. - private const RATE_LIMIT_HISTORY:Number = 5.0; - - private var rate_limit:RateLimit; - // Callback id. private var flush_id:uint; @@ -51,11 +44,6 @@ package this.c2r_schedule = new Array(); this.r2c_schedule = new Array(); - if (RATE_LIMIT) - rate_limit = new BucketRateLimit(RATE_LIMIT * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); - else - rate_limit = new RateUnlimit(); - setup_relay_socket(); /* client_socket setup should be taken */ @@ -147,25 +135,25 @@ package /* Can't do anything until connected. */ return; - while (!rate_limit.is_limited() && (c2r_schedule.length > 0 || r2c_schedule.length > 0)) { + while (!ui.rate_limit.is_limited() && (c2r_schedule.length > 0 || r2c_schedule.length > 0)) { var num_bytes:uint; if (c2r_schedule.length > 0) { num_bytes = c2r_schedule.shift(); transfer_bytes(null, relay_socket, num_bytes); - rate_limit.update(num_bytes); + ui.rate_limit.update(num_bytes); } if (r2c_schedule.length > 0) { num_bytes = r2c_schedule.shift(); transfer_bytes(relay_socket, null, num_bytes); - rate_limit.update(num_bytes); + ui.rate_limit.update(num_bytes); } } /* Call again when safe, if necessary. */ if (c2r_schedule.length > 0 || r2c_schedule.length > 0) - flush_id = setTimeout(flush, rate_limit.when() * 1000); + flush_id = setTimeout(flush, ui.rate_limit.when() * 1000); } /* Helper function to write output to the @@ -177,100 +165,3 @@ package } } } - -import flash.utils.getTimer; - -class RateLimit -{ - public function RateLimit() - { - } - - public function update(n:Number):Boolean - { - return true; - } - - public function when():Number - { - return 0.0; - } - - public function is_limited():Boolean - { - return false; - } -} - -class RateUnlimit extends RateLimit -{ - public function RateUnlimit() - { - } - - public override function update(n:Number):Boolean - { - return true; - } - - public override function when():Number - { - return 0.0; - } - - public override function is_limited():Boolean - { - return false; - } -} - -class BucketRateLimit extends RateLimit -{ - private var amount:Number; - private var capacity:Number; - private var time:Number; - private var last_update:uint; - - public function BucketRateLimit(capacity:Number, time:Number) - { - this.amount = 0.0; - /* capacity / time is the rate we are aiming for. */ - this.capacity = capacity; - this.time = time; - this.last_update = getTimer(); - } - - private function age():void - { - var now:uint; - var delta:Number; - - now = getTimer(); - delta = (now - last_update) / 1000.0; - last_update = now; - - amount -= delta * capacity / time; - if (amount < 0.0) - amount = 0.0; - } - - public override function update(n:Number):Boolean - { - age(); - amount += n; - - return amount <= capacity; - } - - public override function when():Number - { - age(); - return (amount - capacity) / (capacity / time); - } - - public override function is_limited():Boolean - { - age(); - return amount > capacity; - } -} diff --git a/swfcat.as b/swfcat.as index e75ffac..42bcfea 100644 --- a/swfcat.as +++ b/swfcat.as @@ -41,6 +41,11 @@ package // Milliseconds. private const FACILITATOR_POLL_INTERVAL:int = 10000; + // Bytes per second. Set to undefined to disable limit. + public const RATE_LIMIT:Number = undefined; + // Seconds. + private const RATE_LIMIT_HISTORY:Number = 5.0; + // Socket to Cirrus server private var s_c:CirrusSocket; // Socket to facilitator. @@ -65,6 +70,8 @@ package private var fac_addr:Object; private var relay_addr:Object; + public var rate_limit:RateLimit; + public function swfcat() { proxy_mode = false; @@ -73,6 +80,11 @@ package // Absolute positioning. stage.scaleMode = StageScaleMode.NO_SCALE; stage.align = StageAlign.TOP_LEFT; + + if (RATE_LIMIT) + rate_limit = new BucketRateLimit(RATE_LIMIT * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); + else + rate_limit = new RateUnlimit(); // Wait until the query string parameters are loaded. this.loaderInfo.addEventListener(Event.COMPLETE, loaderinfo_complete); @@ -279,6 +291,7 @@ package import flash.text.TextFormat; import flash.text.TextField; +import flash.utils.getTimer; class Badge extends flash.display.Sprite { @@ -360,3 +373,98 @@ class Badge extends flash.display.Sprite cur_client_count_tf.appendText("."); } } + +class RateLimit +{ + public function RateLimit() + { + } + + public function update(n:Number):Boolean + { + return true; + } + + public function when():Number + { + return 0.0; + } + + public function is_limited():Boolean + { + return false; + } +} + +class RateUnlimit extends RateLimit +{ + public function RateUnlimit() + { + } + + public override function update(n:Number):Boolean + { + return true; + } + + public override function when():Number + { + return 0.0; + } + + public override function is_limited():Boolean + { + return false; + } +} + +class BucketRateLimit extends RateLimit +{ + private var amount:Number; + private var capacity:Number; + private var time:Number; + private var last_update:uint; + + public function BucketRateLimit(capacity:Number, time:Number) + { + this.amount = 0.0; + /* capacity / time is the rate we are aiming for. */ + this.capacity = capacity; + this.time = time; + this.last_update = getTimer(); + } + + private function age():void + { + var now:uint; + var delta:Number; + + now = getTimer(); + delta = (now - last_update) / 1000.0; + last_update = now; + + amount -= delta * capacity / time; + if (amount < 0.0) + amount = 0.0; + } + + public override function update(n:Number):Boolean + { + age(); + amount += n; + + return amount <= capacity; + } + + public override function when():Number + { + age(); + return (amount - capacity) / (capacity / time); + } + + public override function is_limited():Boolean + { + age(); + return amount > capacity; + } +}

1 0

[flashproxy/rtmfp] Remove SQSProxyPair.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit e36a17361895f039409458aeff5e6786c87236eb Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 14:26:36 2011 -0700 Remove SQSProxyPair. At the moment it's just dead code. --- SQSProxyPair.as | 77 ------------------------------------------------------- swfcat.as | 9 ------ 2 files changed, 0 insertions(+), 86 deletions(-) diff --git a/SQSProxyPair.as b/SQSProxyPair.as deleted file mode 100644 index 20a6a65..0000000 --- a/SQSProxyPair.as +++ /dev/null @@ -1,77 +0,0 @@ -package -{ - 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; - - public class SQSProxyPair extends ProxyPair - { - private var client_socket:Socket; - - public function SQSProxyPair(ui:swfcat) - { - super(this, ui); - - log("Starting SQS proxy pair"); - setup_client_socket(); - } - - override public function set client(client_addr:Object):void - { - this.client_addr = client_addr; - log("Client: connecting to " + client_addr.host + ":" + client_addr.port + "."); - client_socket.connect(client_addr.host, client_addr.port); - } - - override public function close():void - { - super.close(); - if (client_socket != null && client_socket.connected) { - client_socket.close(); - } - dispatchEvent(new Event(Event.CLOSE)); - } - - override public function get connected():Boolean - { - return (super.connected && client_socket != null && client_socket.connected); - } - - override protected function transfer_bytes(src:Object, dst:Object, num_bytes:uint):void - { - var bytes:ByteArray = new ByteArray(); - - if (src == null) { - src = client_socket; - } - - if (dst == null) { - dst = client_socket; - } - - Socket(src).readBytes(bytes, 0, num_bytes); - log("SQSProxyPair: transferring " + num_bytes + " bytes."); - Socket(dst).writeBytes(bytes); - } - - private function setup_client_socket():void - { - client_socket = new Socket(); - - client_socket.addEventListener(Event.CONNECT, function (e:Event):void { - log("Client: connected to " + client_addr.host + ":" + client_addr.port + "."); - if (connected) { - dispatchEvent(new Event(Event.CONNECT)); - } - }); - client_socket.addEventListener(Event.CLOSE, socket_error("Client: closed")); - client_socket.addEventListener(IOErrorEvent.IO_ERROR, socket_error("Client: I/O error")); - client_socket.addEventListener(SecurityErrorEvent.SECURITY_ERROR, socket_error("Client: security error")) - client_socket.addEventListener(ProgressEvent.SOCKET_DATA, client_to_relay); - } - } -} diff --git a/swfcat.as b/swfcat.as index 42bcfea..1281b9f 100644 --- a/swfcat.as +++ b/swfcat.as @@ -13,7 +13,6 @@ package import ProxyPair; import RTMFPProxyPair; - import SQSProxyPair; import TCPProxyPair; import rtmfp.CirrusSocket; @@ -257,14 +256,6 @@ package return new RTMFPProxyPair(this, s_c, s_c.local_stream_name); } - // currently is the same as TCPProxyPair - // could be interesting to see how this works - // can't imagine it will work terribly well... - private function sqs_proxy_pair_factory():ProxyPair - { - return new SQSProxyPair(this); - } - private function tcp_proxy_pair_factory():ProxyPair { return new TCPProxyPair(this);

1 0

[flashproxy/rtmfp] Remove unused and unnecessary proxy_pairs local.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 02c9a40838804f2e0cc2b935b00b944078d9d7cd Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 14:45:24 2011 -0700 Remove unused and unnecessary proxy_pairs local. --- swfcat.as | 5 ----- 1 files changed, 0 insertions(+), 5 deletions(-) diff --git a/swfcat.as b/swfcat.as index 1281b9f..8e54f72 100644 --- a/swfcat.as +++ b/swfcat.as @@ -55,8 +55,6 @@ package private var client_id:String; private var proxy_pair_factory:Function; - private var proxy_pairs:Array; - private var debug_mode:Boolean; private var proxy_mode:Boolean; @@ -118,9 +116,6 @@ package } puts("Starting: parameters loaded."); - - /* TODO: use this to have multiple proxies going at once */ - proxy_pairs = new Array(); fac_spec = this.loaderInfo.parameters["facilitator"]; if (fac_spec) {

1 0

[flashproxy/rtmfp] Add an RTMFPSocket class.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 9a85e5b90a37c8c989cda04f69862b82f25ca924 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 21:26:55 2011 -0700 Add an RTMFPSocket class. --- RTMFPSocket.as | 209 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 209 insertions(+), 0 deletions(-) diff --git a/RTMFPSocket.as b/RTMFPSocket.as new file mode 100644 index 0000000..e23c4fd --- /dev/null +++ b/RTMFPSocket.as @@ -0,0 +1,209 @@ +/* +The RTMFPSocket class provides a socket-like interface around RTMFP +NetConnection and NetStream. Each RTMFPSocket contains one NetConnection and two +NetStreams, one for reading and one for writing. + +To create a listening socket: + var rs:RTMFPSocket = new RTMFPSocket(url, key); + rs.addEventListener(Event.COMPLETE, function (e:Event):void { + // rs.id is set and can be sent out of band to the client. + }); + rs.addEventListener(RTMFPSocket.ACCEPT_EVENT, function (e:Event):void { + // rs.peer_id is the ID of the connected client. + }); + rs.listen(); +To connect to a listening socket: + // Receive peer_id out of band. + var rs:RTMFPSocket = new RTMFPSocket(url, key); + rs.addEventListener(Event.CONNECT, function (e:Event):void { + // rs.id and rs.peer_id are now set. + }); +*/ + +package +{ + import flash.events.Event; + import flash.events.EventDispatcher; + import flash.events.IOErrorEvent; + import flash.events.NetStatusEvent; + import flash.events.ProgressEvent; + import flash.net.NetConnection; + import flash.net.NetStream; + import flash.utils.ByteArray; + + public class RTMFPSocket extends EventDispatcher + { + public static const ACCEPT_EVENT:String = "accept"; + + public var connected:Boolean; + + private var nc:NetConnection; + private var incoming:NetStream; + private var outgoing:NetStream; + + /* Cache to hold the peer ID between when connect is called and the + NetConnection exists. */ + private var connect_peer_id:String; + + private var buffer:ByteArray; + + private var cirrus_url:String; + private var cirrus_key:String; + + public function RTMFPSocket(cirrus_url:String, cirrus_key:String) + { + connected = false; + + buffer = new ByteArray(); + + this.cirrus_url = cirrus_url; + this.cirrus_key = cirrus_key; + + nc = new NetConnection(); + } + + public function get id():String + { + return nc.nearID; + } + + public function get peer_id():String + { + return incoming.farID; + } + + /* NetStatusEvents that aren't handled more specifically in + listen_netstatus_event or connect_netstatus_event. */ + private function generic_netstatus_event(e:NetStatusEvent):void + { + switch (e.info.code) { + case "NetConnection.Connect.Closed": + dispatchEvent(new Event(Event.CLOSE)); + break; + case "NetStream.Connect.Closed": + connected = false; + close(); + break; + default: + var event:IOErrorEvent = new IOErrorEvent(IOErrorEvent.IO_ERROR); + event.text = e.info.code; + dispatchEvent(event); + break; + } + } + + private function listen_netstatus_event(e:NetStatusEvent):void + { + switch (e.info.code) { + case "NetConnection.Connect.Success": + outgoing = new NetStream(nc, NetStream.DIRECT_CONNECTIONS); + outgoing.client = { + onPeerConnect: listen_onpeerconnect + }; + outgoing.publish("server"); + + /* listen is complete, ready to accept. */ + dispatchEvent(new Event(Event.COMPLETE)); + break; + case "NetStream.Connect.Success": + break; + default: + return generic_netstatus_event(e); + break; + } + } + + private function listen_onpeerconnect(peer:NetStream):Boolean { + incoming = new NetStream(nc, peer.farID); + incoming.client = { + r: receive_data + }; + incoming.play("client"); + + connected = true; + dispatchEvent(new Event(ACCEPT_EVENT)); + + return true; + } + + private function connect_netstatus_event(e:NetStatusEvent):void + { + switch (e.info.code) { + case "NetConnection.Connect.Success": + outgoing = new NetStream(nc, NetStream.DIRECT_CONNECTIONS); + outgoing.publish("client"); + + incoming = new NetStream(nc, connect_peer_id); + incoming.client = { + r: receive_data + }; + incoming.play("server"); + break; + case "NetStream.Connect.Success": + connected = true; + dispatchEvent(new Event(Event.CONNECT)); + break; + default: + return generic_netstatus_event(e); + break; + } + } + + /* Function called back when the other side does a send. */ + private function receive_data(bytes:ByteArray):void { + var event:ProgressEvent; + + event = new ProgressEvent(ProgressEvent.SOCKET_DATA); + event.bytesLoaded = bytes.bytesAvailable; + + bytes.readBytes(buffer, buffer.length, bytes.bytesAvailable); + if (bytes.bytesAvailable == 0) { + /* Reclaim memory space. */ + bytes.position = 0; + bytes.length = 0; + } + + dispatchEvent(event); + } + + public function listen():void + { + nc.addEventListener(NetStatusEvent.NET_STATUS, listen_netstatus_event); + nc.connect(cirrus_url, cirrus_key); + } + + public function connect(peer_id:String):void + { + /* Store for later reading by connect_netstatus_event. */ + this.connect_peer_id = peer_id; + + nc.addEventListener(NetStatusEvent.NET_STATUS, connect_netstatus_event); + nc.connect(cirrus_url, cirrus_key); + } + + public function close():void + { + outgoing.close(); + incoming.close(); + nc.close(); + } + + public function readBytes(output:ByteArray, offset:uint = 0, length:uint = 0):void + { + buffer.readBytes(output, offset, length); + } + + public function writeBytes(input:ByteArray, offset:uint = 0, length:uint = 0):void + { + var sendbuf:ByteArray; + + /* Read into a new buffer, in case offset and length do not + completely span input. */ + sendbuf = new ByteArray(); + sendbuf.writeBytes(input, offset, length); + + /* Use a short method name because it's sent over the wire. */ + outgoing.send("r", sendbuf); + } + } +}

1 0

[flashproxy/rtmfp] Remove spurious differences from master branch.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 04b11aa394ec3484844ed146d832ffa8d90fb16a Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 14:52:18 2011 -0700 Remove spurious differences from master branch. --- swfcat.as | 98 +++++++++++++++++++++++++++++++++--------------------------- 1 files changed, 54 insertions(+), 44 deletions(-) diff --git a/swfcat.as b/swfcat.as index 8e54f72..ac52ec8 100644 --- a/swfcat.as +++ b/swfcat.as @@ -37,6 +37,8 @@ package port: 9002 }; + private const MAX_NUM_PROXY_PAIRS:uint = 1; + // Milliseconds. private const FACILITATOR_POLL_INTERVAL:int = 10000; @@ -54,84 +56,90 @@ package private var client_id:String; private var proxy_pair_factory:Function; + private var relay_addr:Object; - private var debug_mode:Boolean; private var proxy_mode:Boolean; /* TextField for debug output. */ private var output_text:TextField; - - /* Badge for display */ + + /* UI shown when debug is off. */ private var badge:Badge; + /* Number of proxy pairs currently connected (up to + MAX_NUM_PROXY_PAIRS). */ + private var num_proxy_pairs:int = 0; + private var fac_addr:Object; - private var relay_addr:Object; public var rate_limit:RateLimit; + public function puts(s:String):void + { + output_text.appendText(s + "\n"); + output_text.scrollV = output_text.maxScrollV; + } + public function swfcat() { - proxy_mode = false; - debug_mode = false; - // Absolute positioning. stage.scaleMode = StageScaleMode.NO_SCALE; stage.align = StageAlign.TOP_LEFT; + output_text = new TextField(); + output_text.width = stage.stageWidth; + output_text.height = stage.stageHeight; + output_text.background = true; + output_text.backgroundColor = 0x001f0f; + output_text.textColor = 0x44cc44; + + badge = new Badge(); + if (RATE_LIMIT) rate_limit = new BucketRateLimit(RATE_LIMIT * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); else rate_limit = new RateUnlimit(); - + + puts("Starting."); // Wait until the query string parameters are loaded. this.loaderInfo.addEventListener(Event.COMPLETE, loaderinfo_complete); } - - public function puts(s:String):void - { - if (output_text != null) { - output_text.appendText(s + "\n"); - output_text.scrollV = output_text.maxScrollV; - } - } private function loaderinfo_complete(e:Event):void { var fac_spec:String; - var relay_spec:String; - debug_mode = (this.loaderInfo.parameters["debug"] != null) - proxy_mode = (this.loaderInfo.parameters["proxy"] != null); - if (proxy_mode && !debug_mode) { - badge = new Badge(); - addChild(badge); - } else { - output_text = new TextField(); - output_text.width = stage.stageWidth; - output_text.height = stage.stageHeight; - output_text.background = true; - output_text.backgroundColor = 0x001f0f; - output_text.textColor = 0x44cc44; + puts("Parameters loaded."); + + if (this.loaderInfo.parameters["debug"]) addChild(output_text); - } - - puts("Starting: parameters loaded."); - - fac_spec = this.loaderInfo.parameters["facilitator"]; - if (fac_spec) { - puts("Facilitator spec: \"" + fac_spec + "\""); - fac_addr = parse_addr_spec(fac_spec); - if (!fac_addr) { - puts("Error: Facilitator spec must be in the form \"host:port\"."); - return; - } - } else { - fac_addr = DEFAULT_FACILITATOR_ADDR; + else + addChild(badge); + + proxy_mode = (this.loaderInfo.parameters["proxy"] != null); + + fac_addr = get_param_addr("facilitator", DEFAULT_FACILITATOR_ADDR); + if (!fac_addr) { + puts("Error: Facilitator spec must be in the form \"host:port\"."); + return; } main(); } + /* Get an address structure from the given movie parameter, or the given + default. Returns null on error. */ + private function get_param_addr(param:String, default_addr:Object):Object + { + var spec:String, addr:Object; + + spec = this.loaderInfo.parameters[param]; + if (spec) + return parse_addr_spec(spec); + else + return default_addr; + } + /* The main logic begins here, after start-up issues are taken care of. */ private function main():void { @@ -175,7 +183,8 @@ package proxy_pair_factory = rtmfp_proxy_pair_factory; start_proxy_pair(); s_c.send_hello(e.peer); - } else if (!debug_mode && badge != null) { + } else { + num_proxy_pairs++; badge.proxy_begin(); } @@ -238,7 +247,8 @@ package p_p.addEventListener(Event.CLOSE, function (e:Event):void { puts("ProxyPair: connection closed."); p_p = null; - if (proxy_mode && !debug_mode && badge != null) { + if (proxy_mode) { + num_proxy_pairs--; badge.proxy_end(); } establish_facilitator_connection();

1 0

[flashproxy/master] Make parse_addr_spec static.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 3cfcc0dcab1f8235bc847b12b03e265006575382 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 13:47:53 2011 -0700 Make parse_addr_spec static. Uniformity with master. --- swfcat.as | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/swfcat.as b/swfcat.as index d24c833..e75ffac 100644 --- a/swfcat.as +++ b/swfcat.as @@ -260,7 +260,7 @@ package /* Parse an address in the form "host:port". Returns an Object with keys "host" (String) and "port" (int). Returns null on error. */ - private function parse_addr_spec(spec:String):Object + private static function parse_addr_spec(spec:String):Object { var parts:Array; var addr:Object;

1 0

[flashproxy/master] Move ProxyPair into its own file.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit c9df47139a3e9ad3a2412dcb4bc85b5b3c322bce Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 14:15:55 2011 -0700 Move ProxyPair into its own file. --- Makefile | 2 +- ProxyPair.as | 156 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ swfcat.as | 154 --------------------------------------------------------- 3 files changed, 157 insertions(+), 155 deletions(-) diff --git a/Makefile b/Makefile index 7f81cf9..ed799c6 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ TARGETS = swfcat.swf all: $(TARGETS) -swfcat.swf: badge.png +swfcat.swf: *.as badge.png %.swf: %.as $(MXMLC) -output $@ -static-link-runtime-shared-libraries $< diff --git a/ProxyPair.as b/ProxyPair.as new file mode 100644 index 0000000..ead6e00 --- /dev/null +++ b/ProxyPair.as @@ -0,0 +1,156 @@ +package +{ + import flash.events.Event; + import flash.events.EventDispatcher; + import flash.events.IOErrorEvent; + import flash.events.ProgressEvent; + import flash.events.SecurityErrorEvent; + import flash.events.TextEvent; + import flash.net.Socket; + import flash.utils.ByteArray; + import flash.utils.clearTimeout; + import flash.utils.setTimeout; + + /* An instance of a client-relay connection. */ + public class ProxyPair extends EventDispatcher + { + // Address ({host, port}) of client. + private var addr_c:Object; + // Address ({host, port}) of relay. + private var addr_r:Object; + + // Socket to client. + private var s_c:Socket; + // Socket to relay. + private var s_r:Socket; + + // Parent swfcat, for UI updates and rate meter. + private var ui:swfcat; + + // Pending byte read counts for relay and client sockets. + private var r2c_schedule:Array; + private var c2r_schedule:Array; + // Callback id. + private var flush_id:uint; + + public function log(msg:String):void + { + ui.puts(id() + ": " + msg) + } + + // String describing this pair for output. + public function id():String + { + return "<" + this.addr_c.host + ":" + this.addr_c.port + + "," + this.addr_r.host + ":" + this.addr_r.port + ">"; + } + + public function ProxyPair(ui:swfcat, addr_c:Object, addr_r:Object) + { + this.ui = ui; + this.addr_c = addr_c; + this.addr_r = addr_r; + + this.c2r_schedule = []; + this.r2c_schedule = []; + } + + /* Return a function that shows an error message and closes the other half + of a communication pair. */ + private function socket_error(message:String, other:Socket):Function + { + return function(e:Event):void { + if (e is TextEvent) + log(message + ": " + (e as TextEvent).text + "."); + else + log(message + "."); + if (other && other.connected) + other.close(); + dispatchEvent(new Event(Event.COMPLETE)); + }; + } + + public function connect():void + { + s_r = new Socket(); + + s_r.addEventListener(Event.CONNECT, relay_connected); + s_r.addEventListener(Event.CLOSE, socket_error("Relay: closed", s_c)); + s_r.addEventListener(IOErrorEvent.IO_ERROR, socket_error("Relay: I/O error", s_c)); + s_r.addEventListener(SecurityErrorEvent.SECURITY_ERROR, socket_error("Relay: security error", s_c)); + s_r.addEventListener(ProgressEvent.SOCKET_DATA, relay_to_client); + + log("Relay: connecting to " + addr_r.host + ":" + addr_r.port + "."); + s_r.connect(addr_r.host, addr_r.port); + } + + private function relay_connected(e:Event):void + { + log("Relay: connected."); + + s_c = new Socket(); + + s_c.addEventListener(Event.CONNECT, client_connected); + s_c.addEventListener(Event.CLOSE, socket_error("Client: closed", s_r)); + s_c.addEventListener(IOErrorEvent.IO_ERROR, socket_error("Client: I/O error", s_r)); + s_c.addEventListener(SecurityErrorEvent.SECURITY_ERROR, socket_error("Client: security error", s_r)); + s_c.addEventListener(ProgressEvent.SOCKET_DATA, client_to_relay); + + log("Client: connecting to " + addr_c.host + ":" + addr_c.port + "."); + s_c.connect(addr_c.host, addr_c.port); + } + + private function relay_to_client(e:ProgressEvent):void + { + r2c_schedule.push(e.bytesLoaded); + flush(); + } + + private function client_to_relay(e:ProgressEvent):void + { + c2r_schedule.push(e.bytesLoaded); + flush(); + } + + private function client_connected(e:Event):void + { + log("Client: connected."); + } + + private function transfer_chunk(s_from:Socket, s_to:Socket, n:uint, + label:String):void + { + var bytes:ByteArray; + + bytes = new ByteArray(); + s_from.readBytes(bytes, 0, n); + s_to.writeBytes(bytes); + ui.rate_limit.update(n); + log(label + ": read " + bytes.length + "."); + } + + /* Send as much data as the rate limit currently allows. */ + private function flush():void + { + if (flush_id) + clearTimeout(flush_id); + flush_id = undefined; + + if (!(s_r.connected && s_c.connected)) + /* Can't do anything until both sockets are connected. */ + return; + + while (!ui.rate_limit.is_limited() && + (r2c_schedule.length > 0 || c2r_schedule.length > 0)) { + if (r2c_schedule.length > 0) + transfer_chunk(s_r, s_c, r2c_schedule.shift(), "Relay"); + if (c2r_schedule.length > 0) + transfer_chunk(s_c, s_r, c2r_schedule.shift(), "Client"); + } + + /* Call again when safe, if necessary. */ + if (r2c_schedule.length > 0 || c2r_schedule.length > 0) + flush_id = setTimeout(flush, ui.rate_limit.when() * 1000); + } + } +} diff --git a/swfcat.as b/swfcat.as index 8d893b2..b8e198a 100644 --- a/swfcat.as +++ b/swfcat.as @@ -210,20 +210,9 @@ package } } -import flash.display.Sprite; import flash.text.TextFormat; import flash.text.TextField; -import flash.events.Event; -import flash.events.EventDispatcher; -import flash.events.IOErrorEvent; -import flash.events.ProgressEvent; -import flash.events.SecurityErrorEvent; -import flash.events.TextEvent; -import flash.net.Socket; -import flash.utils.ByteArray; -import flash.utils.clearTimeout; import flash.utils.getTimer; -import flash.utils.setTimeout; class Badge extends flash.display.Sprite { @@ -400,146 +389,3 @@ class BucketRateLimit extends RateLimit return amount > capacity; } } - -/* An instance of a client-relay connection. */ -class ProxyPair extends EventDispatcher -{ - // Address ({host, port}) of client. - private var addr_c:Object; - // Address ({host, port}) of relay. - private var addr_r:Object; - - // Socket to client. - private var s_c:Socket; - // Socket to relay. - private var s_r:Socket; - - // Parent swfcat, for UI updates and rate meter. - private var ui:swfcat; - - // Pending byte read counts for relay and client sockets. - private var r2c_schedule:Array; - private var c2r_schedule:Array; - // Callback id. - private var flush_id:uint; - - public function log(msg:String):void - { - ui.puts(id() + ": " + msg) - } - - // String describing this pair for output. - public function id():String - { - return "<" + this.addr_c.host + ":" + this.addr_c.port + - "," + this.addr_r.host + ":" + this.addr_r.port + ">"; - } - - public function ProxyPair(ui:swfcat, addr_c:Object, addr_r:Object) - { - this.ui = ui; - this.addr_c = addr_c; - this.addr_r = addr_r; - - this.c2r_schedule = []; - this.r2c_schedule = []; - } - - /* Return a function that shows an error message and closes the other half - of a communication pair. */ - private function socket_error(message:String, other:Socket):Function - { - return function(e:Event):void { - if (e is TextEvent) - log(message + ": " + (e as TextEvent).text + "."); - else - log(message + "."); - if (other && other.connected) - other.close(); - dispatchEvent(new Event(Event.COMPLETE)); - }; - } - - public function connect():void - { - s_r = new Socket(); - - s_r.addEventListener(Event.CONNECT, relay_connected); - s_r.addEventListener(Event.CLOSE, socket_error("Relay: closed", s_c)); - s_r.addEventListener(IOErrorEvent.IO_ERROR, socket_error("Relay: I/O error", s_c)); - s_r.addEventListener(SecurityErrorEvent.SECURITY_ERROR, socket_error("Relay: security error", s_c)); - s_r.addEventListener(ProgressEvent.SOCKET_DATA, relay_to_client); - - log("Relay: connecting to " + addr_r.host + ":" + addr_r.port + "."); - s_r.connect(addr_r.host, addr_r.port); - } - - private function relay_connected(e:Event):void - { - log("Relay: connected."); - - s_c = new Socket(); - - s_c.addEventListener(Event.CONNECT, client_connected); - s_c.addEventListener(Event.CLOSE, socket_error("Client: closed", s_r)); - s_c.addEventListener(IOErrorEvent.IO_ERROR, socket_error("Client: I/O error", s_r)); - s_c.addEventListener(SecurityErrorEvent.SECURITY_ERROR, socket_error("Client: security error", s_r)); - s_c.addEventListener(ProgressEvent.SOCKET_DATA, client_to_relay); - - log("Client: connecting to " + addr_c.host + ":" + addr_c.port + "."); - s_c.connect(addr_c.host, addr_c.port); - } - - private function relay_to_client(e:ProgressEvent):void - { - r2c_schedule.push(e.bytesLoaded); - flush(); - } - - private function client_to_relay(e:ProgressEvent):void - { - c2r_schedule.push(e.bytesLoaded); - flush(); - } - - private function client_connected(e:Event):void - { - log("Client: connected."); - } - - private function transfer_chunk(s_from:Socket, s_to:Socket, n:uint, - label:String):void - { - var bytes:ByteArray; - - bytes = new ByteArray(); - s_from.readBytes(bytes, 0, n); - s_to.writeBytes(bytes); - ui.rate_limit.update(n); - log(label + ": read " + bytes.length + "."); - } - - /* Send as much data as the rate limit currently allows. */ - private function flush():void - { - if (flush_id) - clearTimeout(flush_id); - flush_id = undefined; - - if (!(s_r.connected && s_c.connected)) - /* Can't do anything until both sockets are connected. */ - return; - - while (!ui.rate_limit.is_limited() && - (r2c_schedule.length > 0 || c2r_schedule.length > 0)) { - if (r2c_schedule.length > 0) - transfer_chunk(s_r, s_c, r2c_schedule.shift(), "Relay"); - if (c2r_schedule.length > 0) - transfer_chunk(s_c, s_r, c2r_schedule.shift(), "Client"); - } - - /* Call again when safe, if necessary. */ - if (r2c_schedule.length > 0 || c2r_schedule.length > 0) - flush_id = setTimeout(flush, ui.rate_limit.when() * 1000); - } -}

1 0

[flashproxy/master] Move the rate limit back into swfcat from ProxyPair.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 832f6bcf7fda65054a553aeeaf569d493030bf85 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 14:03:08 2011 -0700 Move the rate limit back into swfcat from ProxyPair. It should be global, not per-ProxyPair. Also uniformity with master. --- ProxyPair.as | 117 ++-------------------------------------------------------- swfcat.as | 108 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 112 insertions(+), 113 deletions(-) diff --git a/ProxyPair.as b/ProxyPair.as index 6ca60ef..fa51933 100644 --- a/ProxyPair.as +++ b/ProxyPair.as @@ -30,13 +30,6 @@ package private var relay_socket:Socket; private var r2c_schedule:Array; - // Bytes per second. Set to undefined to disable limit. - private const RATE_LIMIT:Number = undefined; //10000; - // Seconds. - private const RATE_LIMIT_HISTORY:Number = 5.0; - - private var rate_limit:RateLimit; - // Callback id. private var flush_id:uint; @@ -51,11 +44,6 @@ package this.c2r_schedule = new Array(); this.r2c_schedule = new Array(); - if (RATE_LIMIT) - rate_limit = new BucketRateLimit(RATE_LIMIT * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); - else - rate_limit = new RateUnlimit(); - setup_relay_socket(); /* client_socket setup should be taken */ @@ -147,25 +135,25 @@ package /* Can't do anything until connected. */ return; - while (!rate_limit.is_limited() && (c2r_schedule.length > 0 || r2c_schedule.length > 0)) { + while (!ui.rate_limit.is_limited() && (c2r_schedule.length > 0 || r2c_schedule.length > 0)) { var num_bytes:uint; if (c2r_schedule.length > 0) { num_bytes = c2r_schedule.shift(); transfer_bytes(null, relay_socket, num_bytes); - rate_limit.update(num_bytes); + ui.rate_limit.update(num_bytes); } if (r2c_schedule.length > 0) { num_bytes = r2c_schedule.shift(); transfer_bytes(relay_socket, null, num_bytes); - rate_limit.update(num_bytes); + ui.rate_limit.update(num_bytes); } } /* Call again when safe, if necessary. */ if (c2r_schedule.length > 0 || r2c_schedule.length > 0) - flush_id = setTimeout(flush, rate_limit.when() * 1000); + flush_id = setTimeout(flush, ui.rate_limit.when() * 1000); } /* Helper function to write output to the @@ -177,100 +165,3 @@ package } } } - -import flash.utils.getTimer; - -class RateLimit -{ - public function RateLimit() - { - } - - public function update(n:Number):Boolean - { - return true; - } - - public function when():Number - { - return 0.0; - } - - public function is_limited():Boolean - { - return false; - } -} - -class RateUnlimit extends RateLimit -{ - public function RateUnlimit() - { - } - - public override function update(n:Number):Boolean - { - return true; - } - - public override function when():Number - { - return 0.0; - } - - public override function is_limited():Boolean - { - return false; - } -} - -class BucketRateLimit extends RateLimit -{ - private var amount:Number; - private var capacity:Number; - private var time:Number; - private var last_update:uint; - - public function BucketRateLimit(capacity:Number, time:Number) - { - this.amount = 0.0; - /* capacity / time is the rate we are aiming for. */ - this.capacity = capacity; - this.time = time; - this.last_update = getTimer(); - } - - private function age():void - { - var now:uint; - var delta:Number; - - now = getTimer(); - delta = (now - last_update) / 1000.0; - last_update = now; - - amount -= delta * capacity / time; - if (amount < 0.0) - amount = 0.0; - } - - public override function update(n:Number):Boolean - { - age(); - amount += n; - - return amount <= capacity; - } - - public override function when():Number - { - age(); - return (amount - capacity) / (capacity / time); - } - - public override function is_limited():Boolean - { - age(); - return amount > capacity; - } -} diff --git a/swfcat.as b/swfcat.as index e75ffac..42bcfea 100644 --- a/swfcat.as +++ b/swfcat.as @@ -41,6 +41,11 @@ package // Milliseconds. private const FACILITATOR_POLL_INTERVAL:int = 10000; + // Bytes per second. Set to undefined to disable limit. + public const RATE_LIMIT:Number = undefined; + // Seconds. + private const RATE_LIMIT_HISTORY:Number = 5.0; + // Socket to Cirrus server private var s_c:CirrusSocket; // Socket to facilitator. @@ -65,6 +70,8 @@ package private var fac_addr:Object; private var relay_addr:Object; + public var rate_limit:RateLimit; + public function swfcat() { proxy_mode = false; @@ -73,6 +80,11 @@ package // Absolute positioning. stage.scaleMode = StageScaleMode.NO_SCALE; stage.align = StageAlign.TOP_LEFT; + + if (RATE_LIMIT) + rate_limit = new BucketRateLimit(RATE_LIMIT * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); + else + rate_limit = new RateUnlimit(); // Wait until the query string parameters are loaded. this.loaderInfo.addEventListener(Event.COMPLETE, loaderinfo_complete); @@ -279,6 +291,7 @@ package import flash.text.TextFormat; import flash.text.TextField; +import flash.utils.getTimer; class Badge extends flash.display.Sprite { @@ -360,3 +373,98 @@ class Badge extends flash.display.Sprite cur_client_count_tf.appendText("."); } } + +class RateLimit +{ + public function RateLimit() + { + } + + public function update(n:Number):Boolean + { + return true; + } + + public function when():Number + { + return 0.0; + } + + public function is_limited():Boolean + { + return false; + } +} + +class RateUnlimit extends RateLimit +{ + public function RateUnlimit() + { + } + + public override function update(n:Number):Boolean + { + return true; + } + + public override function when():Number + { + return 0.0; + } + + public override function is_limited():Boolean + { + return false; + } +} + +class BucketRateLimit extends RateLimit +{ + private var amount:Number; + private var capacity:Number; + private var time:Number; + private var last_update:uint; + + public function BucketRateLimit(capacity:Number, time:Number) + { + this.amount = 0.0; + /* capacity / time is the rate we are aiming for. */ + this.capacity = capacity; + this.time = time; + this.last_update = getTimer(); + } + + private function age():void + { + var now:uint; + var delta:Number; + + now = getTimer(); + delta = (now - last_update) / 1000.0; + last_update = now; + + amount -= delta * capacity / time; + if (amount < 0.0) + amount = 0.0; + } + + public override function update(n:Number):Boolean + { + age(); + amount += n; + + return amount <= capacity; + } + + public override function when():Number + { + age(); + return (amount - capacity) / (capacity / time); + } + + public override function is_limited():Boolean + { + age(); + return amount > capacity; + } +}

1 0

[flashproxy/master] Refactor InternetFreedomBadge (now Badge).
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 024e47f75fa52f3fa65659e05f0e8e6358b59285 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Jun 11 13:34:30 2011 -0700 Refactor InternetFreedomBadge (now Badge). Make it its own Sprite, don't cause it to change the UI of the main display. Use proxy_begin and proxy_end methods instead of modifying current/total counts directly. --- swfcat.as | 76 ++++++++++++++++++++++-------------------------------------- 1 files changed, 28 insertions(+), 48 deletions(-) diff --git a/swfcat.as b/swfcat.as index d0aad9a..d24c833 100644 --- a/swfcat.as +++ b/swfcat.as @@ -60,7 +60,7 @@ package private var output_text:TextField; /* Badge for display */ - private var badge:InternetFreedomBadge; + private var badge:Badge; private var fac_addr:Object; private var relay_addr:Object; @@ -94,8 +94,8 @@ package debug_mode = (this.loaderInfo.parameters["debug"] != null) proxy_mode = (this.loaderInfo.parameters["proxy"] != null); if (proxy_mode && !debug_mode) { - badge = new InternetFreedomBadge(this); - badge.display(); + badge = new Badge(); + addChild(badge); } else { output_text = new TextField(); output_text.width = stage.stageWidth; @@ -170,8 +170,7 @@ package start_proxy_pair(); s_c.send_hello(e.peer); } else if (!debug_mode && badge != null) { - badge.total_proxy_pairs++; - badge.num_proxy_pairs++; + badge.proxy_begin(); } p_p.client = {peer: e.peer, stream: e.stream}; @@ -234,7 +233,7 @@ package puts("ProxyPair: connection closed."); p_p = null; if (proxy_mode && !debug_mode && badge != null) { - badge.num_proxy_pairs--; + badge.proxy_end(); } establish_facilitator_connection(); }); @@ -278,29 +277,25 @@ package } } -import flash.text.TextField; import flash.text.TextFormat; +import flash.text.TextField; + +class Badge extends flash.display.Sprite +{ + /* Number of proxy pairs currently connected. */ + private var num_proxy_pairs:int = 0; + /* Number of proxy pairs ever connected. */ + private var total_proxy_pairs:int = 0; -class InternetFreedomBadge { - - private var ui:swfcat; - - private var _num_proxy_pairs:uint; - private var _total_proxy_pairs:uint; - [Embed(source="badge.png")] private var BadgeImage:Class; private var tot_client_count_tf:TextField; private var tot_client_count_fmt:TextFormat; private var cur_client_count_tf:TextField; private var cur_client_count_fmt:TextFormat; - - public function InternetFreedomBadge(ui:swfcat) + + public function Badge() { - this.ui = ui; - _num_proxy_pairs = 0; - _total_proxy_pairs = 0; - /* Setup client counter for badge. */ tot_client_count_fmt = new TextFormat(); tot_client_count_fmt.color = 0xFFFFFF; @@ -330,42 +325,27 @@ class InternetFreedomBadge { cur_client_count_tf.x=47; cur_client_count_tf.y=6; + addChild(new BadgeImage()); + addChild(tot_client_count_tf); + addChild(cur_client_count_tf); + /* Update the client counter on badge. */ update_client_count(); } - - public function display():void - { - ui.addChild(new BadgeImage()); - /* Tried unsuccessfully to add counter to badge. */ - /* For now, need two addChilds :( */ - ui.addChild(tot_client_count_tf); - ui.addChild(cur_client_count_tf); - } - - public function get num_proxy_pairs():uint - { - return _num_proxy_pairs; - } - - public function set num_proxy_pairs(amount:uint):void + + public function proxy_begin():void { - _num_proxy_pairs = amount; + num_proxy_pairs++; + total_proxy_pairs++; update_client_count(); } - - public function get total_proxy_pairs():uint - { - return _total_proxy_pairs; - } - - public function set total_proxy_pairs(amount:uint):void + + public function proxy_end():void { - _total_proxy_pairs = amount; - /* note: doesn't update, so be sure to update this - before you update num_proxy_pairs! */ + num_proxy_pairs--; + update_client_count(); } - + private function update_client_count():void { /* Update total client count. */

1 0