- tor-commits - lists.torproject.org

[flashproxy/master] Use -t1 in wget lines.
by dcf＠torproject.org 18 Jul '11

18 Jul '11

commit 99af8c35a04fc1e09d6c192e56ea66a356c68a38 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 15 21:16:17 2011 +0000 Use -t1 in wget lines. This prevents reconnecting if the download is interrupted. --- experiments/00 | 4 ++-- experiments/01 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/experiments/00 b/experiments/00 index 484787d..a93ff3a 100755 --- a/experiments/00 +++ b/experiments/00 @@ -60,13 +60,13 @@ echo "getting the dump file..." i=2 until [ $i -gt $NUM_CLIENTS ]; do let local_port=2000+i - gnome-terminal -e "/bin/bash -c 'wget http://localhost:${local_port}/dump -O - > /dev/null; exec /bin/bash -i'" + gnome-terminal -e "/bin/bash -c 'wget -t1 http://localhost:${local_port}/dump -O - > /dev/null; exec /bin/bash -i'" let i=i+1 sleep 2 done # Use this one for delaying the termination of experiment below -wget http://localhost:2001/dump -O - > /dev/null +wget -t1 http://localhost:2001/dump -O - > /dev/null # Slaughter the processes ps -ef | sed -n '/thttpd/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} diff --git a/experiments/01 b/experiments/01 index b3962f9..8a62479 100755 --- a/experiments/01 +++ b/experiments/01 @@ -64,12 +64,12 @@ echo "getting the dump file..." i=2 until [ $i -gt $NUM_CLIENTS ]; do let local_port=2000+i - gnome-terminal -e "/bin/bash -c 'wget http://localhost:${local_port}/dump -O - > /dev/null; exec /bin/bash -i'" + gnome-terminal -e "/bin/bash -c 'wget -t1 http://localhost:${local_port}/dump -O - > /dev/null; exec /bin/bash -i'" let i=i+1 done # Use this one for delaying the termination of experiment below -wget http://localhost:2001/dump -O - > /dev/null +wget -t1 http://localhost:2001/dump -O - > /dev/null # Slaughter the processes sudo killall thttpd

1 0

[flashproxy/master] Make some changes suggested by flex-pmd.
by dcf＠torproject.org 18 Jul '11

18 Jul '11

commit 8774963d90c02e17470ecf507e8dee0c7ef5152d Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jul 17 19:06:40 2011 -0700 Make some changes suggested by flex-pmd. --- swfcat.as | 11 ++++------- 1 files changed, 4 insertions(+), 7 deletions(-) diff --git a/swfcat.as b/swfcat.as index 80916c8..4dea237 100644 --- a/swfcat.as +++ b/swfcat.as @@ -37,9 +37,9 @@ package private const FACILITATOR_POLL_INTERVAL:int = 1000; // Bytes per second. Set to undefined to disable limit. - public const RATE_LIMIT:Number = undefined; + public static const RATE_LIMIT:Number = undefined; // Seconds. - private const RATE_LIMIT_HISTORY:Number = 5.0; + private static const RATE_LIMIT_HISTORY:Number = 5.0; /* TextField for debug output. */ private var output_text:TextField; @@ -84,8 +84,6 @@ package private function loaderinfo_complete(e:Event):void { - var fac_spec:String; - if (this.loaderInfo.parameters["debug"] || this.loaderInfo.parameters["client"]) { output_text = new TextField(); output_text.width = stage.stageWidth; @@ -122,7 +120,7 @@ package default. Returns null on error. */ private function get_param_addr(param:String, default_addr:Object):Object { - var spec:String, addr:Object; + var spec:String; spec = this.loaderInfo.parameters[param]; if (spec) @@ -238,7 +236,6 @@ package var fac_url:String; var loader:URLLoader; var request:URLRequest; - var variables:URLVariables; loader = new URLLoader(); loader.addEventListener(Event.COMPLETE, function (e:Event):void { @@ -257,7 +254,7 @@ package + ":" + encodeURIComponent(fac_addr.port) + "/"; request = new URLRequest(fac_url); request.method = URLRequestMethod.POST; - request.data = new URLVariables; + request.data = new URLVariables(); request.data["client"] = rs.id; puts("Facilitator: connecting to " + fac_url + ".");

1 0

[flashproxy/master] Store references to proxy pairs to avoid garbage collection.
by dcf＠torproject.org 18 Jul '11

18 Jul '11

commit 01d2047a74a61e1748361f5eaf3257b17b09f776 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 15 21:03:35 2011 +0000 Store references to proxy pairs to avoid garbage collection. Adding an event listener is not enough to keep a proxy pair alive. Pairs could be garbage-collected at unpredictable times. We were able to provoke this by running more than one pair at a time with servers on localhost; perhaps it was the greater memory pressure (64 KB blocks at a time) that exposed it. --- swfcat.as | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/swfcat.as b/swfcat.as index 4dea237..9f0a4f7 100644 --- a/swfcat.as +++ b/swfcat.as @@ -50,6 +50,9 @@ package /* Number of proxy pairs currently connected (up to MAX_NUM_PROXY_PAIRS). */ private var num_proxy_pairs:int = 0; + /* References to active proxy pairs, to prevent them from being + garbage collected. */ + private var proxy_pairs:Array; private var fac_addr:Object; @@ -73,6 +76,8 @@ package badge = new Badge(); + proxy_pairs = []; + if (RATE_LIMIT) rate_limit = new BucketRateLimit(RATE_LIMIT * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); else @@ -189,9 +194,12 @@ package puts("Error: " + e); return; } + proxy_pairs.push(proxy_pair); proxy_pair.addEventListener(Event.COMPLETE, function(e:Event):void { proxy_pair.log("Complete."); num_proxy_pairs--; + /* Delete from the list of active proxy pairs. */ + proxy_pairs.splice(proxy_pairs.indexOf(proxy_pair), 1); badge.proxy_end(); }); proxy_pair.connect();

1 0

[flashproxy/master] Don't use a separate num_proxy_pairs variable.
by dcf＠torproject.org 18 Jul '11

18 Jul '11

commit b49755d365553fad2cf120a271e14bf276ac35bf Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 15 21:09:31 2011 +0000 Don't use a separate num_proxy_pairs variable. Just use the length of the proxy_pairs array. --- swfcat.as | 10 ++-------- 1 files changed, 2 insertions(+), 8 deletions(-) diff --git a/swfcat.as b/swfcat.as index 9f0a4f7..c93c154 100644 --- a/swfcat.as +++ b/swfcat.as @@ -47,11 +47,7 @@ package /* 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; - /* References to active proxy pairs, to prevent them from being - garbage collected. */ + /* Proxy pairs currently connected (up to MAX_NUM_PROXY_PAIRS). */ private var proxy_pairs:Array; private var fac_addr:Object; @@ -140,7 +136,7 @@ package var fac_url:String; var loader:URLLoader; - if (num_proxy_pairs >= MAX_NUM_PROXY_PAIRS) { + if (proxy_pairs.length >= MAX_NUM_PROXY_PAIRS) { setTimeout(proxy_main, FACILITATOR_POLL_INTERVAL); return; } @@ -197,14 +193,12 @@ package proxy_pairs.push(proxy_pair); proxy_pair.addEventListener(Event.COMPLETE, function(e:Event):void { proxy_pair.log("Complete."); - num_proxy_pairs--; /* Delete from the list of active proxy pairs. */ proxy_pairs.splice(proxy_pairs.indexOf(proxy_pair), 1); badge.proxy_end(); }); proxy_pair.connect(); - num_proxy_pairs++; badge.proxy_begin(); }

1 0

[flashproxy/master] Don't background the creation of the sparse file.
by dcf＠torproject.org 18 Jul '11

18 Jul '11

commit 7dd2e2fbaba165cc51b76099269d11bdaae8f2c5 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Jul 15 21:15:38 2011 +0000 Don't background the creation of the sparse file. --- experiments/00 | 2 +- experiments/01 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/experiments/00 b/experiments/00 index b88b974..484787d 100755 --- a/experiments/00 +++ b/experiments/00 @@ -13,7 +13,7 @@ cd .. # Create 1GB dump file echo "creating dump file..." rm dump -dd if=/dev/null of=dump bs=1G seek=1 & +dd if=/dev/null of=dump bs=1G seek=1 # Start http server echo "starting http server..." diff --git a/experiments/01 b/experiments/01 index 88e0565..b3962f9 100755 --- a/experiments/01 +++ b/experiments/01 @@ -13,7 +13,7 @@ cd .. # Create 1GB dump file echo "creating dump file..." rm dump -dd if=/dev/null of=dump bs=1G seek=1 & +dd if=/dev/null of=dump bs=1G seek=1 # Start http server echo "starting http server..."

1 0

[flashproxy/master] Changes to 00 to support multiple clients
by dcf＠torproject.org 17 Jul '11

17 Jul '11

commit 98a8dfaaf314e82f00b75dc0a33d3a4df3155862 Author: Jonathan <jdellithorpe(a)gmail.com> Date: Wed Jul 13 19:17:02 2011 -0700 Changes to 00 to support multiple clients --- experiments/00 | 58 ++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 38 insertions(+), 20 deletions(-) diff --git a/experiments/00 b/experiments/00 index 973ee30..b88b974 100755 --- a/experiments/00 +++ b/experiments/00 @@ -1,5 +1,12 @@ #!/bin/bash +# Get arguments +if [ $1 ]; then + NUM_CLIENTS=$1 +else + NUM_CLIENTS=1 +fi + # Go to flashproxy repo root dir cd .. @@ -8,47 +15,58 @@ echo "creating dump file..." rm dump dd if=/dev/null of=dump bs=1G seek=1 & -sleep 1 - # Start http server echo "starting http server..." thttpd -p 1080 -sleep 1 - # Start crossdomain policy server echo "starting cross domain policy server..." sudo ./crossdomaind.py & -sleep 1 - # Start the facilitator echo "starting facilitator..." ./facilitator.py 4701 -r 127.0.0.1:1080 -sleep 1 - -# Start the flash proxy -echo "starting flash proxy..." -google-chrome --app=http://localhost:1080/swfcat.swf?facilitator=127.0.0.1:4701 - -sleep 1 - -# Start socat adapter -echo "starting socat adapter..." -socat TCP-LISTEN:9000,reuseaddr,fork TCP-LISTEN:2000,reuseaddr & +# Start socat adapters +echo "starting socat adapters..." +i=1 +until [ $i -gt $NUM_CLIENTS ]; do + let local_port=2000+i + let remote_port=9000+i + socat TCP-LISTEN:${remote_port},reuseaddr,fork TCP-LISTEN:${local_port},reuseaddr & + let i=i+1 +done sleep 1 # Register with facilitator echo "registering with facilitator..." -echo $'POST / HTTP/1.0\r\n\r\nclient=127.0.0.1:9000' | ncat localhost 4701 --send-only +i=1 +until [ $i -gt $NUM_CLIENTS ]; do + let local_port=9000+i + echo $'POST / HTTP/1.0\r\n\r\nclient=127.0.0.1:'${local_port} | ncat localhost 4701 --send-only + let i=i+1 +done + +# Start the flash proxy, server side +echo "starting flash proxy server side..." +firefox --remote "openURL(http://localhost:1080/swfcat.swf?debug=1&facilitator=127.0.0.1:4701)" -sleep 10 +let query_fac_time=NUM_CLIENTS+2 +sleep ${query_fac_time} # wget the dump file echo "getting the dump file..." -wget http://localhost:2000/dump -O - > /dev/null +i=2 +until [ $i -gt $NUM_CLIENTS ]; do + let local_port=2000+i + gnome-terminal -e "/bin/bash -c 'wget http://localhost:${local_port}/dump -O - > /dev/null; exec /bin/bash -i'" + let i=i+1 + sleep 2 +done + +# Use this one for delaying the termination of experiment below +wget http://localhost:2001/dump -O - > /dev/null # Slaughter the processes ps -ef | sed -n '/thttpd/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {}

1 0

[flashproxy/master] Added remote switch and some sleep statements
by dcf＠torproject.org 17 Jul '11

17 Jul '11

commit 82ff35c7a0394e37c0fc030490c73afd9713b16d Author: Jonathan <jdellithorpe(a)gmail.com> Date: Wed Jul 13 18:43:17 2011 -0700 Added remote switch and some sleep statements --- experiments/01 | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/experiments/01 b/experiments/01 index 5b446b8..88e0565 100755 --- a/experiments/01 +++ b/experiments/01 @@ -42,14 +42,19 @@ echo "starting flash proxy client side..." i=1 until [ $i -gt $NUM_CLIENTS ]; do let local_port=9000+i - google-chrome --app="http://localhost:1080/swfcat.swf?local=127.0.0.1:${local_port}&client=1&fac…" + firefox --remote "openURL(http://localhost:1080/swfcat.swf?local=127.0.0.1:${local_port}&client=1&facilitator=127.0.0.1:4701)" let i=i+1 sleep 2 done +# Some connections take a long time to register with cirrus +sleep 15 + # Start the flash proxy, server side echo "starting flash proxy server side..." -google-chrome --app="http://localhost:1080/swfcat.swf?debug=1&facilitator=127.0.0.1:4701" +firefox --remote "openURL(http://localhost:1080/swfcat.swf?debug=1&facilitator=127.0.0.1:4701)" + +sleep 15 let query_fac_time=NUM_CLIENTS+2 sleep ${query_fac_time}

1 0

[flashproxy/master] Fix error handling for the "local" parameter.
by dcf＠torproject.org 17 Jul '11

17 Jul '11

commit 2958b2292d5517649087b1237af4e9bdd7eb65e7 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Jul 17 11:23:49 2011 -0700 Fix error handling for the "local" parameter. get_param_addr already handles a default value. It signals a parsing error if the supplied value has a syntax error. --- swfcat.as | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/swfcat.as b/swfcat.as index 5be06fd..80916c8 100644 --- a/swfcat.as +++ b/swfcat.as @@ -106,10 +106,11 @@ package return; } - if (this.loaderInfo.parameters["local"]) - local_addr = get_param_addr("local", DEFAULT_LOCAL_TOR_CLIENT_ADDR); - else - local_addr = DEFAULT_LOCAL_TOR_CLIENT_ADDR; + local_addr = get_param_addr("local", DEFAULT_LOCAL_TOR_CLIENT_ADDR); + if (!local_addr) { + puts("Error: Local spec must be in the form \"host:port\"."); + return; + } if (this.loaderInfo.parameters["client"]) client_main();

1 0

[arm/master] Minor post-release cleanup
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit e9a02ddc72a06d4290cb1f5b08de5da88c07a2dd Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 17 00:45:00 2011 -0700 Minor post-release cleanup --- ChangeLog | 2 +- src/version.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b1b776..5692ec3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ CHANGE LOG -7/16/11 - version 1.4.3 +7/16/11 - version 1.4.3 (6cf4836) This completes the codebase refactoring project that's been a year in the works and provides numerous performance and usability improvements. Most notably this includes a setup wizard for new relays, menuing interface, gui prototype, substantial performance improvements, and support for Mac OSX. * added: relay setup wizard for autogenerating a torrc configuration diff --git a/src/version.py b/src/version.py index d135944..a1c26cf 100644 --- a/src/version.py +++ b/src/version.py @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.3_dev' -LAST_MODIFIED = "April 4, 2011" +VERSION = '1.4.4_dev' +LAST_MODIFIED = "July 17, 2011"

1 0

[arm/packaging] Exporting dependencies from mirror
by atagar＠torproject.org 17 Jul '11

17 Jul '11

commit 95d1ba0799ab05f3cd63c71edc89c49644cdeb83 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Jul 17 00:42:42 2011 -0700 Exporting dependencies from mirror The cagraph wasn't being exported and torctl was coming from its source repo. Fetching both from the dependency mirror with sig checks instead. --- export.sh | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/export.sh b/export.sh index 79c6b38..ffa886a 100755 --- a/export.sh +++ b/export.sh @@ -1,7 +1,7 @@ #!/bin/sh # Exports a copy of arm's release branch to the given location. This copy is -# stripped of git metadata and includes a bundled copy of TorCtl. This accepts -# an optional argument for where to place the export. +# stripped of git metadata and includes a bundled copy of TorCtl and cagraph. +# This accepts an optional argument for where to place the export. if [ $# -lt 1 ] then exportDst="./arm" @@ -19,15 +19,31 @@ fi mkdir $exportDst git archive --format=tar release | (cd $exportDst && tar xf -) +# fetches our torctl and cagraph dependency +wget --quiet http://www.atagar.com/arm/resources/deps/11-06-16/torctl.tar.gz +sha256sum torctl.tar.gz +echo "5460adb1394c368ba492cc33d6681618b3d3062b3f5f70b2a87520fc291701c3 <- expected" +tar -C $exportDst/src -xzf torctl.tar.gz +rm torctl.tar.gz + +wget --quiet http://www.atagar.com/arm/resources/deps/11-06-10/cagraph.tar.gz +sha256sum cagraph.tar.gz +echo "1439acd40ce016f4329deb216d86f36a749e4b8bf73a313a757396af6f95310d <- expected" +tar -C $exportDst/src -xzf cagraph.tar.gz +rm cagraph.tar.gz + +# the following installed torctl from its master repo rather than our +# dependency mirror + # fetches torctl to /tmp -torctlDir="$(mktemp -d)" -git clone git://git.torproject.org/pytorctl.git $torctlDir > /dev/null +#torctlDir="$(mktemp -d)" +#git clone git://git.torproject.org/pytorctl.git $torctlDir > /dev/null # exports torctl to the arm directory -(cd $torctlDir && git archive --format=tar --prefix=TorCtl/ master) | (cd $exportDst/src && tar xf - 2> /dev/null) +#(cd $torctlDir && git archive --format=tar --prefix=TorCtl/ master) | (cd $exportDst/src && tar xf - 2> /dev/null) # cleans up the temporary torctl repo -rm -rf torctlDir +#rm -rf torctlDir echo "arm exported to $exportDst"

1 0