tor-commits November 2011

tor-commits@lists.torproject.org

16 participants
987 discussions

r25195: {website} updated the manual, translations are outdated now (website/trunk/docs/en)
by Runa Sandvik 05 Nov '11

05 Nov '11

Author: runa Date: 2011-11-05 17:15:00 +0000 (Sat, 05 Nov 2011) New Revision: 25195 Modified: website/trunk/docs/en/short-user-manual.wml Log: updated the manual, translations are outdated now Modified: website/trunk/docs/en/short-user-manual.wml =================================================================== --- website/trunk/docs/en/short-user-manual.wml 2011-11-04 02:31:24 UTC (rev 25194) +++ website/trunk/docs/en/short-user-manual.wml 2011-11-05 17:15:00 UTC (rev 25195) @@ -22,9 +… [View More]

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 05 Nov '11

05 Nov '11

commit 3ef82516bfd3121b5db5c4e46dd3fc34f64d0f61 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 5 01:36:13 2011 +0000 Update translations for vidalia_help --- it/services.po | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/it/services.po b/it/services.po index 1e16a35..62b91b3 100644 --- a/it/services.po +++ b/it/services.po @@ -1,12 +1,13 @@ # # Translators: +# <lukefiltroman(a)gmail.com>, 2011. msgid "" … [View More]

1 0

[pytorctl/master] Don't round the circ fail rate.
by mikeperry＠torproject.org 04 Nov '11

04 Nov '11

commit 391b4399adda91e8b68ffd6e1fa294efe846debd Author: Mike Perry <mikeperry-git(a)fscked.org> Date: Fri Nov 4 15:41:54 2011 -0700 Don't round the circ fail rate. --- SQLSupport.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/SQLSupport.py b/SQLSupport.py index 40cbdf7..e50dd71 100644 --- a/SQLSupport.py +++ b/SQLSupport.py @@ -674,7 +674,7 @@ class RouterStats(Entity): f.write("node_id=$"+s.router.idhex+" nick="+s.router.nickname) f.… [View More]

1 0

[flashproxy/master] Fix a usage example.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit ec2f93037dbd2fd6a006c183d9801cabda0c8c71 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Nov 4 00:54:41 2011 -0700 Fix a usage example. --- experiments/switching/remote-tor-constant.sh | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/experiments/switching/remote-tor-constant.sh b/experiments/switching/remote-tor-constant.sh index c1cce88..c1f1a82 100755 --- a/experiments/switching/remote-tor-constant.sh +++ b/experiments/switching/remote-… [View More]

1 0

[flashproxy/master] Add remote-tor-direct.sh.
by dcf＠torproject.org 04 Nov '11

04 Nov '11

commit 64918e685118a140dc1f5cd177a888ea1a0e7f39 Author: David Fifield <david(a)bamsoftware.com> Date: Fri Nov 4 14:01:43 2011 -0700 Add remote-tor-direct.sh. This tests the speed of a Tor download without any flash proxy. --- experiments/switching/remote-tor-direct.sh | 37 ++++++++++++++++++++++++++++ experiments/switching/switching-all.sh | 3 ++ experiments/switching/torrc.bridge | 5 ++++ 3 files changed, 45 insertions(+), 0 deletions(-) diff --… [View More]git a/experiments/switching/remote-tor-direct.sh b/experiments/switching/remote-tor-direct.sh new file mode 100755 index 0000000..1b6bdaa --- /dev/null +++ b/experiments/switching/remote-tor-direct.sh @@ -0,0 +1,37 @@ +#!/bin/bash + +# Usage: ./remote-tor-direct.sh [OUTPUT_FILENAME] +# +# Tests a Tor download without using a flash proxy. If OUTPUT_FILENAME is +# supplied, appends the time measurement to that file. + +. ../common.sh + +DATA_FILE_NAME="$FLASHPROXY_DIR/dump" +OUTPUT_FILENAME="$1" + +# Declare an array. +declare -a PIDS_TO_KILL +stop() { + if [ -n "${PIDS_TO_KILL[*]}" ]; then + echo "Kill pids ${PIDS_TO_KILL[@]}." + kill "${PIDS_TO_KILL[@]}" + fi + echo "Delete data file." + rm -f "$DATA_FILE_NAME" + exit +} +trap stop EXIT + +echo "Start Tor." +"$TOR" -f torrc.bridge & +PIDS_TO_KILL+=($!) + +# Let Tor bootstrap. +visible_sleep 15 + +if [ -n "$OUTPUT_FILENAME" ]; then + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME" >> "$OUTPUT_FILENAME" +else + real_time torify wget http://torperf.torproject.org/.5mbfile --wait=0 --waitretry=0 -c -t 0 -O "$DATA_FILE_NAME" +fi diff --git a/experiments/switching/switching-all.sh b/experiments/switching/switching-all.sh index b3051cc..f306152 100755 --- a/experiments/switching/switching-all.sh +++ b/experiments/switching/switching-all.sh @@ -28,6 +28,9 @@ repeat $NUM_ITERATIONS ./local-http-constant.sh "local-http-constant-$DATE.log" > "local-http-alternating-$DATE.log" repeat $NUM_ITERATIONS ./local-http-alternating.sh "local-http-alternating-$DATE.log" +> "remote-tor-direct-$DATE.log" +repeat $NUM_ITERATIONS ./remote-tor-direct.sh "remote-tor-direct-$DATE.log" + > "remote-tor-constant-$DATE.log" repeat $NUM_ITERATIONS ./remote-tor-constant.sh "remote-tor-constant-$DATE.log" diff --git a/experiments/switching/torrc.bridge b/experiments/switching/torrc.bridge new file mode 100644 index 0000000..d70c8b1 --- /dev/null +++ b/experiments/switching/torrc.bridge @@ -0,0 +1,5 @@ +# This configuration file causes a direct Tor connection to use the same bridge +# used by a flash proxy. + +UseBridges 1 +Bridge tor1.bamsoftware.com:9001 [View Less]

1 0

[metrics-tasks/master] No need to edit the R file anymore (#2394).
by karsten＠torproject.org 04 Nov '11

04 Nov '11

commit 9dbecb3523efdd184f0687f144ee26a54deca154 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 4 21:52:35 2011 +0100 No need to edit the R file anymore (#2394). --- task-2394/README | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/task-2394/README b/task-2394/README index 714853e..774dff2 100644 --- a/task-2394/README +++ b/task-2394/README @@ -31,7 +31,3 @@ Visualize self-reported vs. measured bandwidth of relays $ R --slave -f … [View More]

1 0

[metrics-tasks/master] Add colours and a legend to bwauth graphs (#2394).
by karsten＠torproject.org 04 Nov '11

04 Nov '11

commit 67d7d6441c62d188e646e220980545914e2cf54e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Fri Nov 4 21:47:51 2011 +0100 Add colours and a legend to bwauth graphs (#2394). --- task-2394/bandwidth-comparison.R | 32 +++++++++++++++----------------- 1 files changed, 15 insertions(+), 17 deletions(-) diff --git a/task-2394/bandwidth-comparison.R b/task-2394/bandwidth-comparison.R index 356464b..a4b0329 100644 --- a/task-2394/bandwidth-comparison.R +++ b/task-2394/… [View More]bandwidth-comparison.R @@ -45,14 +45,14 @@ cdf_relays_category_votes <- function(data, category) { y = (1:length(consensus)) / length(consensus), source = "consensus", category = category), - data.frame(x = ides, - y = (1:length(ides)) / length(ides), - source = "ides", - category = category), data.frame(x = urras, y = (1:length(urras)) / length(urras), source = "urras", category = category), + data.frame(x = ides, + y = (1:length(ides)) / length(ides), + source = "ides", + category = category), data.frame(x = moria1, y = (1:length(moria1)) / length(moria1), source = "moria1", @@ -78,13 +78,12 @@ scale_x_log10("\nRatio of measured by self-reported bandwidth", labels = c("0.1", "1", "10")) + scale_y_continuous("Fraction of relays\n", limits = c(0, 1), formatter = "percent") + -scale_colour_manual("", - breaks = c("consensus", "urras", "ides", "moria1", "gabelmoo"), - values = c("black", rep(alpha("black", 0.25), 4))) + -# values = c("black", alpha("purple", 0.5), rep(alpha("black", 0.25), 3))) + +scale_colour_manual("", c("consensus" = "black", + "urras" = alpha("purple", 0.5), "ides" = alpha("red", 0.5), + "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5))) + geom_vline(xintercept = 1, legend = FALSE, linetype = "dotted") + opts(title = paste("Measured vs. self-reported bandwidth ratios in", - "consensus and votes\n"), legend.position = "none") + "consensus and votes\n"), legend.position = "right") ggsave(filename = "bandwidth-comparison-relays-votes.png", width = 8, height = 5, dpi = 150) @@ -111,12 +110,12 @@ cdf_measured_category_votes <- function(data, category) { ratio = d$consensusbandwidth * 1000 / d$descriptorbandwidth, measured = d$consensusbandwidth), "consensus", category), wecdf(data.frame( - ratio = d$idesbandwidth * 1000 / d$descriptorbandwidth, - measured = d$idesbandwidth), "ides", category), - wecdf(data.frame( ratio = d$urrasbandwidth * 1000 / d$descriptorbandwidth, measured = d$urrasbandwidth), "urras", category), wecdf(data.frame( + ratio = d$idesbandwidth * 1000 / d$descriptorbandwidth, + measured = d$idesbandwidth), "ides", category), + wecdf(data.frame( ratio = d$moria1bandwidth * 1000 / d$descriptorbandwidth, measured = d$moria1bandwidth), "moria1", category), wecdf(data.frame( @@ -139,13 +138,12 @@ scale_x_log10("\nRatio of measured by self-reported bandwidth", labels = c("0.1", "1", "10")) + scale_y_continuous("Fraction of measured bandwidth\n", limits = c(0, 1), formatter = "percent") + -scale_colour_manual("", - breaks = c("consensus", "urras", "ides", "moria1", "gabelmoo"), - values = c("black", rep(alpha("black", 0.25), 4))) + -# values = c("black", alpha("purple", 0.5), rep(alpha("black", 0.25), 3))) + +scale_colour_manual("", c("consensus" = "black", + "urras" = alpha("purple", 0.5), "ides" = alpha("red", 0.5), + "moria1" = alpha("green", 0.5), "gabelmoo" = alpha("blue", 0.5))) + geom_vline(xintercept = 1, legend = FALSE, linetype = "dotted") + opts(title = paste("Measured vs. self-reported bandwidth ratios in", - "consensus and votes\n"), legend.position = "none") + "consensus and votes\n"), legend.position = "right") ggsave(filename = "bandwidth-comparison-measured-votes.png", width = 8, height = 5, dpi = 150) write.csv(measured_category_votes, "measured_category_votes-temp.csv", [View Less]

1 0

[tor-cloud/master] Updated with FAQ and more info (do /not/ push this live just yet)
by runa＠torproject.org 04 Nov '11

04 Nov '11

commit 902da50891a1f9fd3b145df5fe0e83631b55ddae Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Fri Nov 4 20:36:16 2011 +0000 Updated with FAQ and more info (do /not/ push this live just yet) --- html/index.html | 150 ++++++++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 131 insertions(+), 19 deletions(-) diff --git a/html/index.html b/html/index.html index e9a04ad..f445c15 100644 --- a/html/index.html +++ b/html/index.html @@ -37,8 +37,8 @@ … [View More]

1 0

[stem/master] Utility function for parsing control messages
by atagar＠torproject.org 04 Nov '11

04 Nov '11

commit a090373e5384026295b31daee8ef622a589a913d Author: Damian Johnson <atagar(a)torproject.org> Date: Tue Nov 1 18:49:55 2011 -0700 Utility function for parsing control messages Trying out a utility function to pop the first item off a control response, with the caller providing attributes it should have. --- stem/types.py | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) diff --git a/stem/types.py b/… [View More]stem/types.py index b289921..e6188ae 100644 --- a/stem/types.py +++ b/stem/types.py @@ -22,6 +22,10 @@ import socket from stem.util import log +# Escape sequences from the 'esc_for_log' function of tor's 'common/util.c'. +CONTROL_ESCAPES = {r"\\": "\\", r"\"": "\"", r"\'": "'", + r"\r": "\r", r"\n": "\n", r"\t": "\t"} + class ProtocolError(Exception): "Malformed content from the control socket." pass @@ -282,3 +286,79 @@ class Version: # TODO: version requirements will probably be moved to another module later REQ_GETINFO_CONFIG_TEXT = Version("0.2.2.7-alpha") +# TODO: trying this out temporarily to see if it's generally helpful or another +# parser function would be a better fit +def get_entry(line, mapping = False, quoted = False, escaped = False): + """ + Parses a space separated series of entries, providing back a tuple with the + first entry in the string and the remainder (dropping the space between). + + This is meant to be a helper function for stem to parse tor's control + protocol lines rather than being used directly by this library's users. + + Example: + get_entry('hello there random person') => + (None, "hello", "there random person") + get_entry('version="0.1.2.3"', True, True) => + ("version", "0.1.2.3", "") + get_entry('"this has a \" and \\ in it" foo=bar more_data', False, True, True) => + (None, 'this has a " and \ in it', "foo=bar more_data") + + Arguments: + line (str) - string with a space separated series of entries + mapping (bool) - parses the next entry as a KEY=VALUE entry, if False then + the 'key' attribute of the returned tuple is None + quoted (bool) - parses the next entry as a quoted value, removing the + quotes + escaped (bool) - unescapes the CONTROL_ESCAPES escape sequences + + Returns: + tuple of the form (key, value, remainder) + + Raises: + ValueError if 'mapping' is True without a '=' or 'quoted' is True without + the value being quoted + """ + + # Start by splitting apart the 'key=everything else' portion. The key + # shouldn't have any spaces in it. + + if mapping: + key_match = re.match("^(\S+)=", line) + + if key_match: + key = key_match.groups()[0] + remainder = line[key_match.end():] + else: + raise ValueError("mapping doesn't contain a '=': " + line) + else: key, remainder = None, line + + if quoted: + # Check that we have a starting quote. + if not remainder.startswith("\""): + raise ValueError("quoted value doesn't have a leading quote: " + line) + + # Finds the ending quote. If we have escapes then we need to skip any '\"' + # entries. + end_quote = remainder.find("\"", 1) + + if is_escaped: + while end_quote != -1 and remainder[end_quote - 1] == "/": + end_quote = remainder.find("\"", end_quote + 1) + + # Check that we have an ending quote. + if end_quote == -1: + raise ValueError("quoted value doesn't have an ending quote: " + line) + + value, remainder = remainder[1:end_quote], remainder[end_quote + 1:] + else: + # Non-quoted value. Just need to check if there's more data afterward. + if " " in remainder: value, remainder = remainder.split(" ", 1) + else: value, remainder = remainder, "" + + if escaped: + for esc_sequence, replacement in CONTROL_ESCAPES.items(): + value = value.replace(esc_sequence, replacement) + + return (key, value, remainder) + [View Less]

1 0

[stem/master] Unit tests for types.get_entry examples
by atagar＠torproject.org 04 Nov '11

04 Nov '11

commit 45d3c819b21dd29aec70178f66777a365200a617 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Nov 3 07:07:11 2011 -0700 Unit tests for types.get_entry examples Unit tests for the examples in the pydocs of the function and fixes for the issues they uncovered. --- run_tests.py | 2 ++ stem/types.py | 6 +++--- test/unit/types.py | 29 +++++++++++++++++++++++++++++ 3 files changed, 34 insertions(+), 3 deletions(-) diff --git a/run_tests.… [View More]py b/run_tests.py index 2f2d6ae..15a6c92 100755 --- a/run_tests.py +++ b/run_tests.py @@ -12,6 +12,7 @@ import unittest import test.runner import test.unit.message import test.unit.version +import test.unit.types import test.integ.message import test.integ.system @@ -24,6 +25,7 @@ DIVIDER = "=" * 70 # (name, class) tuples for all of our unit and integration tests UNIT_TESTS = (("stem.types.ControlMessage", test.unit.message.TestMessageFunctions), ("stem.types.Version", test.unit.version.TestVerionFunctions), + ("stem.types.get_entry", test.unit.types.TestGetEntry), ) INTEG_TESTS = (("stem.types.ControlMessage", test.integ.message.TestMessageFunctions), diff --git a/stem/types.py b/stem/types.py index e6188ae..c149b3b 100644 --- a/stem/types.py +++ b/stem/types.py @@ -342,8 +342,8 @@ def get_entry(line, mapping = False, quoted = False, escaped = False): # entries. end_quote = remainder.find("\"", 1) - if is_escaped: - while end_quote != -1 and remainder[end_quote - 1] == "/": + if escaped: + while end_quote != -1 and remainder[end_quote - 1] == "\\": end_quote = remainder.find("\"", end_quote + 1) # Check that we have an ending quote. @@ -360,5 +360,5 @@ def get_entry(line, mapping = False, quoted = False, escaped = False): for esc_sequence, replacement in CONTROL_ESCAPES.items(): value = value.replace(esc_sequence, replacement) - return (key, value, remainder) + return (key, value, remainder.lstrip()) diff --git a/test/unit/types.py b/test/unit/types.py new file mode 100644 index 0000000..9c06ab2 --- /dev/null +++ b/test/unit/types.py @@ -0,0 +1,29 @@ +""" +Unit tests for the types.get_entry function. +""" + +import unittest +import stem.types + +class TestGetEntry(unittest.TestCase): + """ + Tests the types.get_entry function. + """ + + def test_examples(self): + """ + Checks that the examples from the pydoc are correct. + """ + + example_input = 'hello there random person' + example_result = (None, "hello", "there random person") + self.assertEquals(stem.types.get_entry(example_input), example_result) + + example_input = 'version="0.1.2.3"' + example_result = ("version", "0.1.2.3", "") + self.assertEquals(stem.types.get_entry(example_input, True, True), example_result) + + example_input = r'"this has a \" and \\ in it" foo=bar more_data' + example_result = (None, r'this has a " and \ in it', "foo=bar more_data") + self.assertEquals(stem.types.get_entry(example_input, False, True, True), example_result) + [View Less]

1 0

← Newer
1
...
86
87
88
89
90
91
92
...
99
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2011