- tor-commits - lists.torproject.org

r24567: {} Just a test2 (website)
by Peter Palfrader 05 Apr '11

05 Apr '11

Author: weasel Date: 2011-04-05 20:43:54 +0000 (Tue, 05 Apr 2011) New Revision: 24567 Removed: website/test/ Log: Just a test2

1 0

r24566: {} Just a test2 (website)
by Peter Palfrader 05 Apr '11

05 Apr '11

Author: weasel Date: 2011-04-05 20:43:34 +0000 (Tue, 05 Apr 2011) New Revision: 24566 Added: website/test/ Log: Just a test2

1 0

r24565: {} Just a test (website)
by Peter Palfrader 05 Apr '11

05 Apr '11

Author: weasel Date: 2011-04-05 20:39:19 +0000 (Tue, 05 Apr 2011) New Revision: 24565 Removed: website/test/ Log: Just a test

1 0

r24564: {} Just a test (website)
by Peter Palfrader 05 Apr '11

05 Apr '11

Author: weasel Date: 2011-04-05 20:38:47 +0000 (Tue, 05 Apr 2011) New Revision: 24564 Added: website/test/ Log: Just a test

1 0

[tor/master] Tweaks to Cagara's CountPrivateBandwidth patch:
by nickm＠torproject.org 05 Apr '11

05 Apr '11

commit 1a49fdecf89c44cb4b2975caf5a22b16f15a2a83 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 5 15:01:19 2011 -0400 Tweaks to Cagara's CountPrivateBandwidth patch: - Document it in the manpage - Add a changes entry - No need to log when it is set: we don't log for other options. - Use doxygen to document the new flag. - Test truth of C variables with "if (x)", not "if (x == 1)". - Simplify a complex boolean expression by breaking it up. --- changes/bug2559 | 6 ++++++ doc/tor.1.txt | 7 +++++++ src/or/config.c | 5 ----- src/or/connection.c | 10 ++++++---- src/or/or.h | 5 +++-- 5 files changed, 22 insertions(+), 11 deletions(-) diff --git a/changes/bug2559 b/changes/bug2559 new file mode 100644 index 0000000..9715eaf --- /dev/null +++ b/changes/bug2559 @@ -0,0 +1,6 @@ + o Minor features: + - Ordinarily, Tor does not count traffic from private addresses + (like 127.0.0.1 or 10.0.0.1) when calculating rate limits or + accounting. There is now a new option, CountPrivateBandwidth, to + disable this behavior. Patch from Daniel Cagara. + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index eaebf44..5a70cd2 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -437,6 +437,12 @@ Other options can be specified either on the command-line (--option and you're running on Windows, setting this option to 1 will tell Libevent not to use the Windows IOCP networking API. (Default: 1) +**CountPrivateBandwidth** **0**|**1**:: + If this option is set, then Tor's rate-limiting applies not only to + remote connections, but also to connections to private addresses like + 127.0.0.1 or 10.0.0.1. This is mostly useful for debugging + rate-limiting. (Default: 0) + CLIENT OPTIONS -------------- @@ -1342,6 +1348,7 @@ The following options are used for running a testing Tor network. AuthDirMaxServersPerAuthAddr 0 ClientDNSRejectInternalAddresses 0 ClientRejectInternalAddresses 0 + CountPrivateBandwidth 1 ExitPolicyRejectPrivate 0 V3AuthVotingInterval 5 minutes V3AuthVoteDelay 20 seconds diff --git a/src/or/config.c b/src/or/config.c index 9d782b9..e6322cb 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2958,11 +2958,6 @@ options_validate(or_options_t *old_options, or_options_t *options, tor_assert(msg); *msg = NULL; - // Cagara: Tell us if we use the private network fix! - if(options->CountPrivateBandwidth == 1) { - log_notice(LD_CONFIG, "Private bandwidth will be treated as normal traffic."); - } - if (options->ORPort < 0 || options->ORPort > 65535) REJECT("ORPort option out of bounds."); diff --git a/src/or/connection.c b/src/or/connection.c index 953f402..33f9af6 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1954,10 +1954,12 @@ static int connection_is_rate_limited(connection_t *conn) { or_options_t *options = get_options(); - if (conn->linked || /* internal connection */ - (options->CountPrivateBandwidth==1 && ( tor_addr_family(&conn->addr) == AF_UNSPEC || /* no address */ - tor_addr_is_internal(&conn->addr, 0)))) /* internal address */ - return 0; + if (conn->linked) + return 0; /* Internal connection */ + else if (options->CountPrivateBandwidth && + (tor_addr_family(&conn->addr) == AF_UNSPEC || /* no address */ + tor_addr_is_internal(&conn->addr, 0))) + return 0; /* Internal address */ else return 1; } diff --git a/src/or/or.h b/src/or/or.h index fb68d44..c134d7c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2868,8 +2868,9 @@ typedef struct { /** Boolean: if set, we start even if our resolv.conf file is missing * or broken. */ int ServerDNSAllowBrokenConfig; - int CountPrivateBandwidth; // Cagara: Flag to allow private addresses counting to bucket size - + /** Boolean: if set, then even connections to private addresses will get + * rate-limited. */ + int CountPrivateBandwidth; smartlist_t *ServerDNSTestAddresses; /**< A list of addresses that definitely * should be resolvable. Used for * testing our DNS server. */

1 0

[tor/master] Patch from cagara: Add a CountPrivateBandwidth flag
by nickm＠torproject.org 05 Apr '11

05 Apr '11

commit e61f3293e479bb6cadb87026937402a3c440f513 Author: Daniel Cagara <Daniel.Cagara(a)uni-dusseldorf.de> Date: Tue Apr 5 14:50:32 2011 -0400 Patch from cagara: Add a CountPrivateBandwidth flag --- src/or/config.c | 8 ++++++++ src/or/connection.c | 5 +++-- src/or/or.h | 1 + 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index d853d7b..9d782b9 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -211,6 +211,7 @@ static config_var_t _option_vars[] = { V(CookieAuthentication, BOOL, "0"), V(CookieAuthFileGroupReadable, BOOL, "0"), V(CookieAuthFile, STRING, NULL), + V(CountPrivateBandwidth, BOOL, "0"), V(DataDirectory, FILENAME, NULL), OBSOLETE("DebugLogFile"), V(DirAllowPrivateAddresses, BOOL, NULL), @@ -418,6 +419,7 @@ static config_var_t testing_tor_network_defaults[] = { V(AuthDirMaxServersPerAuthAddr,UINT, "0"), V(ClientDNSRejectInternalAddresses, BOOL,"0"), V(ClientRejectInternalAddresses, BOOL, "0"), + V(CountPrivateBandwidth, BOOL, "1"), V(ExitPolicyRejectPrivate, BOOL, "0"), V(V3AuthVotingInterval, INTERVAL, "5 minutes"), V(V3AuthVoteDelay, INTERVAL, "20 seconds"), @@ -429,6 +431,7 @@ static config_var_t testing_tor_network_defaults[] = { V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "0 minutes"), V(MinUptimeHidServDirectoryV2, INTERVAL, "0 minutes"), V(_UsingTestNetworkDefaults, BOOL, "1"), + { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL } }; #undef VAR @@ -2955,6 +2958,11 @@ options_validate(or_options_t *old_options, or_options_t *options, tor_assert(msg); *msg = NULL; + // Cagara: Tell us if we use the private network fix! + if(options->CountPrivateBandwidth == 1) { + log_notice(LD_CONFIG, "Private bandwidth will be treated as normal traffic."); + } + if (options->ORPort < 0 || options->ORPort > 65535) REJECT("ORPort option out of bounds."); diff --git a/src/or/connection.c b/src/or/connection.c index d557776..953f402 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1953,9 +1953,10 @@ retry_all_listeners(smartlist_t *replaced_conns, static int connection_is_rate_limited(connection_t *conn) { + or_options_t *options = get_options(); if (conn->linked || /* internal connection */ - tor_addr_family(&conn->addr) == AF_UNSPEC || /* no address */ - tor_addr_is_internal(&conn->addr, 0)) /* internal address */ + (options->CountPrivateBandwidth==1 && ( tor_addr_family(&conn->addr) == AF_UNSPEC || /* no address */ + tor_addr_is_internal(&conn->addr, 0)))) /* internal address */ return 0; else return 1; diff --git a/src/or/or.h b/src/or/or.h index 6d06b85..fb68d44 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -2868,6 +2868,7 @@ typedef struct { /** Boolean: if set, we start even if our resolv.conf file is missing * or broken. */ int ServerDNSAllowBrokenConfig; + int CountPrivateBandwidth; // Cagara: Flag to allow private addresses counting to bucket size smartlist_t *ServerDNSTestAddresses; /**< A list of addresses that definitely * should be resolvable. Used for

1 0

r24563: {website} Noting that a timeline is highly recommended for gsoc apps ( (website/trunk/about/en)
by Damian Johnson 05 Apr '11

05 Apr '11

Author: atagar Date: 2011-04-05 15:05:20 +0000 (Tue, 05 Apr 2011) New Revision: 24563 Modified: website/trunk/about/en/gsoc.wml Log: Noting that a timeline is highly recommended for gsoc apps (caught by asn). Modified: website/trunk/about/en/gsoc.wml =================================================================== --- website/trunk/about/en/gsoc.wml 2011-04-05 02:44:58 UTC (rev 24562) +++ website/trunk/about/en/gsoc.wml 2011-04-05 15:05:20 UTC (rev 24563) @@ -129,7 +129,8 @@ descriptions of what you're going to do, with more details about the parts you expect to be tricky. Your proposal should also try to break down the project into tasks of a fairly fine granularity, and convince - us you have a plan for finishing it.</li> + us you have a plan for finishing it. A timeline for what you will be doing + throughout the summer is highly recommended.</li> <li>Point us to a code sample: something good and clean to demonstrate that you know what you're doing, ideally from an existing project.</li>

1 0

r24562: {arm} Hotfix to pick up r24560 (crashing issue when there's extra (in arm/release: . src src/util)
by Damian Johnson 05 Apr '11

05 Apr '11

Author: atagar Date: 2011-04-05 02:44:58 +0000 (Tue, 05 Apr 2011) New Revision: 24562 Modified: arm/release/ChangeLog arm/release/src/util/torTools.py arm/release/src/version.py Log: Hotfix to pick up r24560 (crashing issue when there's extra spacing in the HiddenServicePort config option) Modified: arm/release/ChangeLog =================================================================== --- arm/release/ChangeLog 2011-04-05 02:42:18 UTC (rev 24561) +++ arm/release/ChangeLog 2011-04-05 02:44:58 UTC (rev 24562) @@ -1,6 +1,6 @@ CHANGE LOG -4/4/11 - version 1.4.2 +4/4/11 - version 1.4.2 (r24555) This release chiefly consists of a fully reimplemented connection panel. Besides being a sane, maintainable implementation this includes numerous new features and improvements like full circuit paths, applications involved for local connections, and better type identification. * added: full rewrite of the connection panel, providing: @@ -47,6 +47,7 @@ * fix: the 'startup.dataDirectory' config option was being ignored * fix: recognizing the proper private ip ranges of the 172.* block * fix: missing 'is default' option from config sort ordering + * fix (4/4/11): hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard) 1/7/11 - version 1.4.1 (r24054) Platform specific enhancements including BSD compatibility and vastly improved performance on Linux. @@ -89,6 +90,11 @@ * fix: connection resolution wasn't finding results if tor was running under a different name * fix: brought all Linux connection resolvers into parity (established tcp connections only) * fix: commands with quoted pipes were being mis-parsed by the sysTools' call function + * fix (1/11/11, r24064): including platform, python version, and arm/tor configurations in debug dumps + * fix (1/11/11, r24064): properly parse the ps field when displaying decimal seconds (patch by Fabian) + * fix (1/11/11, r24064): error when initial resource lookups fail (caught by Trystero) + * fix (1/12/11, r24075): decimal seconds in the ps uptime field were being misparsed (patch by Fabian) + * fix (1/15/11, r24092): adding a --docPath argument to help Gentoo ebuilds (https://bugs.gentoo.org/349792) 11/27/10 - version 1.4.0 (r23873) Introducing a new page for managing tor's configuration, along with several other improvements. Modified: arm/release/src/util/torTools.py =================================================================== --- arm/release/src/util/torTools.py 2011-04-05 02:42:18 UTC (rev 24561) +++ arm/release/src/util/torTools.py 2011-04-05 02:44:58 UTC (rev 24562) @@ -1750,7 +1750,7 @@ if " " in hsEntry: # parses the target, checking if it's a port or IP:Port combination - hsTarget = hsEntry.split(" ")[1] + hsTarget = hsEntry.split()[1] if ":" in hsTarget: hsPort = hsTarget.split(":")[1] # target is the IP:Port Modified: arm/release/src/version.py =================================================================== --- arm/release/src/version.py 2011-04-05 02:42:18 UTC (rev 24561) +++ arm/release/src/version.py 2011-04-05 02:44:58 UTC (rev 24562) @@ -2,6 +2,6 @@ Provides arm's version and release date. """ -VERSION = '1.4.2' +VERSION = '1.4.2.1' LAST_MODIFIED = "April 4, 2011"

1 0

r24561: {arm} Updating release notes to reflect bug caught by Nicolas plus (arm/trunk)
by Damian Johnson 05 Apr '11

05 Apr '11

Author: atagar Date: 2011-04-05 02:42:18 +0000 (Tue, 05 Apr 2011) New Revision: 24561 Modified: arm/trunk/ChangeLog Log: Updating release notes to reflect bug caught by Nicolas plus hotfixes for the last release that never made it into the changelog. Modified: arm/trunk/ChangeLog =================================================================== --- arm/trunk/ChangeLog 2011-04-05 02:32:07 UTC (rev 24560) +++ arm/trunk/ChangeLog 2011-04-05 02:42:18 UTC (rev 24561) @@ -47,6 +47,7 @@ * fix: the 'startup.dataDirectory' config option was being ignored * fix: recognizing the proper private ip ranges of the 172.* block * fix: missing 'is default' option from config sort ordering + * fix (4/4/11): hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard) 1/7/11 - version 1.4.1 (r24054) Platform specific enhancements including BSD compatibility and vastly improved performance on Linux. @@ -89,6 +90,11 @@ * fix: connection resolution wasn't finding results if tor was running under a different name * fix: brought all Linux connection resolvers into parity (established tcp connections only) * fix: commands with quoted pipes were being mis-parsed by the sysTools' call function + * fix (1/11/11, r24064): including platform, python version, and arm/tor configurations in debug dumps + * fix (1/11/11, r24064): properly parse the ps field when displaying decimal seconds (patch by Fabian) + * fix (1/11/11, r24064): error when initial resource lookups fail (caught by Trystero) + * fix (1/12/11, r24075): decimal seconds in the ps uptime field were being misparsed (patch by Fabian) + * fix (1/15/11, r24092): adding a --docPath argument to help Gentoo ebuilds (https://bugs.gentoo.org/349792) 11/27/10 - version 1.4.0 (r23873) Introducing a new page for managing tor's configuration, along with several other improvements.

1 0

r24560: {arm} Hidden service parsing issue when there's multiple spaces in (arm/trunk/src/util)
by Damian Johnson 05 Apr '11

05 Apr '11

Author: atagar Date: 2011-04-05 02:32:07 +0000 (Tue, 05 Apr 2011) New Revision: 24560 Modified: arm/trunk/src/util/torTools.py Log: Hidden service parsing issue when there's multiple spaces in the HiddenServicePort opition (caught by Nicolas Pouillard) Modified: arm/trunk/src/util/torTools.py =================================================================== --- arm/trunk/src/util/torTools.py 2011-04-05 00:39:17 UTC (rev 24559) +++ arm/trunk/src/util/torTools.py 2011-04-05 02:32:07 UTC (rev 24560) @@ -1750,7 +1750,7 @@ if " " in hsEntry: # parses the target, checking if it's a port or IP:Port combination - hsTarget = hsEntry.split(" ")[1] + hsTarget = hsEntry.split()[1] if ":" in hsTarget: hsPort = hsTarget.split(":")[1] # target is the IP:Port

1 0