- tor-commits - lists.torproject.org

[tor/master] Add a missing ! to the check for CountPrivatebandwidth.
by nickm＠torproject.org 06 Apr '11

06 Apr '11

commit f6cc8f0ee31d09bc082752d90d72c696cbfa45d0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 6 15:24:44 2011 -0400 Add a missing ! to the check for CountPrivatebandwidth. --- src/or/connection.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 33f9af6..8b48b96 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -1956,7 +1956,7 @@ connection_is_rate_limited(connection_t *conn) or_options_t *options = get_options(); if (conn->linked) return 0; /* Internal connection */ - else if (options->CountPrivateBandwidth && + else if (! options->CountPrivateBandwidth && (tor_addr_family(&conn->addr) == AF_UNSPEC || /* no address */ tor_addr_is_internal(&conn->addr, 0))) return 0; /* Internal address */

1 0

r24569: {website} remove the sales pitch from a FAQ answer, that answer is alr (website/trunk/docs/en)
by Andrew Lewman 06 Apr '11

06 Apr '11

Author: phobos Date: 2011-04-06 13:53:01 +0000 (Wed, 06 Apr 2011) New Revision: 24569 Modified: website/trunk/docs/en/faq-abuse.wml Log: remove the sales pitch from a FAQ answer, that answer is already legally questionable. Modified: website/trunk/docs/en/faq-abuse.wml =================================================================== --- website/trunk/docs/en/faq-abuse.wml 2011-04-05 20:47:58 UTC (rev 24568) +++ website/trunk/docs/en/faq-abuse.wml 2011-04-06 13:53:01 UTC (rev 24569) @@ -398,17 +398,12 @@ technical analysis of the content itself, sting operations, keyboard taps, and other physical investigations.</p> - <p>If you have a complaint about child pornography, you may wish to report + <p>If you have a complaint about child abuse materials, you may wish to report it to the National Center for Missing and Exploited Children, which serves as a national coordination point for investigation of child pornography: <a href="http://www.missingkids.com/">http://www.missingkids.com/</a>. We do not view links you report.</p> - <p>The Tor Project also encourages the use of Tor by law enforcement in - the investigation, stings, and infiltration of child pornography rings. - Please contact us for information on Tor trainings. - </p> - <a id="LegalQuestions"></a> <h3><a class="anchor" href="#LegalQuestions">I have legal questions about Tor abuse.</a></h3>

1 0

r24568: {website} finally provide a more up-to-date tor intro video (website/trunk/docs/en)
by Roger Dingledine 05 Apr '11

05 Apr '11

Author: arma Date: 2011-04-05 20:47:58 +0000 (Tue, 05 Apr 2011) New Revision: 24568 Modified: website/trunk/docs/en/documentation.wml Log: finally provide a more up-to-date tor intro video Modified: website/trunk/docs/en/documentation.wml =================================================================== --- website/trunk/docs/en/documentation.wml 2011-04-05 20:43:54 UTC (rev 24567) +++ website/trunk/docs/en/documentation.wml 2011-04-05 20:47:58 UTC (rev 24568) @@ -83,12 +83,9 @@ </li> <li> - Download and watch Roger's overview talk from What The Hack (<a - href="http://freehaven.net/~arma/wth-anonymous-communication-58.mp4">video</a>, - <a href="http://freehaven.net/~arma/wth1.pdf">slides</a>, <a - href="http://wiki.whatthehack.org/index.php/Anonymous_communication_for_the_Unite…">abstract</a>). - This talk was given in July 2005, back when we were funded by EFF and back - when the network was quite small, but it still provides good background + Download and watch Roger's <a + href="https://media.torproject.org/video/tor-internet-days-2010.mp4">overview + talk from Internet Days in Sweden</a>, which provides good background on how Tor works and what it's for. </li>

1 0

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