- tor-commits - lists.torproject.org

r25191: {website} 0.2.3.7-alpha tarball is up (website/trunk/include)
by Roger Dingledine 30 Oct '11

30 Oct '11

Author: arma Date: 2011-10-30 23:00:18 +0000 (Sun, 30 Oct 2011) New Revision: 25191 Modified: website/trunk/include/versions.wmi Log: 0.2.3.7-alpha tarball is up Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-10-27 23:54:08 UTC (rev 25190) +++ website/trunk/include/versions.wmi 2011-10-30 23:00:18 UTC (rev 25191) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-alpha whitespace=delete>0.2.3.6-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.3.7-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.34</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.3.6-alpha</define-tag>

1 0

[tor/master] blurb and version bump for 0.2.3.7-alpha
by arma＠torproject.org 30 Oct '11

30 Oct '11

commit c2d03beb65d0c82035be714666bfd0e9fc7c3060 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Oct 30 18:39:49 2011 -0400 blurb and version bump for 0.2.3.7-alpha --- ChangeLog | 4 ++++ configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5198350..bedd216 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,8 @@ Changes in version 0.2.3.7-alpha - 2011-10-30 + Tor 0.2.3.7-alpha fixes a crash bug in 0.2.3.6-alpha introduced by + the new v3 handshake. It also resolves yet another bridge address + enumeration issue. + o Major bugfixes: - If we mark an OR connection for close based on a cell we process, don't process any further cells on it. We already avoid further diff --git a/configure.in b/configure.in index df5551c..17f5c8d 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.6-alpha-dev) +AM_INIT_AUTOMAKE(tor, 0.2.3.7-alpha) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index fceb087..eadae39 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.6-alpha-dev" +!define VERSION "0.2.3.7-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index a0b66f1..7460d4f 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -234,7 +234,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.6-alpha-dev" +#define VERSION "0.2.3.7-alpha"

1 0

[flashproxy/master] Use scrolling="no" not scrolling="0".
by dcf＠torproject.org 30 Oct '11

30 Oct '11

commit 184fd8bc464d88aa431ecc3a5faf7aaad67d11d9 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 13:44:34 2011 -0700 Use scrolling="no" not scrolling="0". scrolling="0" doesn't work on IE, and the W3C says it's (yes|no|auto). --- README | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/README b/README index 82e881c..7f7189b 100644 --- a/README +++ b/README @@ -152,7 +152,7 @@ wait a few minutes. It can take a while to download relay descriptors. Paste in this HTML where you want the badge to appear: -<iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="70px" height="23px" frameBorder="0" scrolling="0"></iframe> +<iframe src="//crypto.stanford.edu/flashproxy/embed.html" width="70px" height="23px" frameBorder="0" scrolling="no"></iframe> == For developers

1 0

[flashproxy/master] const -> var in embed.html.
by dcf＠torproject.org 30 Oct '11

30 Oct '11

commit a82c8471ed94456b392d4eab88eaaa2823968446 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 13:34:17 2011 -0700 const -> var in embed.html. const doesn't work in IE. --- embed.html | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/embed.html b/embed.html index fc1fe6d..9b6b152 100644 --- a/embed.html +++ b/embed.html @@ -22,7 +22,7 @@ function flashproxy_should_disable() ua = window.navigator.userAgent; if (ua != null) { - const UA_LIST = [ + var UA_LIST = [ /\bmobile\b/i, /\bandroid\b/i, /\bopera mobi\b/i, @@ -49,8 +49,8 @@ function flashproxy_should_disable() */ function flashproxy_make_container(child) { - const BADGE_ID = "flashproxy-badge"; - const FLASHPROXY_INFO_URL = "https://crypto.stanford.edu/flashproxy/"; + var BADGE_ID = "flashproxy-badge"; + var FLASHPROXY_INFO_URL = "https://crypto.stanford.edu/flashproxy/"; var container; var a; @@ -74,10 +74,10 @@ function flashproxy_make_container(child) */ function flashproxy_make_badge() { - const WIDTH = 70; - const HEIGHT = 23; - const FLASHVARS = ""; - const SWFCAT_URL = "https://crypto.stanford.edu/flashproxy/swfcat.swf"; + var WIDTH = 70; + var HEIGHT = 23; + var FLASHVARS = ""; + var SWFCAT_URL = "https://crypto.stanford.edu/flashproxy/swfcat.swf"; var object; var param; @@ -111,7 +111,7 @@ function flashproxy_make_badge() */ function flashproxy_make_dummy_badge() { - const BADGE_IMAGE_URL = "https://crypto.stanford.edu/flashproxy/badge.png"; + var BADGE_IMAGE_URL = "https://crypto.stanford.edu/flashproxy/badge.png"; var img;

1 0

[flashproxy/master] Add max_clients parameter.
by dcf＠torproject.org 30 Oct '11

30 Oct '11

commit a7b64ff1dfcc9b2e8797e1753486e080d46f6f7c Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 00:52:21 2011 -0700 Add max_clients parameter. This allows controlling what was the MAX_NUM_PROXY_PAIRS constant. --- swfcat.as | 40 +++++++++++++++++++++++++++++++++++++--- 1 files changed, 37 insertions(+), 3 deletions(-) diff --git a/swfcat.as b/swfcat.as index 9fcf0db..938def9 100644 --- a/swfcat.as +++ b/swfcat.as @@ -17,6 +17,10 @@ * The address of the facilitator to use. By default it is * DEFAULT_FACILITATOR_ADDR. Both <HOST> and <PORT> must be present. * + * max_clients=<NUM> + * How many clients to serve concurrently. The default is + * DEFAULT_MAX_NUM_PROXY_PAIRS. + * * client=1 * If set (to any value), run in client RTMFP mode. In this mode, rather than * connecting to a facilitator and attempting to serve clients, swfcat starts an @@ -63,7 +67,7 @@ package port: 9002 }; - private const MAX_NUM_PROXY_PAIRS:uint = 100; + private const DEFAULT_MAX_NUM_PROXY_PAIRS:uint = 100; // Milliseconds. private const FACILITATOR_POLL_INTERVAL:int = 10000; @@ -79,11 +83,12 @@ package /* UI shown when debug is off. */ private var badge:Badge; - /* Proxy pairs currently connected (up to MAX_NUM_PROXY_PAIRS). */ + /* Proxy pairs currently connected (up to max_num_proxy_pairs). */ private var proxy_pairs:Array; public var debug:Boolean; private var fac_addr:Object; + private var max_num_proxy_pairs:uint; private var local_addr:Object; public var rate_limit:RateLimit; @@ -117,6 +122,8 @@ package private function loaderinfo_complete(e:Event):void { + var tmp:Object; + debug = this.loaderInfo.parameters["debug"]; if (debug || this.loaderInfo.parameters["client"]) { @@ -139,6 +146,13 @@ package return; } + tmp = get_param_number("max_clients", DEFAULT_MAX_NUM_PROXY_PAIRS); + if (tmp == null || tmp < 0) { + puts("Error: max_clients must be a nonnegative integer."); + return; + } + max_num_proxy_pairs = uint(tmp); + 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\"."); @@ -164,13 +178,33 @@ package return default_addr; } + /* Get a number from the given movie parameter, or the given default. + Returns null on error. First check for a null return, and then call + uint or whatever on the return value if no error. */ + private function get_param_number(param:String, default_val:Number):Object + { + var spec:String; + var val:Number; + + spec = this.loaderInfo.parameters[param]; + if (spec) { + val = Number(spec); + if (isNaN(val)) + return null; + else + return val; + } else { + return default_val; + } + } + /* The main logic begins here, after start-up issues are taken care of. */ private function proxy_main():void { var fac_url:String; var loader:URLLoader; - if (proxy_pairs.length >= MAX_NUM_PROXY_PAIRS) { + if (proxy_pairs.length >= max_num_proxy_pairs) { setTimeout(proxy_main, FACILITATOR_POLL_INTERVAL); return; }

1 0

[flashproxy/master] Increase the connector read size from 1024 to 65536.
by dcf＠torproject.org 30 Oct '11

30 Oct '11

commit f16adf275c0bff23174a3e3cac47bef130259080 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 04:37:49 2011 -0700 Increase the connector read size from 1024 to 65536. Since Flash doesn't provide any way of knowing if sent data was sent successfully or not, it pushes everything it can't send immediately on a buffer of unbounded size. If the receiver can't read the data fast enough, Flash will consume more and more memory until it crashes. I don't think this will matter much for Tor or even plain Internet connections, but it's crashing my high-speed localhost tests. --- connector.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/connector.py b/connector.py index d763303..624b776 100755 --- a/connector.py +++ b/connector.py @@ -308,7 +308,7 @@ def register(): def proxy_chunk(fd_r, fd_w, label): try: - data = fd_r.recv(1024) + data = fd_r.recv(65536) except socket.error, e: # Can be "Connection reset by peer". log(u"Socket error from %s: %s" % (label, repr(str(e)))) fd_w.close()

1 0

[flashproxy/master] Remove obsolete 00 experiment.
by dcf＠torproject.org 30 Oct '11

30 Oct '11

commit aa8e063e35b10054917625c31d0ee6a42b0fdcca Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 13:13:22 2011 -0700 Remove obsolete 00 experiment. Replaced by experiments/throughput/throughput.sh. --- experiments/00 | 78 -------------------------------------------------------- 1 files changed, 0 insertions(+), 78 deletions(-) diff --git a/experiments/00 b/experiments/00 deleted file mode 100755 index e7994df..0000000 --- a/experiments/00 +++ /dev/null @@ -1,78 +0,0 @@ -#!/bin/bash - -# Get arguments -if [ $1 ]; then - NUM_CLIENTS=$1 -else - NUM_CLIENTS=1 -fi - -# Go to flashproxy repo root dir -cd .. - -# Create 1GB dump file -echo "creating dump file..." -rm dump -dd if=/dev/null of=dump bs=1G seek=1 - -# Start http server -echo "starting http server..." -thttpd -p 1080 - -# Start crossdomain policy server -echo "starting cross domain policy server..." -sudo ./crossdomaind.py & - -# Start the facilitator -echo "starting facilitator..." -./facilitator.py 4701 -r 127.0.0.1:1080 - -# 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..." -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?facilitator=127.0.0.1:4701)" - -let query_fac_time=NUM_CLIENTS+2 -sleep ${query_fac_time} - -# wget the dump file -echo "getting the dump file..." -i=2 -until [ $i -gt $NUM_CLIENTS ]; do - let local_port=2000+i - xterm -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 -t1 http://localhost:2001/dump -O - > /dev/null - -echo "Press enter to continue." -read - -# Slaughter the processes -ps -ef | sed -n '/thttpd/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} -ps -ef | sed -n '/crossdomaind.py/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} -ps -ef | sed -n '/facilitator.py/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} -ps -ef | sed -n '/socat/{/grep/!p;}' | awk '{print$2}' | sudo xargs -i kill {} -

1 0

[flashproxy/master] Add a facilitator_poll_interval parameter.
by dcf＠torproject.org 30 Oct '11

30 Oct '11

commit f600f49bf58f8249de6ff57a53a94a888677fe66 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 01:24:43 2011 -0700 Add a facilitator_poll_interval parameter. --- swfcat.as | 29 +++++++++++++++++++++++++---- 1 files changed, 25 insertions(+), 4 deletions(-) diff --git a/swfcat.as b/swfcat.as index f02e0a0..b83dc2f 100644 --- a/swfcat.as +++ b/swfcat.as @@ -21,6 +21,10 @@ * How many clients to serve concurrently. The default is * DEFAULT_MAX_NUM_PROXY_PAIRS. * + * facilitator_poll_interval=<FLOAT> + * How often to poll the facilitator, in seconds. The default is + * DEFAULT_FACILITATOR_POLL_INTERVAL. There is a sanity-check minimum of 1.0 s. + * * client=1 * If set (to any value), run in client RTMFP mode. In this mode, rather than * connecting to a facilitator and attempting to serve clients, swfcat starts an @@ -69,8 +73,9 @@ package private const DEFAULT_MAX_NUM_PROXY_PAIRS:uint = 10; - // Milliseconds. - private const FACILITATOR_POLL_INTERVAL:int = 10000; + /* In seconds. */ + private const DEFAULT_FACILITATOR_POLL_INTERVAL:Number = 10.0; + private const MIN_FACILITATOR_POLL_INTERVAL:Number = 1.0; // Bytes per second. Set to undefined to disable limit. public static const RATE_LIMIT:Number = undefined; @@ -89,6 +94,7 @@ package public var debug:Boolean; private var fac_addr:Object; private var max_num_proxy_pairs:uint; + private var facilitator_poll_interval:Number; private var local_addr:Object; public var rate_limit:RateLimit; @@ -153,6 +159,13 @@ package } max_num_proxy_pairs = uint(tmp); + tmp = get_param_timespec("facilitator_poll_interval", DEFAULT_FACILITATOR_POLL_INTERVAL); + if (tmp == null || tmp < MIN_FACILITATOR_POLL_INTERVAL) { + puts("Error: facilitator_poll_interval must be a nonnegative number at least " + MIN_FACILITATOR_POLL_INTERVAL + "."); + return; + } + facilitator_poll_interval = Number(tmp); + 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\"."); @@ -198,6 +211,14 @@ package } } + /* Get a floating-point number of seconds from a time specification. The + only time specification format is a decimal number of seconds. + Returns null on error. */ + private function get_param_timespec(param:String, default_val:Number):Object + { + return get_param_number(param, default_val); + } + /* The main logic begins here, after start-up issues are taken care of. */ private function proxy_main():void { @@ -205,7 +226,7 @@ package var loader:URLLoader; if (proxy_pairs.length >= max_num_proxy_pairs) { - setTimeout(proxy_main, FACILITATOR_POLL_INTERVAL); + setTimeout(proxy_main, uint(facilitator_poll_interval * 1000)); return; } @@ -233,7 +254,7 @@ package var relay_spec:String; var proxy_pair:Object; - setTimeout(proxy_main, FACILITATOR_POLL_INTERVAL); + setTimeout(proxy_main, uint(facilitator_poll_interval * 1000)); loader = e.target as URLLoader; client_spec = loader.data.client;

1 0

[flashproxy/master] Document Flash parameters (e.g. debug=1).
by dcf＠torproject.org 30 Oct '11

30 Oct '11

commit dfe72ac1ed223ccb43b9d92115a28307caf5fa7e Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 00:38:02 2011 -0700 Document Flash parameters (e.g. debug=1). --- swfcat.as | 31 +++++++++++++++++++++++++++++++ 1 files changed, 31 insertions(+), 0 deletions(-) diff --git a/swfcat.as b/swfcat.as index b1dabc1..0c2f200 100644 --- a/swfcat.as +++ b/swfcat.as @@ -1,3 +1,34 @@ +/* Flash parameters. These can change how the program runs from the outside. + * They can be set as a URL query string, for example: + * http://www.example.com/swfcat.swf?facilitator=127.0.0.1:9002&debug=1 + * or in the HTML markup for the embedding of the movie: + * <object> + * <param name="movie" value="http://www.example.com/swfcat.swf"> + * <param name="flashvars" value="facilitator=127.0.0.1:9002&debug=1"> + * <embed src="http://www.example.com/swfcat.swf" + * flashvars="facilitator=127.0.0.1:9002&debug=1"></embed> + * </object> + * + * debug=1 + * If set (to any value), show verbose terminal-like output instead of the + * badge. + * + * facilitator=<HOST>:<PORT> + * The address of the facilitator to use. By default it is + * DEFAULT_FACILITATOR_ADDR. Both <HOST> and <PORT> must be present. + * + * client=1 + * If set (to any value), run in client RTMFP mode. In this mode, rather than + * connecting to a facilitator and attempting to serve clients, swfcat starts an + * RTMFP socket and connects to a local address (to the connector, to be exact). + * See README for more on running in client RTMFP mode. No argument is required + * to use RTMFP when in the usual server mode. + * + * local=<HOST>:<PORT> + * When in client RTMFP mode (client=1), connect to this local address. The + * default is DEFAULT_LOCAL_TOR_CLIENT_ADDR. + */ + package { import flash.display.Sprite;

1 0

[flashproxy/master] Change DEFAULT_MAX_NUM_PROXY_PAIRS from 100 to 10.
by dcf＠torproject.org 30 Oct '11

30 Oct '11

commit 74dd4fbfad5aca0f4f89e61f8c43f90f86ff6897 Author: David Fifield <david(a)bamsoftware.com> Date: Sun Oct 30 01:09:28 2011 -0700 Change DEFAULT_MAX_NUM_PROXY_PAIRS from 100 to 10. --- swfcat.as | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/swfcat.as b/swfcat.as index 938def9..f02e0a0 100644 --- a/swfcat.as +++ b/swfcat.as @@ -67,7 +67,7 @@ package port: 9002 }; - private const DEFAULT_MAX_NUM_PROXY_PAIRS:uint = 100; + private const DEFAULT_MAX_NUM_PROXY_PAIRS:uint = 10; // Milliseconds. private const FACILITATOR_POLL_INTERVAL:int = 10000;

1 0