- tor-commits - lists.torproject.org

[flashproxy/master] Add a ratelimit parameter.
by dcf＠torproject.org 22 Dec '11

22 Dec '11

commit cbb7fd82306fe7231136a8b5d1cfaf56c7820f9a Author: David Fifield <david(a)bamsoftware.com> Date: Wed Nov 16 04:40:17 2011 -0800 Add a ratelimit parameter. --- swfcat.as | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 62 insertions(+), 7 deletions(-) diff --git a/swfcat.as b/swfcat.as index b83dc2f..478b97c 100644 --- a/swfcat.as +++ b/swfcat.as @@ -24,6 +24,10 @@ * 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. + * + * ratelimit=<FLOAT>(<UNIT>)? + * What rate to limit all proxy traffic combined to. The default is + * DEFAULT_RATE_LIMIT. There is a sanity-check minimum of "10K". * * client=1 * If set (to any value), run in client RTMFP mode. In this mode, rather than @@ -78,7 +82,8 @@ package 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; + public static const DEFAULT_RATE_LIMIT:Number = undefined; + public static const MIN_RATE_LIMIT:Number = 10 * 1024; // Seconds. private static const RATE_LIMIT_HISTORY:Number = 5.0; @@ -117,18 +122,13 @@ package proxy_pairs = []; - 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); } private function loaderinfo_complete(e:Event):void { - var tmp:Object; + var tmp:*; debug = this.loaderInfo.parameters["debug"]; @@ -166,6 +166,18 @@ package } facilitator_poll_interval = Number(tmp); + tmp = get_param_byte_count("ratelimit", DEFAULT_RATE_LIMIT); + if (tmp === undefined) { + /* No rate limit. */ + } else if (tmp == null || tmp < MIN_FACILITATOR_POLL_INTERVAL) { + puts("Error: ratelimit must be a nonnegative number at least " + MIN_RATE_LIMIT + "."); + return; + } + if (tmp) + rate_limit = new BucketRateLimit(Number(tmp) * RATE_LIMIT_HISTORY, RATE_LIMIT_HISTORY); + else + rate_limit = new RateUnlimit(); + 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\"."); @@ -219,6 +231,19 @@ package return get_param_number(param, default_val); } + /* Get a count of bytes from a string specification like "100" or + "1.3m". Returns null on error. */ + private function get_param_byte_count(param:String, default_val:Number):Object + { + var spec:String; + + spec = this.loaderInfo.parameters[param]; + if (spec) + return parse_byte_count(spec); + else + return default_val; + } + /* The main logic begins here, after start-up issues are taken care of. */ private function proxy_main():void { @@ -411,6 +436,36 @@ package return addr; } + + /* Parse a count of bytes. A suffix of "k", "m", or "g" (or uppercase) + does what you would think. Returns null on error. */ + private static function parse_byte_count(spec:String):Object + { + const UNITS:Object = { + k: 1024, m: 1024 * 1024, g: 1024 * 1024 * 1024, + K: 1024, M: 1024 * 1024, G: 1024 * 1024 * 1024 + }; + var count:Number, units:Object; + var matches:Array; + + matches = spec.match(/^(\d+(?:\.\d*)?)(\w*)$/); + if (matches == null) + return null; + + count = Number(matches[1]); + if (isNaN(count)) + return null; + + if (matches[2] == "") { + units = 1; + } else { + units = UNITS[matches[2]]; + if (units == null) + return null; + } + + return count * Number(units); + } } }

1 0

[flashproxy/master] Add facilitator-graph.py.
by dcf＠torproject.org 22 Dec '11

22 Dec '11

commit 297b2a422e989b5d672e5acda93f80d653226bd3 Author: David Fifield <david(a)bamsoftware.com> Date: Thu Dec 22 09:42:37 2011 -0800 Add facilitator-graph.py. This program takes a facilitator log as input and produces a graph of the number of simultaneous proxies. --- experiments/facilitator-graph.py | 135 ++++++++++++++++++++++++++++++++++++++ 1 files changed, 135 insertions(+), 0 deletions(-) diff --git a/experiments/facilitator-graph.py b/experiments/facilitator-graph.py new file mode 100755 index 0000000..41271a7 --- /dev/null +++ b/experiments/facilitator-graph.py @@ -0,0 +1,135 @@ +#!/usr/bin/env python + +# Makes a graph of flash proxy counts from a facilitator log. + +import datetime +import getopt +import re +import sys + +import matplotlib +import matplotlib.pyplot as plt +import numpy as np + +POLL_INTERVAL = 10.0 + +def usage(f = sys.stdout): + print >> f, """\ +Usage: %s -o OUTPUT [INPUTFILE] + +Makes a graph of flash proxy counts from a facilitator log. + -h, --help show this help. + -o, --output=OUTPUT output file name (required).\ +""" % sys.argv[0] + +output_file_name = None + +opts, args = getopt.gnu_getopt(sys.argv[1:], "ho:", ["help", "output="]) +for o, a in opts: + if o == "-h" or o == "--help": + usage() + sys.exit() + elif o == "-o" or o == "--output": + output_file_name = a + +if not output_file_name: + usage() + sys.exit() + +if len(args) == 0: + input_file = sys.stdin +elif len(args) == 1: + input_file = open(args[0]) +else: + usage() + sys.exit() + +def format_date(d, pos=None): + d = matplotlib.dates.num2date(d) + return d.strftime("%B %d") + +def timedelta_to_seconds(delta): + return delta.days * (24 * 60 * 60) + delta.seconds + delta.microseconds / 1000000.0 + +class Block(object): + def __init__(self, ip, date): + self.ip = ip + self.begin_date = date + self.end_date = date + +prev_date = None +seen = {} +current = [] +blocks = [] +for line in input_file: + m = re.match(r'(\d+-\d+-\d+ \d+:\d+:\d+) proxy ([\d.]+):\d+ connects', line) + if not m: + continue + date_str, ip = m.groups() + date = datetime.datetime.strptime(date_str, "%Y-%m-%d %H:%M:%S") + + if prev_date is None or prev_date != date.date(): + print date.date() + prev_date = date.date() + + block = seen.get(ip) + if block is None: + block = Block(ip, date) + seen[ip] = block + current.append(block) + # Poor man's priority queue: keep the first to expire (oldest) at the + # tail of the list. + current.sort(key = lambda x: x.end_date, reverse = True) + else: + block.end_date = date + + # Delete all those that are now expired. + while current: + block = current[-1] + delta = timedelta_to_seconds(date - block.end_date) + if delta > POLL_INTERVAL * 1.5: + blocks.append(block) + current.pop() + del seen[block.ip] + else: + break + +events = [] +for block in blocks: + events.append(("begin", block.begin_date)) + events.append(("end", block.end_date + datetime.timedelta(seconds = POLL_INTERVAL / 2))) +# Handle any still alive at the end. +while current: + block = current[-1] + events.append(("begin", block.begin_date)) + events.append(("end", date)) + current.pop() + del seen[block.ip] + +events.sort(key = lambda x: x[1]) + +data = [] +num = 0 +for i, event in enumerate(events): + t = event[1] + data.append((t, num)) + if event[0] == "begin": + num += 1 + elif event[0] == "end": + num -= 1 + data.append((t, num)) +data = np.array(data) + +fig = plt.figure() +ax = fig.add_axes([0.10, 0.30, 0.88, 0.60]) +ax.set_ylabel(u"Number of proxies", fontsize=8) +fig.set_size_inches((8, 3)) + +ax.tick_params(direction="out", top="off", right="off") +ax.set_frame_on(False) +ax.xaxis.set_major_formatter(matplotlib.ticker.FuncFormatter(format_date)) +fig.autofmt_xdate() + +plt.fill_between(data[:,0], data[:,1], linewidth=0, color="black") + +fig.savefig(output_file_name)

1 0

[flashproxy/master] Allow ratelimit=off.
by dcf＠torproject.org 22 Dec '11

22 Dec '11

commit cc318101d94589b4456bf2722086614579374f48 Author: David Fifield <david(a)bamsoftware.com> Date: Wed Nov 16 05:03:35 2011 -0800 Allow ratelimit=off. --- experiments/switching/local-http-alternating.sh | 2 +- experiments/switching/local-http-constant.sh | 2 +- experiments/switching/remote-tor-alternating.sh | 2 +- experiments/switching/remote-tor-constant.sh | 2 +- experiments/throughput/throughput.sh | 2 +- swfcat.as | 12 ++++++++---- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/experiments/switching/local-http-alternating.sh b/experiments/switching/local-http-alternating.sh index 8b3bf91..696f1d5 100755 --- a/experiments/switching/local-http-alternating.sh +++ b/experiments/switching/local-http-alternating.sh @@ -9,7 +9,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&ratelimit=off" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" OUTPUT_FILENAME="$1" diff --git a/experiments/switching/local-http-constant.sh b/experiments/switching/local-http-constant.sh index bcc65c8..c1a52f8 100755 --- a/experiments/switching/local-http-constant.sh +++ b/experiments/switching/local-http-constant.sh @@ -9,7 +9,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&ratelimit=off" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" OUTPUT_FILENAME="$1" diff --git a/experiments/switching/remote-tor-alternating.sh b/experiments/switching/remote-tor-alternating.sh index a9c394d..26070d9 100755 --- a/experiments/switching/remote-tor-alternating.sh +++ b/experiments/switching/remote-tor-alternating.sh @@ -9,7 +9,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&ratelimit=off" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" OUTPUT_FILENAME="$1" diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index c1f1a82..939aef9 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-tor-constant.sh @@ -9,7 +9,7 @@ PROFILE_1=flashexp1 PROFILE_2=flashexp2 -PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&ratelimit=off" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" OUTPUT_FILENAME="$1" diff --git a/experiments/throughput/throughput.sh b/experiments/throughput/throughput.sh index 02939b1..672f2ac 100755 --- a/experiments/throughput/throughput.sh +++ b/experiments/throughput/throughput.sh @@ -19,7 +19,7 @@ while getopts "n:" OPTNAME; do done PROFILE=flashexp1 -PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&max_clients=$NU…" +PROXY_URL="http://127.0.0.1:8000/swfcat.swf?facilitator=127.0.0.1:9002&max_clients=$NU…" DATA_FILE_NAME="$FLASHPROXY_DIR/dump" RESULTS_FILE_NAME="results-$NUM_CLIENTS-$(date --iso)" diff --git a/swfcat.as b/swfcat.as index 478b97c..76b35c4 100644 --- a/swfcat.as +++ b/swfcat.as @@ -25,9 +25,10 @@ * 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. * - * ratelimit=<FLOAT>(<UNIT>)? - * What rate to limit all proxy traffic combined to. The default is - * DEFAULT_RATE_LIMIT. There is a sanity-check minimum of "10K". + * ratelimit=<FLOAT>(<UNIT>)?|off + * What rate to limit all proxy traffic combined to. The special value "off" + * disables the limit. The default is DEFAULT_RATE_LIMIT. There is a + * sanity-check minimum of "10K". * * client=1 * If set (to any value), run in client RTMFP mode. In this mode, rather than @@ -166,7 +167,10 @@ package } facilitator_poll_interval = Number(tmp); - tmp = get_param_byte_count("ratelimit", DEFAULT_RATE_LIMIT); + if (this.loaderInfo.parameters["ratelimit"] == "off") + tmp = undefined; + else + tmp = get_param_byte_count("ratelimit", DEFAULT_RATE_LIMIT); if (tmp === undefined) { /* No rate limit. */ } else if (tmp == null || tmp < MIN_FACILITATOR_POLL_INTERVAL) {

1 0

[torbrowser/maint-2.3] and a day later, firefox 9.0.1 comes out
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit e6f450dfd48979d0d4d05bcc41bb11afe3e6b677 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:33:13 2011 +0100 and a day later, firefox 9.0.1 comes out --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 568d719..20cfd71 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.35 HTTPSEVERY_VER=1.2.1 -FIREFOX_VER=9.0 +FIREFOX_VER=9.0.1 LIBEVENT_VER=2.0.16-stable LIBPNG_VER=1.4.8 NOSCRIPT_VER=2.2.4

1 0

[torbrowser/maint-2.2] and a day later, firefox 9.0.1 comes out
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit e6f450dfd48979d0d4d05bcc41bb11afe3e6b677 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:33:13 2011 +0100 and a day later, firefox 9.0.1 comes out --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 568d719..20cfd71 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.35 HTTPSEVERY_VER=1.2.1 -FIREFOX_VER=9.0 +FIREFOX_VER=9.0.1 LIBEVENT_VER=2.0.16-stable LIBPNG_VER=1.4.8 NOSCRIPT_VER=2.2.4

1 0

[torbrowser/master] and a day later, firefox 9.0.1 comes out
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit e6f450dfd48979d0d4d05bcc41bb11afe3e6b677 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:33:13 2011 +0100 and a day later, firefox 9.0.1 comes out --- build-scripts/versions.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/build-scripts/versions.mk b/build-scripts/versions.mk index 568d719..20cfd71 100644 --- a/build-scripts/versions.mk +++ b/build-scripts/versions.mk @@ -3,7 +3,7 @@ RELEASE_VER=2.2.35 HTTPSEVERY_VER=1.2.1 -FIREFOX_VER=9.0 +FIREFOX_VER=9.0.1 LIBEVENT_VER=2.0.16-stable LIBPNG_VER=1.4.8 NOSCRIPT_VER=2.2.4

1 0

[torbrowser/maint-2.3] Revert "update recommended versions to 2.2.35-2"
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit e8cc0bf29c433be2c2ea9615ba039d93fd4e66b5 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:31:45 2011 +0100 Revert "update recommended versions to 2.2.35-2" This reverts commit eb843cf1a4133292cd828fa57f34eb9c0a36fe9d. --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index fc269f3..ae01274 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-2-Linux-i686", -"2.2.35-2-Linux-x86_64", -"2.2.35-2-MacOS-i386", -"2.2.35-2-MacOS-x86_64", -"2.2.35-2-Windows" +"2.2.35-1-Linux-i686", +"2.2.35-1-Linux-x86_64", +"2.2.35-1-MacOS-i386", +"2.2.35-1-MacOS-x86_64", +"2.2.35-1-Windows" ]

1 0

[torbrowser/master] Revert "update recommended versions to 2.2.35-2"
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit e8cc0bf29c433be2c2ea9615ba039d93fd4e66b5 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:31:45 2011 +0100 Revert "update recommended versions to 2.2.35-2" This reverts commit eb843cf1a4133292cd828fa57f34eb9c0a36fe9d. --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index fc269f3..ae01274 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-2-Linux-i686", -"2.2.35-2-Linux-x86_64", -"2.2.35-2-MacOS-i386", -"2.2.35-2-MacOS-x86_64", -"2.2.35-2-Windows" +"2.2.35-1-Linux-i686", +"2.2.35-1-Linux-x86_64", +"2.2.35-1-MacOS-i386", +"2.2.35-1-MacOS-x86_64", +"2.2.35-1-Windows" ]

1 0

[torbrowser/maint-2.2] Revert "update recommended versions to 2.2.35-2"
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit e8cc0bf29c433be2c2ea9615ba039d93fd4e66b5 Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:31:45 2011 +0100 Revert "update recommended versions to 2.2.35-2" This reverts commit eb843cf1a4133292cd828fa57f34eb9c0a36fe9d. --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index fc269f3..ae01274 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-2-Linux-i686", -"2.2.35-2-Linux-x86_64", -"2.2.35-2-MacOS-i386", -"2.2.35-2-MacOS-x86_64", -"2.2.35-2-Windows" +"2.2.35-1-Linux-i686", +"2.2.35-1-Linux-x86_64", +"2.2.35-1-MacOS-i386", +"2.2.35-1-MacOS-x86_64", +"2.2.35-1-Windows" ]

1 0

[torbrowser/maint-2.2] update recommended versions to 2.2.35-2
by erinn＠torproject.org 22 Dec '11

22 Dec '11

commit eb843cf1a4133292cd828fa57f34eb9c0a36fe9d Author: Erinn Clark <erinn(a)torproject.org> Date: Thu Dec 22 18:17:15 2011 +0100 update recommended versions to 2.2.35-2 --- build-scripts/recommended-versions | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/build-scripts/recommended-versions b/build-scripts/recommended-versions index ae01274..fc269f3 100644 --- a/build-scripts/recommended-versions +++ b/build-scripts/recommended-versions @@ -1,7 +1,7 @@ [ -"2.2.35-1-Linux-i686", -"2.2.35-1-Linux-x86_64", -"2.2.35-1-MacOS-i386", -"2.2.35-1-MacOS-x86_64", -"2.2.35-1-Windows" +"2.2.35-2-Linux-i686", +"2.2.35-2-Linux-x86_64", +"2.2.35-2-MacOS-i386", +"2.2.35-2-MacOS-x86_64", +"2.2.35-2-Windows" ]

1 0