September 2012 - tor-commits - lists.torproject.org

[tor/master] Fix tab introduced in f43946829ce037
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit cb8f64cdc80195af4c62c17db1dabebbd48b0ec1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:22:40 2012 -0400 Fix tab introduced in f43946829ce037 --- src/or/config.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index f38e686..8f79c44 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -7310,7 +7310,7 @@ getinfo_helper_config(control_connection_t *conn, const char *type; /* don't tell controller about triple-underscore options */ if (!strncmp(_option_vars[i].name, "___", 3)) - continue; + continue; switch (var->type) { case CONFIG_TYPE_STRING: type = "String"; break; case CONFIG_TYPE_FILENAME: type = "Filename"; break;

1 0

[tor/master] rename _UsingTestNetworkDefaults to start with triple-underscore
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 65838f48832df8c5c4333358106e86b5db38899f Author: meejah <meejah(a)meejah.ca> Date: Sun Mar 18 23:59:13 2012 -0600 rename _UsingTestNetworkDefaults to start with triple-underscore --- src/or/config.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 61fd993..6ee1ce0 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -459,7 +459,7 @@ static config_var_t _option_vars[] = { VAR("__OwningControllerProcess",STRING,OwningControllerProcess, NULL), V(MinUptimeHidServDirectoryV2, INTERVAL, "25 hours"), V(VoteOnHidServDirectoriesV2, BOOL, "1"), - V(_UsingTestNetworkDefaults, BOOL, "0"), + VAR("___UsingTestNetworkDefaults", BOOL, _UsingTestNetworkDefaults, "0"), { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL } }; @@ -487,7 +487,7 @@ static const config_var_t testing_tor_network_defaults[] = { V(TestingAuthDirTimeToLearnReachability, INTERVAL, "0 minutes"), V(TestingEstimatedDescriptorPropagationTime, INTERVAL, "0 minutes"), V(MinUptimeHidServDirectoryV2, INTERVAL, "0 minutes"), - V(_UsingTestNetworkDefaults, BOOL, "1"), + VAR("___UsingTestNetworkDefaults", BOOL, _UsingTestNetworkDefaults, "1"), { NULL, CONFIG_TYPE_OBSOLETE, 0, NULL } };

1 0

[tor/master] Hide options beginning with "___" from GETINFO config/names
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit f43946829ce037462fd9dd852553ccfe86c88d01 Author: meejah <meejah(a)meejah.ca> Date: Mon Mar 19 00:00:10 2012 -0600 Hide options beginning with "___" from GETINFO config/names --- src/or/config.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 6ee1ce0..78f8659 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -7307,6 +7307,9 @@ getinfo_helper_config(control_connection_t *conn, for (i = 0; _option_vars[i].name; ++i) { const config_var_t *var = &_option_vars[i]; const char *type; + /* don't tell controller about triple-underscore options */ + if (!strncmp(_option_vars[i].name, "___", 3)) + continue; switch (var->type) { case CONFIG_TYPE_STRING: type = "String"; break; case CONFIG_TYPE_FILENAME: type = "Filename"; break;

1 0

[tor/master] bug3155 changes file
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 38f3f3baf9e2e2e76b804afa635f94fb466babc8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:04:30 2012 -0400 bug3155 changes file --- changes/bug3155 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug3155 b/changes/bug3155 new file mode 100644 index 0000000..a0ebd53 --- /dev/null +++ b/changes/bug3155 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - Rename the (internal-use-only) UsingTestingNetworkDefaults option + to start with a triple-underscore so the controller won't touch it. + Patch by Meejah. Fixes bug 3155. Bugfix on 0.2.2.23-alpha.

1 0

[tor/master] Rename _UseFilteringSSLBufferevents to lose its _. Bug 3155
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 20e0e7d9d128af80c1af3b8b83214236387ba88f Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:09:19 2012 -0400 Rename _UseFilteringSSLBufferevents to lose its _. Bug 3155 --- changes/bug3155 | 2 ++ src/or/config.c | 3 ++- src/or/connection_or.c | 2 +- src/or/or.h | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/changes/bug3155 b/changes/bug3155 index a0ebd53..d2e0918 100644 --- a/changes/bug3155 +++ b/changes/bug3155 @@ -2,3 +2,5 @@ - Rename the (internal-use-only) UsingTestingNetworkDefaults option to start with a triple-underscore so the controller won't touch it. Patch by Meejah. Fixes bug 3155. Bugfix on 0.2.2.23-alpha. + - Rename the (testing-use-only) _UseFilteringSSLBufferevents option + so it doesn't start with _. Fixes bug3155. Bugfix on 0.2.3.1-alpha. diff --git a/src/or/config.c b/src/or/config.c index 78f8659..f38e686 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -130,6 +130,7 @@ static config_abbrev_t _option_abbrevs[] = { { "HashedControlPassword", "__HashedControlSessionPassword", 1, 0}, { "StrictEntryNodes", "StrictNodes", 0, 1}, { "StrictExitNodes", "StrictNodes", 0, 1}, + { "_UseFilteringSSLBufferevents", "UseFilteringSSLBufferevents", 0, 1}, { NULL, NULL, 0, 0}, }; @@ -449,7 +450,7 @@ static config_var_t _option_vars[] = { VAR("VersioningAuthoritativeDirectory",BOOL,VersioningAuthoritativeDir, "0"), V(VirtualAddrNetwork, STRING, "127.192.0.0/10"), V(WarnPlaintextPorts, CSV, "23,109,110,143"), - V(_UseFilteringSSLBufferevents, BOOL, "0"), + V(UseFilteringSSLBufferevents, BOOL, "0"), VAR("__ReloadTorrcOnSIGHUP", BOOL, ReloadTorrcOnSIGHUP, "1"), VAR("__AllDirActionsPrivate", BOOL, AllDirActionsPrivate, "0"), VAR("__DisablePredictedCircuits",BOOL,DisablePredictedCircuits, "0"), diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 5a3b620..02345f9 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1152,7 +1152,7 @@ connection_tls_start_handshake(or_connection_t *conn, int receiving) #ifdef USE_BUFFEREVENTS if (connection_type_uses_bufferevent(TO_CONN(conn))) { - const int filtering = get_options()->_UseFilteringSSLBufferevents; + const int filtering = get_options()->UseFilteringSSLBufferevents; struct bufferevent *b = tor_tls_init_bufferevent(conn->tls, conn->_base.bufev, conn->_base.s, receiving, filtering); diff --git a/src/or/or.h b/src/or/or.h index 3609d32..ec27184 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3578,8 +3578,8 @@ typedef struct { /** If true, do not enable IOCP on windows with bufferevents, even if * we think we could. */ int DisableIOCP; - /** For testing only: will go away in 0.2.3.x. */ - int _UseFilteringSSLBufferevents; + /** For testing only: will go away eventually. */ + int UseFilteringSSLBufferevents; /** Set to true if the TestingTorNetwork configuration option is set. * This is used so that options_validate() has a chance to realize that

1 0

[tor/master] Merge branch 'bug3155'
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit 344bb1d64c539ca66cd377350065e9486397d1eb Merge: e1e34ee 20e0e7d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 10 10:09:29 2012 -0400 Merge branch 'bug3155' changes/bug3155 | 6 ++++++ src/or/config.c | 10 +++++++--- src/or/connection_or.c | 2 +- src/or/or.h | 4 ++-- 4 files changed, 16 insertions(+), 6 deletions(-)

1 0

[tor/master] raise bandwidthrate/bandwidthburst to a new "infinite"
by nickm＠torproject.org 10 Sep '12

10 Sep '12

commit e1e34ee4e409b044eed3164a20f388a2d3580fd6 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Sep 10 03:03:06 2012 -0400 raise bandwidthrate/bandwidthburst to a new "infinite" addresses bug 6605. --- changes/bug6605 | 7 +++++++ doc/tor.1.txt | 4 ++-- src/or/config.c | 4 ++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/changes/bug6605 b/changes/bug6605 new file mode 100644 index 0000000..92fac19 --- /dev/null +++ b/changes/bug6605 @@ -0,0 +1,7 @@ + o Major bugfixes: + - Raise the default BandwidthRate/BandwidthBurst values from 1MB/5MB + to 1GB/1GB. The previous defaults were intended to be "basically + infinite", but it turns out they're now limiting our 100mbit+ + relays and bridges. Fixes bug 6605; bugfix on 0.2.0.10-alpha (the + last time we raised it). + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index cae9bf3..cf5945d 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -129,11 +129,11 @@ GENERAL OPTIONS the specified number of bytes per second, and the average outgoing bandwidth usage to that same value. If you want to run a relay in the public network, this needs to be _at the very least_ 30 KB (that is, - 30720 bytes). (Default: 5 MB) + 30720 bytes). (Default: 1 GB) **BandwidthBurst** __N__ **bytes**|**KB**|**MB**|**GB**:: Limit the maximum token bucket size (also known as the burst) to the given - number of bytes in each direction. (Default: 10 MB) + number of bytes in each direction. (Default: 1 GB) **MaxAdvertisedBandwidth** __N__ **bytes**|**KB**|**MB**|**GB**:: If set, we will not advertise more than this amount of bandwidth for our diff --git a/src/or/config.c b/src/or/config.c index 7dd4539..61fd993 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -209,8 +209,8 @@ static config_var_t _option_vars[] = { V(AutomapHostsOnResolve, BOOL, "0"), V(AutomapHostsSuffixes, CSV, ".onion,.exit"), V(AvoidDiskWrites, BOOL, "0"), - V(BandwidthBurst, MEMUNIT, "10 MB"), - V(BandwidthRate, MEMUNIT, "5 MB"), + V(BandwidthBurst, MEMUNIT, "1 GB"), + V(BandwidthRate, MEMUNIT, "1 GB"), V(BridgeAuthoritativeDir, BOOL, "0"), VAR("Bridge", LINELIST, Bridges, NULL), V(BridgePassword, STRING, NULL),

1 0

[compass/master] Factor out filter inversion into its own filter class
by karsten＠torproject.org 10 Sep '12

10 Sep '12

commit 548ce6e7277bd4bb4abcb44132ff9dc6782043a1 Author: delber <delber(a)riseup.net> Date: Sun Sep 9 13:37:49 2012 +0000 Factor out filter inversion into its own filter class --- compass.py | 33 ++++++++++++++++++--------------- 1 files changed, 18 insertions(+), 15 deletions(-) diff --git a/compass.py b/compass.py index 9d5656d..7afcd62 100755 --- a/compass.py +++ b/compass.py @@ -93,12 +93,11 @@ class FastExitFilter(BaseFilter): self.fp = relay.get('fingerprint') self.relay = relay - def __init__(self, bandwidth_rate, advertised_bandwidth, ports, same_network, inverse=False): + def __init__(self, bandwidth_rate, advertised_bandwidth, ports, same_network): self.bandwidth_rate = bandwidth_rate self.advertised_bandwidth = advertised_bandwidth self.ports = ports self.same_network = same_network - self.inverse = inverse def load(self, all_relays): # First, filter relays based on bandwidth and port requirements. @@ -164,15 +163,19 @@ class FastExitFilter(BaseFilter): matching_relays = [] for relay_list in network_data.values(): matching_relays.extend([relay.relay for relay in relay_list]) - # Either return relays meeting all requirements, or the inverse set. - if self.inverse: - inverse_relays = [] - for relay in all_relays: - if relay not in matching_relays: - inverse_relays.append(relay) - return inverse_relays - else: - return matching_relays + return matching_relays + +class InverseFilter(BaseFilter): + def __init__(self, orig_filter): + self.orig_filter = orig_filter + + def load(self, all_relays): + matching_relays = self.orig_filter.load(all_relays) + inverse_relays = [] + for relay in all_relays: + if relay not in matching_relays: + inverse_relays.append(relay) + return inverse_relays class RelayStats(object): def __init__(self, options): @@ -214,12 +217,12 @@ class RelayStats(object): if options.guards_only: filters.append(GuardFilter()) if options.fast_exits_only: - filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, same_network=True, inverse=False)) + filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, same_network=True)) if options.almost_fast_exits_only: - filters.append(FastExitFilter(ALMOST_FAST_EXIT_BANDWIDTH_RATE, ALMOST_FAST_EXIT_ADVERTISED_BANDWIDTH, ALMOST_FAST_EXIT_PORTS, same_network=False, inverse=False)) - filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, same_network=True, inverse=True)) + filters.append(FastExitFilter(ALMOST_FAST_EXIT_BANDWIDTH_RATE, ALMOST_FAST_EXIT_ADVERTISED_BANDWIDTH, ALMOST_FAST_EXIT_PORTS, same_network=False)) + filters.append(InverseFilter(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, same_network=True))) if options.fast_exits_only_any_network: - filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, same_network=False, inverse=False)) + filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, same_network=False)) return filters def _get_group_function(self, options):

1 0

[compass/master] Use constants for 'fast exits' and 'almost fast exits' requirements
by karsten＠torproject.org 10 Sep '12

10 Sep '12

commit 096890bb8c8222ecfbe44da175dc5dc04384504d Author: delber <delber(a)riseup.net> Date: Sun Sep 9 13:10:15 2012 +0000 Use constants for 'fast exits' and 'almost fast exits' requirements --- compass.py | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/compass.py b/compass.py index 8b00bf6..bfb1e51 100755 --- a/compass.py +++ b/compass.py @@ -6,6 +6,14 @@ # To Public License, Version 2, as published by Sam Hocevar. See # http://sam.zoy.org/wtfpl/COPYING for more details. +FAST_EXIT_BANDWIDTH_RATE = 95 * 125 * 1024 # 95 Mbit/s +FAST_EXIT_ADVERTISED_BANDWIDTH = 5000 * 1024 # 5000 kB/s +FAST_EXIT_PORTS = [80, 443, 554, 1755] + +ALMOST_FAST_EXIT_BANDWIDTH_RATE = 80 * 125 * 1024 # 80 Mbit/s +ALMOST_FAST_EXIT_ADVERTISED_BANDWIDTH = 2000 * 1024 # 2000 kB/s +ALMOST_FAST_EXIT_PORTS = [80, 443] + import json import operator import sys @@ -206,12 +214,12 @@ class RelayStats(object): if options.guards_only: filters.append(GuardFilter()) if options.fast_exits_only: - filters.append(FastExitFilter(95 * 125 * 1024, 5000 * 1024, [80, 443, 554, 1755], True, False)) + filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, True, False)) if options.almost_fast_exits_only: - filters.append(FastExitFilter(80 * 125 * 1024, 2000 * 1024, [80, 443], False, False)) - filters.append(FastExitFilter(95 * 125 * 1024, 5000 * 1024, [80, 443, 554, 1755], True, True)) + filters.append(FastExitFilter(ALMOST_FAST_EXIT_BANDWIDTH_RATE, ALMOST_FAST_EXIT_ADVERTISED_BANDWIDTH, ALMOST_FAST_EXIT_PORTS, False, False)) + filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, True, True)) if options.fast_exits_only_any_network: - filters.append(FastExitFilter(95 * 125 * 1024, 5000 * 1024, [80, 443, 554, 1755], False, False)) + filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, False, False)) return filters def _get_group_function(self, options): @@ -341,11 +349,20 @@ def create_option_parser(): group.add_option("-g", "--guards-only", action="store_true", help="select only relays suitable for guard position") group.add_option("--fast-exits-only", action="store_true", - help="select only fast exits (95+ Mbit/s, 5000+ KB/s, 80/443/554/1755, 2- per /24)") + help="select only fast exits (%d+ Mbit/s, %d+ KB/s, %s, 2- per /24)" % + (FAST_EXIT_BANDWIDTH_RATE / (125 * 1024), + FAST_EXIT_ADVERTISED_BANDWIDTH / 1024, + '/'.join(map(str, FAST_EXIT_PORTS)))) group.add_option("--almost-fast-exits-only", action="store_true", - help="select only almost fast exits (80+ Mbit/s, 2000+ KB/s, 80/443, not in set of fast exits)") + help="select only almost fast exits (%d+ Mbit/s, %d+ KB/s, %s, not in set of fast exits)" % + (ALMOST_FAST_EXIT_BANDWIDTH_RATE / (125 * 1024), + ALMOST_FAST_EXIT_ADVERTISED_BANDWIDTH / 1024, + '/'.join(map(str, ALMOST_FAST_EXIT_PORTS)))) group.add_option("--fast-exits-only-any-network", action="store_true", - help="select only fast exits without network restriction (95+ Mbit/s, 5000+ KB/s, 80/443/554/1755") + help="select only fast exits without network restriction (%d+ Mbit/s, %d+ KB/s, %s)" % + (FAST_EXIT_BANDWIDTH_RATE / (125 * 1024), + FAST_EXIT_ADVERTISED_BANDWIDTH / 1024, + '/'.join(map(str, FAST_EXIT_PORTS)))) parser.add_option_group(group) group = OptionGroup(parser, "Grouping options") group.add_option("-A", "--by-as", action="store_true", default=False,

1 0

[compass/master] Improve readability in _create_filters by using keyword arguments
by karsten＠torproject.org 10 Sep '12

10 Sep '12

commit 549cf6258a7528ff50e0c410c01491cf3be439d0 Author: delber <delber(a)riseup.net> Date: Sun Sep 9 13:28:33 2012 +0000 Improve readability in _create_filters by using keyword arguments --- compass.py | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/compass.py b/compass.py index bfb1e51..9d5656d 100755 --- a/compass.py +++ b/compass.py @@ -214,12 +214,12 @@ class RelayStats(object): if options.guards_only: filters.append(GuardFilter()) if options.fast_exits_only: - filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, True, False)) + filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, same_network=True, inverse=False)) if options.almost_fast_exits_only: - filters.append(FastExitFilter(ALMOST_FAST_EXIT_BANDWIDTH_RATE, ALMOST_FAST_EXIT_ADVERTISED_BANDWIDTH, ALMOST_FAST_EXIT_PORTS, False, False)) - filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, True, True)) + filters.append(FastExitFilter(ALMOST_FAST_EXIT_BANDWIDTH_RATE, ALMOST_FAST_EXIT_ADVERTISED_BANDWIDTH, ALMOST_FAST_EXIT_PORTS, same_network=False, inverse=False)) + filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, same_network=True, inverse=True)) if options.fast_exits_only_any_network: - filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, False, False)) + filters.append(FastExitFilter(FAST_EXIT_BANDWIDTH_RATE, FAST_EXIT_ADVERTISED_BANDWIDTH, FAST_EXIT_PORTS, same_network=False, inverse=False)) return filters def _get_group_function(self, options):

1 0