tor-commits May 2014

tor-commits@lists.torproject.org

25 participants
1732 discussions

[tor/master] More hacking around spawn_func issues
by nickm＠torproject.org 01 May '14

01 May '14

commit 1ebdaf5788cb7969ee3f853ede4e6e3364343fc0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Feb 7 13:13:15 2014 -0500 More hacking around spawn_func issues This time, we use a pthread_attr to make sure that if pthread_create succeeds, the thread is successfully detached. This probably isn't the big thing going on with 4345, since it'd be a bit weird for pthread_detach to be failing. But it's worth getting it right. --- changes/bug4345 | 6 +++++- src/common/compat.c | 16 +++++++++++----- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/changes/bug4345 b/changes/bug4345 index 4975eea..5e650fc 100644 --- a/changes/bug4345 +++ b/changes/bug4345 @@ -1,6 +1,10 @@ o Minor bugfixes: - Check return code on spawn_func() in cpuworker code, so that we don't think we've spawned a nonworking cpuworker and write junk to it - forever. Fix for bug 4345; bugfix on all released Tor versions. + forever. Fix related to bug 4345; bugfix on all released Tor versions. Found by "skruffy". + - Use a pthread_attr to make sure that spawn_func() cannot return + an error while at the same time launching a thread. Fix related + to bug 4345; bugfix on all released Tor versions. Reported by + "cypherpunks". diff --git a/src/common/compat.c b/src/common/compat.c index d88c5f9..8a3655e 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -2248,6 +2248,12 @@ tor_pthread_helper_fn(void *_data) func(arg); return NULL; } +/** + * A pthread attribute to make threads start detached. + */ +static pthread_attr_t attr_detached; +/** True iff we've called tor_threads_init() */ +static int threads_initialized = 0; #endif /** Minimalist interface to run a void function in the background. On @@ -2271,12 +2277,12 @@ spawn_func(void (*func)(void *), void *data) #elif defined(USE_PTHREADS) pthread_t thread; tor_pthread_data_t *d; + if (PREDICT_UNLIKELY(!threads_initialized)) + tor_threads_init(); d = tor_malloc(sizeof(tor_pthread_data_t)); d->data = data; d->func = func; - if (pthread_create(&thread,NULL,tor_pthread_helper_fn,d)) - return -1; - if (pthread_detach(thread)) + if (pthread_create(&thread,&attr_detached,tor_pthread_helper_fn,d)) return -1; return 0; #else @@ -2633,8 +2639,6 @@ tor_get_thread_id(void) * "reentrant" mutexes (i.e., once we can re-lock if we're already holding * them.) */ static pthread_mutexattr_t attr_reentrant; -/** True iff we've called tor_threads_init() */ -static int threads_initialized = 0; /** Initialize <b>mutex</b> so it can be locked. Every mutex must be set * up with tor_mutex_init() or tor_mutex_new(); not both. */ void @@ -2778,6 +2782,8 @@ tor_threads_init(void) if (!threads_initialized) { pthread_mutexattr_init(&attr_reentrant); pthread_mutexattr_settype(&attr_reentrant, PTHREAD_MUTEX_RECURSIVE); + tor_assert(0==pthread_attr_init(&attr_detached)); + tor_assert(0==pthread_attr_setdetachstate(&attr_detached, 1)); threads_initialized = 1; set_main_thread(); }

1 0

[tor/master] Check spawn_func() return value
by nickm＠torproject.org 01 May '14

01 May '14

commit 85b46d57bcc40b8053dafe5d0ebb4b0bb611b484 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jan 17 12:04:53 2014 -0500 Check spawn_func() return value If we don't, we can wind up with a wedged cpuworker, and write to it for ages and ages. Found by skruffy. This was a bug in 2dda97e8fd898757, a.k.a. svn revision 402. It's been there since we have been using cpuworkers. --- changes/bug4345 | 6 ++++++ src/or/cpuworker.c | 7 ++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/changes/bug4345 b/changes/bug4345 new file mode 100644 index 0000000..4975eea --- /dev/null +++ b/changes/bug4345 @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Check return code on spawn_func() in cpuworker code, so that we don't + think we've spawned a nonworking cpuworker and write junk to it + forever. Fix for bug 4345; bugfix on all released Tor versions. + Found by "skruffy". + diff --git a/src/or/cpuworker.c b/src/or/cpuworker.c index ecf0d20..2f9f527 100644 --- a/src/or/cpuworker.c +++ b/src/or/cpuworker.c @@ -528,7 +528,12 @@ spawn_cpuworker(void) tor_assert(SOCKET_OK(fdarray[1])); fd = fdarray[0]; - spawn_func(cpuworker_main, (void*)fdarray); + if (spawn_func(cpuworker_main, (void*)fdarray) < 0) { + tor_close_socket(fdarray[0]); + tor_close_socket(fdarray[1]); + tor_free(fdarray); + return -1; + } log_debug(LD_OR,"just spawned a cpu worker."); #ifndef TOR_IS_MULTITHREADED tor_close_socket(fdarray[1]); /* don't need the worker's side of the pipe */

1 0

[tor/master] Merge remote-tracking branch 'public/bug4345a_024'
by nickm＠torproject.org 01 May '14

01 May '14

commit b6c8a14bf35c4572fba49be9eb4aaaa78d776c4c Merge: 1bbd381 1ebdaf5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 1 12:13:07 2014 -0400 Merge remote-tracking branch 'public/bug4345a_024' changes/bug4345 | 10 ++++++++++ src/common/compat.c | 16 +++++++++++----- src/or/cpuworker.c | 7 ++++++- 3 files changed, 27 insertions(+), 6 deletions(-)

1 0

[tor/master] Remove TunnelDirConns and PreferTunnelledDirConns
by nickm＠torproject.org 01 May '14

01 May '14

commit ce450bddb7b66e73e34eec3844623884cbbcc27c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Feb 11 11:10:55 2014 -0500 Remove TunnelDirConns and PreferTunnelledDirConns These options were added back in 0.1.2.5-alpha, but no longer make any sense now that all directories support tunneled connections and BEGIN_DIR cells. These options were on by default; now they are always-on. This is a fix for 10849, where TunnelDirConns 0 would break hidden services -- and that bug arrived, I think, in 0.2.0.10-alpha. --- changes/bug10849_025 | 6 ++++++ doc/tor.1.txt | 9 --------- src/or/config.c | 15 ++------------- src/or/directory.c | 6 +----- src/or/entrynodes.c | 2 +- src/or/or.h | 6 ------ src/or/routerlist.c | 17 +++-------------- 7 files changed, 13 insertions(+), 48 deletions(-) diff --git a/changes/bug10849_025 b/changes/bug10849_025 new file mode 100644 index 0000000..1a3b71b --- /dev/null +++ b/changes/bug10849_025 @@ -0,0 +1,6 @@ + o Removed code: + - The TunnelDirConns and PreferTunnelledDirConns options no longer + exist; tunneled directory connections have been available since + 0.1.2.5-alpha, and turning them off is not a good idea. This is a + brute-force fix for 10849, where "TunnelDirConns 0" would break + hidden services. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index ee1e086..f168a2f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -584,15 +584,6 @@ GENERAL OPTIONS This is useful when running on flash memory or other media that support only a limited number of writes. (Default: 0) -[[TunnelDirConns]] **TunnelDirConns** **0**|**1**:: - If non-zero, when a directory server we contact supports it, we will build - a one-hop circuit and make an encrypted connection via its ORPort. - (Default: 1) - -[[PreferTunneledDirConns]] **PreferTunneledDirConns** **0**|**1**:: - If non-zero, we will avoid directory servers that don't support tunneled - directory connections, when possible. (Default: 1) - [[CircuitPriorityHalflife]] **CircuitPriorityHalflife** __NUM1__:: If this value is set, we override the default algorithm for choosing which circuit's cell to deliver or relay next. When the value is 0, we diff --git a/src/or/config.c b/src/or/config.c index e7847d5..834a0ce 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -354,7 +354,7 @@ static config_var_t option_vars_[] = { V(OptimisticData, AUTOBOOL, "auto"), V(PortForwarding, BOOL, "0"), V(PortForwardingHelper, FILENAME, "tor-fw-helper"), - V(PreferTunneledDirConns, BOOL, "1"), + OBSOLETE("PreferTunneledDirConns"), V(ProtocolWarnings, BOOL, "0"), V(PublishServerDescriptor, CSV, "1"), V(PublishHidServDescriptors, BOOL, "1"), @@ -409,7 +409,7 @@ static config_var_t option_vars_[] = { V(TransListenAddress, LINELIST, NULL), VPORT(TransPort, LINELIST, NULL), V(TransProxyType, STRING, "default"), - V(TunnelDirConns, BOOL, "1"), + OBSOLETE("TunnelDirConns"), V(UpdateBridgesFromAuthority, BOOL, "0"), V(UseBridges, BOOL, "0"), V(UseEntryGuards, BOOL, "1"), @@ -3213,8 +3213,6 @@ options_validate(or_options_t *old_options, or_options_t *options, if (options->UseBridges && !options->Bridges) REJECT("If you set UseBridges, you must specify at least one bridge."); - if (options->UseBridges && !options->TunnelDirConns) - REJECT("If you set UseBridges, you must set TunnelDirConns."); for (cl = options->Bridges; cl; cl = cl->next) { bridge_line_t *bridge_line = parse_bridge_line(cl->value); @@ -3338,15 +3336,6 @@ options_validate(or_options_t *old_options, or_options_t *options, AF_INET6, 1, msg)<0) return -1; - if (options->PreferTunneledDirConns && !options->TunnelDirConns) - REJECT("Must set TunnelDirConns if PreferTunneledDirConns is set."); - - if ((options->Socks4Proxy || options->Socks5Proxy) && - !options->HTTPProxy && !options->PreferTunneledDirConns) - REJECT("When Socks4Proxy or Socks5Proxy is configured, " - "PreferTunneledDirConns and TunnelDirConns must both be " - "set to 1, or HTTPProxy must be configured."); - if (options->AutomapHostsSuffixes) { SMARTLIST_FOREACH(options->AutomapHostsSuffixes, char *, suf, { diff --git a/src/or/directory.c b/src/or/directory.c index fd4e796..5d205c5 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -347,8 +347,6 @@ should_use_directory_guards(const or_options_t *options) if (options->DownloadExtraInfo || options->FetchDirInfoEarly || options->FetchDirInfoExtraEarly || options->FetchUselessDescriptors) return 0; - if (! options->PreferTunneledDirConns) - return 0; return 1; } @@ -860,6 +858,7 @@ directory_command_should_use_begindir(const or_options_t *options, int or_port, uint8_t router_purpose, dir_indirection_t indirection) { + (void) router_purpose; if (!or_port) return 0; /* We don't know an ORPort -- no chance. */ if (indirection == DIRIND_DIRECT_CONN || indirection == DIRIND_ANON_DIRPORT) @@ -868,9 +867,6 @@ directory_command_should_use_begindir(const or_options_t *options, if (!fascist_firewall_allows_address_or(addr, or_port) || directory_fetches_from_authorities(options)) return 0; /* We're firewalled or are acting like a relay -- also no. */ - if (!options->TunnelDirConns && - router_purpose != ROUTER_PURPOSE_BRIDGE) - return 0; /* We prefer to avoid using begindir conns. Fine. */ return 1; } diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index d463303..d626032 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -376,7 +376,7 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, } else { const routerstatus_t *rs; rs = router_pick_directory_server(MICRODESC_DIRINFO|V3_DIRINFO, - PDS_PREFER_TUNNELED_DIR_CONNS_|PDS_FOR_GUARD); + PDS_FOR_GUARD); if (!rs) return NULL; node = node_get_by_id(rs->identity_digest); diff --git a/src/or/or.h b/src/or/or.h index b63b1ff..63b8e9c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -3897,10 +3897,6 @@ typedef struct { * testing our DNS server. */ int EnforceDistinctSubnets; /**< If true, don't allow multiple routers in the * same network zone in the same circuit. */ - int TunnelDirConns; /**< If true, use BEGIN_DIR rather than BEGIN when - * possible. */ - int PreferTunneledDirConns; /**< If true, avoid dirservers that don't - * support BEGIN_DIR, when possible. */ int PortForwarding; /**< If true, use NAT-PMP or UPnP to automatically * forward the DirPort and ORPort on the NAT device */ char *PortForwardingHelper; /** < Filename or full path of the port @@ -4984,8 +4980,6 @@ typedef struct dir_server_t { * node that's currently a guard. */ #define PDS_FOR_GUARD (1<<5) -#define PDS_PREFER_TUNNELED_DIR_CONNS_ (1<<16) - /** Possible ways to weight routers when choosing one randomly. See * routerlist_sl_choose_by_bandwidth() for more information.*/ typedef enum bandwidth_weight_rule_t { diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 164b32d..f4c4d48 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1250,8 +1250,6 @@ const routerstatus_t * router_pick_directory_server(dirinfo_type_t type, int flags) { const routerstatus_t *choice; - if (get_options()->PreferTunneledDirConns) - flags |= PDS_PREFER_TUNNELED_DIR_CONNS_; if (!routerlist) return NULL; @@ -1385,8 +1383,6 @@ router_pick_dirserver_generic(smartlist_t *sourcelist, { const routerstatus_t *choice; int busy = 0; - if (get_options()->PreferTunneledDirConns) - flags |= PDS_PREFER_TUNNELED_DIR_CONNS_; choice = router_pick_trusteddirserver_impl(sourcelist, type, flags, &busy); if (choice || !(flags & PDS_RETRY_IF_NO_SERVERS)) @@ -1411,10 +1407,7 @@ router_pick_dirserver_generic(smartlist_t *sourcelist, /** Pick a random running valid directory server/mirror from our * routerlist. Arguments are as for router_pick_directory_server(), except - * that RETRY_IF_NO_SERVERS is ignored, and: - * - * If the PDS_PREFER_TUNNELED_DIR_CONNS_ flag is set, prefer directory servers - * that we can use with BEGINDIR. + * that RETRY_IF_NO_SERVERS is ignored. */ static const routerstatus_t * router_pick_directory_server_impl(dirinfo_type_t type, int flags) @@ -1428,7 +1421,6 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags) const networkstatus_t *consensus = networkstatus_get_latest_consensus(); int requireother = ! (flags & PDS_ALLOW_SELF); int fascistfirewall = ! (flags & PDS_IGNORE_FASCISTFIREWALL); - int prefer_tunnel = (flags & PDS_PREFER_TUNNELED_DIR_CONNS_); int for_guard = (flags & PDS_FOR_GUARD); int try_excluding = 1, n_excluded = 0; @@ -1481,8 +1473,7 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags) is_overloaded = status->last_dir_503_at + DIR_503_TIMEOUT > now; - if (prefer_tunnel && - (!fascistfirewall || + if ((!fascistfirewall || fascist_firewall_allows_address_or(&addr, status->or_port))) smartlist_add(is_trusted ? trusted_tunnel : is_overloaded ? overloaded_tunnel : tunnel, (void*)node); @@ -1569,7 +1560,6 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, time_t now = time(NULL); const int requireother = ! (flags & PDS_ALLOW_SELF); const int fascistfirewall = ! (flags & PDS_IGNORE_FASCISTFIREWALL); - const int prefer_tunnel = (flags & PDS_PREFER_TUNNELED_DIR_CONNS_); const int no_serverdesc_fetching =(flags & PDS_NO_EXISTING_SERVERDESC_FETCH); const int no_microdesc_fetching =(flags & PDS_NO_EXISTING_MICRODESC_FETCH); const double auth_weight = (sourcelist == fallback_dir_servers) ? @@ -1630,8 +1620,7 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, } } - if (prefer_tunnel && - d->or_port && + if (d->or_port && (!fascistfirewall || fascist_firewall_allows_address_or(&addr, d->or_port))) smartlist_add(is_overloaded ? overloaded_tunnel : tunnel, (void*)d);

1 0

[tor/master] Merge remote-tracking branch 'public/bug10849_025'
by nickm＠torproject.org 01 May '14

01 May '14

commit 1bbd3811c1c98e6a630ab96f15a376910a576626 Merge: 9da17ad ce450bd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 1 11:51:22 2014 -0400 Merge remote-tracking branch 'public/bug10849_025' Conflicts: src/or/config.c changes/bug10849_025 | 6 ++++++ doc/tor.1.txt | 9 --------- src/or/config.c | 19 ++----------------- src/or/directory.c | 6 +----- src/or/entrynodes.c | 2 +- src/or/or.h | 6 ------ src/or/routerlist.c | 17 +++-------------- 7 files changed, 13 insertions(+), 52 deletions(-)

1 0

[tor/master] Downgrade bug 7164 warning to INFO
by nickm＠torproject.org 01 May '14

01 May '14

commit 6a4f5d9b4df1d05d1b158417cfcc85a547ad1549 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 1 11:42:02 2014 -0400 Downgrade bug 7164 warning to INFO The 0.2.5.x warning is the one that might help us track this down; the warnings in stable are just annoying users over and over and over. --- changes/bug7164_downgrade | 6 ++++++ src/or/microdesc.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/changes/bug7164_downgrade b/changes/bug7164_downgrade new file mode 100644 index 0000000..4d75586 --- /dev/null +++ b/changes/bug7164_downgrade @@ -0,0 +1,6 @@ + o Minor bugfixes: + - Downgrade the warning severity for the the "md was still referenced 1 + node(s)" warning. Tor 0.2.5.4-alpha has better code for trying to + diagnose this bug, and the current warning in earlier versions of + tor achieves nothing useful. Addresses warning from bug 7164. + diff --git a/src/or/microdesc.c b/src/or/microdesc.c index b4d22c1..4acec6a 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -561,7 +561,7 @@ microdesc_free(microdesc_t *md) } }); if (found) { - log_warn(LD_BUG, "microdesc_free() called, but md was still referenced " + log_info(LD_BUG, "microdesc_free() called, but md was still referenced " "%d node(s); held_by_nodes == %u", found, md->held_by_nodes); } else { log_warn(LD_BUG, "microdesc_free() called with held_by_nodes set to %u, "

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 01 May '14

01 May '14

commit 14bc6e8993c694702f5ab637c36b962f396660a5 Merge: efab348 6a4f5d9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 1 11:44:25 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 Conflicts: src/or/microdesc.c changes/bug7164_downgrade | 6 ++++++ src/or/microdesc.c | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --cc src/or/microdesc.c index 90ac0ac,4acec6a..0e72c0b --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@@ -614,13 -561,11 +614,13 @@@ microdesc_free_(microdesc_t *md, const } }); if (found) { - log_warn(LD_BUG, "microdesc_free() called from %s:%d, but md was still " - log_info(LD_BUG, "microdesc_free() called, but md was still referenced " - "%d node(s); held_by_nodes == %u", found, md->held_by_nodes); ++ log_info(LD_BUG, "microdesc_free() called from %s:%d, but md was still " + "referenced %d node(s); held_by_nodes == %u", + fname, lineno, found, md->held_by_nodes); } else { - log_warn(LD_BUG, "microdesc_free() called with held_by_nodes set to %u, " - "but md was not referenced by any nodes", md->held_by_nodes); + log_warn(LD_BUG, "microdesc_free() called from %s:%d with held_by_nodes " + "set to %u, but md was not referenced by any nodes", + fname, lineno, md->held_by_nodes); } tor_fragile_assert(); }

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'
by nickm＠torproject.org 01 May '14

01 May '14

commit 9da17ad410b0b510c2e8cdaa2168fd020f3dc8c2 Merge: 01e2aae 14bc6e8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 1 11:45:38 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' (this is an "ours" merge, to avoid taking 6a4f5d9b4d into 0.2.5: that commit downgrades the bug 7164 warning in versions <= 0.2.4 because it isn't as useful as the one 0.2.5 has)

1 0

[tor/maint-0.2.4] Downgrade bug 7164 warning to INFO
by nickm＠torproject.org 01 May '14

01 May '14

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by nickm＠torproject.org 01 May '14

01 May '14

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits May 2014