- tor-commits - lists.torproject.org

[flashproxy/master] 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/master] Make proxy mode the default in swfcat.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit f0e063240a4c3d673256d82f42fbecd4e35ba1e5 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jun 12 01:21:59 2011 -0700 Make proxy mode the default in swfcat. In other words, use client=true instead of nothing for client mode, and nothing instead of proxy=true for proxy mode. This makes it a drop-in replacement for master swfcat. --- swfcat.as | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/swfcat.as b/swfcat.as index 1d99ad4..27752e9 100644 --- a/swfcat.as +++ b/swfcat.as @@ -107,10 +107,10 @@ package return; } - if (this.loaderInfo.parameter["proxy"]) - proxy_main(); - else + if (this.loaderInfo.parameters["client"]) client_main(); + else + proxy_main(); } /* Get an address structure from the given movie parameter, or the given

1 0

[flashproxy/master] 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/master] Minor cleanup.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 5e8eca1361083409847d4e6c94e5d84adf8d2673 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jun 12 01:08:49 2011 -0700 Minor cleanup. --- swfcat.as | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) diff --git a/swfcat.as b/swfcat.as index d9e9bc6..1d99ad4 100644 --- a/swfcat.as +++ b/swfcat.as @@ -29,8 +29,8 @@ package port: 9002 }; - /* Default Tor client to use in case of RTMFP connection */ - private const DEFAULT_TOR_CLIENT_ADDR:Object = { + /* Local Tor client to use in case of RTMFP connection. */ + private const LOCAL_TOR_CLIENT_ADDR:Object = { host: "127.0.0.1", port: 9002 }; @@ -45,8 +45,6 @@ package // Seconds. private const RATE_LIMIT_HISTORY:Number = 5.0; - private var proxy_mode:Boolean; - /* TextField for debug output. */ private var output_text:TextField; @@ -103,15 +101,13 @@ package 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; } - if (proxy_mode) + if (this.loaderInfo.parameter["proxy"]) proxy_main(); else client_main(); @@ -228,7 +224,7 @@ package proxy_pair = new ProxyPair(this, rs, function ():void { /* Do nothing; already connected. */ }, s_t, function ():void { - s_t.connect(DEFAULT_TOR_CLIENT_ADDR.host, DEFAULT_TOR_CLIENT_ADDR.port); + s_t.connect(LOCAL_TOR_CLIENT_ADDR.host, LOCAL_TOR_CLIENT_ADDR.port); }); proxy_pair.connect(); }

1 0

[flashproxy/master] Restore labels on ProxyPair output.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit ca61c5d4125c4991468a36ef8cf6e9fb23d820f2 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jun 12 01:00:56 2011 -0700 Restore labels on ProxyPair output. Allow setting the label from the outside. --- ProxyPair.as | 13 +++++++++---- swfcat.as | 11 +++++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ProxyPair.as b/ProxyPair.as index ca9f092..62c6ec2 100644 --- a/ProxyPair.as +++ b/ProxyPair.as @@ -14,6 +14,9 @@ package /* An instance of a client-relay connection. */ public class ProxyPair extends EventDispatcher { + // Label for log messages. + public var name:String; + // Socket to client. private var s_c:*; private var connect_c:Function; @@ -33,13 +36,15 @@ package public function log(msg:String):void { - ui.puts(id() + ": " + msg) + if (name) + ui.puts(name + ": " + msg) + else + ui.puts(msg) } - // String describing this pair for output. - public function id():String + public function set_name(name:String):void { - return "<>"; + this.name = name; } public function ProxyPair(ui:swfcat, s_c:*, connect_c:Function, s_r:*, connect_r:Function) diff --git a/swfcat.as b/swfcat.as index 6125187..d9e9bc6 100644 --- a/swfcat.as +++ b/swfcat.as @@ -265,6 +265,7 @@ package private function make_proxy_pair(client_spec:String, relay_spec:String):ProxyPair { + var proxy_pair:ProxyPair; var addr_c:Object; var addr_r:Object; var s_c:*; @@ -278,21 +279,27 @@ package if (addr_c) { s_c = new Socket(); s_r = new Socket(); - return new ProxyPair(this, s_c, function ():void { + proxy_pair = new ProxyPair(this, s_c, function ():void { s_c.connect(addr_c.host, addr_c.port); }, s_r, function ():void { s_r.connect(addr_r.host, addr_r.port); }); + proxy_pair.set_name("<" + addr_c.host + ":" + addr_c.port + "," + + addr_r.host + ":" + addr_r.port + ">"); + return proxy_pair; } if (client_spec.match(/^[0-9A-Fa-f]{64}$/)) { s_c = new RTMFPSocket(CIRRUS_URL, CIRRUS_KEY); s_r = new Socket(); - return new ProxyPair(this, s_c, function ():void { + proxy_pair = new ProxyPair(this, s_c, function ():void { s_c.connect(client_spec); }, s_r, function ():void { s_r.connect(addr_r.host, addr_r.port); }); + proxy_pair.set_name("<" + client_spec.substr(0, 4) + "...," + + addr_r.host + ":" + addr_r.port + ">"); + return proxy_pair; } throw new ArgumentError("Can't parse client spec \"" + client_spec + "\".");

1 0

[flashproxy/master] Make swfcat.swf depend on *.as.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit e9b53ee59b7bc95ea93df01b8f0b4f62ba92e3b2 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 9 07:14:25 2011 -0700 Make swfcat.swf depend on *.as. --- Makefile | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index 4e22e1d..c98c0ee 100644 --- a/Makefile +++ b/Makefile @@ -7,5 +7,7 @@ all: $(TARGETS) %.swf: %.as badge.png $(MXMLC) -output $@ -static-link-runtime-shared-libraries -define=RTMFP::CIRRUS_KEY,\"$(CIRRUS_KEY)\" $< +swfcat.swf: *.as badge.png + clean: rm -f $(TARGETS)

1 0

[flashproxy/master] Put ++ where I meant --
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 99dd0d5b7ac7530d5fb524b75635bcb56f6c2a00 Author: Nate Hardison <nate(a)rescomp-09-154551.stanford.edu> Date: Thu Jun 2 20:21:50 2011 -0700 Put ++ where I meant -- --- rtmfpcat.as | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/rtmfpcat.as b/rtmfpcat.as index 37701e8..1876ef9 100644 --- a/rtmfpcat.as +++ b/rtmfpcat.as @@ -223,7 +223,7 @@ package puts("ProxyPair: connection closed."); p_p = null; if (proxy_mode && !debug_mode && badge != null) { - badge.num_proxy_pairs++; + badge.num_proxy_pairs--; } establish_facilitator_connection(); });

1 0

[flashproxy/master] Re-remove badge_con_counter.png.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 84024e7f6efd44e202cc7b7d7dd60a0baf1deb92 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jun 3 08:22:33 2011 -0700 Re-remove badge_con_counter.png. --- badge_con_counter.png | Bin 270 -> 0 bytes return_of_the_rtmfpcat.as | 2 +- 2 files changed, 1 insertions(+), 1 deletions(-) diff --git a/badge_con_counter.png b/badge_con_counter.png deleted file mode 100644 index d832e24..0000000 Binary files a/badge_con_counter.png and /dev/null differ diff --git a/return_of_the_rtmfpcat.as b/return_of_the_rtmfpcat.as index e512408..7095c09 100644 --- a/return_of_the_rtmfpcat.as +++ b/return_of_the_rtmfpcat.as @@ -100,7 +100,7 @@ package private var fac_poll_timeo_id:uint; /* Badge with a client counter */ - [Embed(source="badge_con_counter.png")] + [Embed(source="badge.png")] private var BadgeImage:Class; private var tot_client_count_tf:TextField; private var tot_client_count_fmt:TextFormat;

1 0

[flashproxy/master] Fix a global search-and-replace error.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 53fcd931929eba516e39aea4b17cc524b0fa8c78 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 9 07:15:17 2011 -0700 Fix a global search-and-replace error. RATE_LIMIT_HISrelayY -> RATE_LIMIT_HISTORY --- ProxyPair.as | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ProxyPair.as b/ProxyPair.as index aef4e2e..75ae901 100644 --- a/ProxyPair.as +++ b/ProxyPair.as @@ -32,7 +32,7 @@ package // Bytes per second. Set to undefined to disable limit. private const RATE_LIMIT:Number = undefined; //10000; // Seconds. - private const RATE_LIMIT_HISrelayY:Number = 5.0; + private const RATE_LIMIT_HISTORY:Number = 5.0; private var rate_limit:RateLimit; @@ -51,7 +51,7 @@ package this.r2c_schedule = new Array(); if (RATE_LIMIT) - rate_limit = new BucketRateLimit(RATE_LIMIT * RATE_LIMIT_HISrelayY, RATE_LIMIT_HISrelayY); + rate_limit = new BucketRateLimit(RATE_LIMIT * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); else rate_limit = new RateUnlimit(); @@ -270,4 +270,4 @@ class BucketRateLimit extends RateLimit age(); return amount > capacity; } -} \ No newline at end of file +}

1 0

[flashproxy/master] The generic mxmlc rule should not depend on badge.png.
by dcf＠torproject.org 12 Jun '11

12 Jun '11

commit 07db15b16690f5c9855b81969300b7034c215c7e Author: David Fifield <david(a)bamsoftware.com> Date: Thu Jun 9 07:23:16 2011 -0700 The generic mxmlc rule should not depend on badge.png. That's specific to swfcat. --- Makefile | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/Makefile b/Makefile index c98c0ee..72f5162 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ TARGETS = swfcat.swf all: $(TARGETS) -%.swf: %.as badge.png +%.swf: %.as $(MXMLC) -output $@ -static-link-runtime-shared-libraries -define=RTMFP::CIRRUS_KEY,\"$(CIRRUS_KEY)\" $< swfcat.swf: *.as badge.png

1 0