tor-commits June 2011

tor-commits@lists.torproject.org

14 participants
716 discussions

[flashproxy/master] Added current count using dots beneath numeric counter for total count
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 6e08bb51f7dcdc4e39a4ddd9dce6c131e590e22c Author: ellitron <jdellit(a)stanford.edu> Date: Thu May 19 09:27:27 2011 -0700 Added current count using dots beneath numeric counter for total count --- swfcat.as | 68 +++++++++++++++++++++++++++++++++++++++++++------------------ 1 files changed, 48 insertions(+), 20 deletions(-) diff --git a/swfcat.as b/swfcat.as index 38ea6c0..76de948 100644 --- a/swfcat.as +++ b/swfcat.as @@ -48,8 +48,10 @@ package /* Badge with a client counter */ [Embed(source="badge_con_counter.png")] private var BadgeImage:Class; - private var client_count_tf:TextField; - private var client_count_fmt:TextFormat; + 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 puts(s:String):void { @@ -59,10 +61,16 @@ package public function update_client_count():void { + /* Update total client count. */ if (String(total_proxy_pairs).length == 1) - client_count_tf.text = "0" + String(total_proxy_pairs); + tot_client_count_tf.text = "0" + String(total_proxy_pairs); else - client_count_tf.text = String(total_proxy_pairs); + tot_client_count_tf.text = String(total_proxy_pairs); + + /* Update current client count. */ + cur_client_count_tf.text = ""; + for(var i:Number=0; i<num_proxy_pairs; i++) + cur_client_count_tf.appendText(".");; } public function swfcat() @@ -79,19 +87,34 @@ package output_text.textColor = 0x44cc44; /* Setup client counter for badge. */ - client_count_fmt = new TextFormat(); - client_count_fmt.color = 0xFFFFFF; - client_count_fmt.align = "center"; - client_count_fmt.font = "courier-new"; - client_count_fmt.bold = true; - client_count_fmt.size = 10; - client_count_tf = new TextField(); - client_count_tf.width = 20; - client_count_tf.height = 17; - client_count_tf.background = false; - client_count_tf.defaultTextFormat = client_count_fmt; - client_count_tf.x=47; - client_count_tf.y=3; + tot_client_count_fmt = new TextFormat(); + tot_client_count_fmt.color = 0xFFFFFF; + tot_client_count_fmt.align = "center"; + tot_client_count_fmt.font = "courier-new"; + tot_client_count_fmt.bold = true; + tot_client_count_fmt.size = 10; + tot_client_count_tf = new TextField(); + tot_client_count_tf.width = 20; + tot_client_count_tf.height = 17; + tot_client_count_tf.background = false; + tot_client_count_tf.defaultTextFormat = tot_client_count_fmt; + tot_client_count_tf.x=47; + tot_client_count_tf.y=0; + + cur_client_count_fmt = new TextFormat(); + cur_client_count_fmt.color = 0xFFFFFF; + cur_client_count_fmt.align = "center"; + cur_client_count_fmt.font = "courier-new"; + cur_client_count_fmt.bold = true; + cur_client_count_fmt.size = 10; + cur_client_count_tf = new TextField(); + cur_client_count_tf.width = 20; + cur_client_count_tf.height = 17; + cur_client_count_tf.background = false; + cur_client_count_tf.defaultTextFormat = cur_client_count_fmt; + cur_client_count_tf.x=47; + cur_client_count_tf.y=6; + /* Update the client counter on badge. */ update_client_count(); @@ -113,7 +136,8 @@ package addChild(new BadgeImage()); /* Tried unsuccessfully to add counter to badge. */ /* For now, need two addChilds :( */ - addChild(client_count_tf); + addChild(tot_client_count_tf); + addChild(cur_client_count_tf); } fac_spec = this.loaderInfo.parameters["facilitator"]; @@ -183,15 +207,19 @@ package num_proxy_pairs++; total_proxy_pairs++; + /* Update the client count on the badge. */ + update_client_count(); + proxy_pair = new ProxyPair(this, client_addr, DEFAULT_TOR_ADDR); proxy_pair.addEventListener(Event.COMPLETE, function(e:Event):void { proxy_pair.log("Complete."); + num_proxy_pairs--; + /* Update the client count on the badge. */ + update_client_count(); }); proxy_pair.connect(); - /* Update the client count on the badge. */ - update_client_count(); } /* Parse an address in the form "host:port". Returns an Object with

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 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] 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] 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 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] 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 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

[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

← Newer
1
...
40
41
42
43
44
45
46
...
72
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits June 2011