April 2014 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'bug11156_issue2_squashed'
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit 830492fbdaef92ecf82c5bfde9373a2a2d9157d3 Merge: 9fb86c8 29c28d3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 23 11:05:54 2014 -0400 Merge branch 'bug11156_issue2_squashed' changes/bug11156 | 5 ++++ src/or/config.c | 6 +++++ src/or/transports.c | 63 +++++++++++++++++++++++++++------------------------ src/or/transports.h | 2 +- 4 files changed, 46 insertions(+), 30 deletions(-)

1 0

[tor/master] Slightly improve the documentation of src/or/transports.c
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit 29c28d312cc1d14cafe73f7f8fc64272123ae04e Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Apr 8 17:19:51 2014 +0100 Slightly improve the documentation of src/or/transports.c Make it clear that a SIGHUP is not the only action that can cause a config re-read. --- src/or/transports.c | 33 +++++++++++++++++++-------------- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/src/or/transports.c b/src/or/transports.c index 6f478bc..dc30754 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -51,35 +51,37 @@ * logic, because of race conditions that can cause dangling * pointers. ] * - * In even more detail, this is what happens when a SIGHUP - * occurs: + * In even more detail, this is what happens when a config read + * (like a SIGHUP or a SETCONF) occurs: * * We immediately destroy all unconfigured proxies (We shouldn't have - * unconfigured proxies in the first place, except when SIGHUP rings - * immediately after tor is launched.). + * unconfigured proxies in the first place, except when the config + * read happens immediately after tor is launched.). * * We mark all managed proxies and transports to signify that they * must be removed if they don't contribute by the new torrc * (we mark using the marked_for_removal element). * We also mark all managed proxies to signify that they might need to * be restarted so that they end up supporting all the transports the - * new torrc wants them to support (using the got_hup element). + * new torrc wants them to support + * (we mark using the was_around_before_config_read element). * We also clear their transports_to_launch list so that we can * put there the transports we need to launch according to the new * torrc. * * We then start parsing torrc again. * - * Everytime we encounter a transport line using a known pre-SIGHUP - * managed proxy, we cleanse that proxy from the removal mark. - * We also mark it as unconfigured so that on the next scheduled - * events tick, we investigate whether we need to restart the proxy - * so that it also spawns the new transports. - * If the post-SIGHUP transports_to_launch list is identical to - * the pre-SIGHUP one, it means that no changes were introduced to - * this proxy during the SIGHUP and no restart has to take place. + * Everytime we encounter a transport line using a managed proxy that + * was around before the config read, we cleanse that proxy from the + * removal mark. We also toggle the check_if_restarts_needed + * flag, so that on the next pt_configure_remaining_proxies + * tick, we investigate whether we need to restart the proxy so that + * it also spawns the new transports. If the post-config-read + * transports_to_launch list is identical to the pre-config-read + * one, it means that no changes were introduced to this proxy during + * the config read and no restart has to take place. * - * During the post-SIGHUP torrc parsing, we unmark all transports + * During the post-config-read torrc parsing, we unmark all transports * spawned by managed proxies that we find in our torrc. * We do that so that if we don't need to restart a managed proxy, we * can continue using its old transports normally. @@ -1375,6 +1377,9 @@ pt_kickstart_proxy(const smartlist_t *transport_list, check_if_restarts_needed = 1; } + /* For each new transport, check if the managed proxy used to + support it before the SIGHUP. If that was the case, make sure + it doesn't get removed because we might reuse it. */ SMARTLIST_FOREACH_BEGIN(transport_list, const char *, transport) { old_transport = transport_get_by_name(transport); if (old_transport)

1 0

[tor/master] Update ns downloads when we receive a bridge descriptor
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit db72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 10 15:01:27 2014 -0400 Update ns downloads when we receive a bridge descriptor This prevents long stalls when we're starting with a state file but with no bridge descriptors. Fixes bug 9229. I believe this bug has been present since 0.2.0.3-alpha. --- changes/bug9229 | 5 +++++ src/or/entrynodes.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug9229 b/changes/bug9229 new file mode 100644 index 0000000..ad7fd22 --- /dev/null +++ b/changes/bug9229 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Avoid 60-second delays in the bootstrapping process when Tor + is launching for a second time while using bridges. Fixes bug 9229; + bugfix on 0.2.0.3-alpha. + diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 2aa063c..59770fa 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -2115,8 +2115,12 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) * our entry node list */ entry_guard_register_connect_status(ri->cache_info.identity_digest, 1, 0, now); - if (first) + if (first) { + /* XXXX apparently, this is never called. See bug #9229. */ routerlist_retry_directory_downloads(now); + } + + update_networkstatus_downloads(now); } } }

1 0

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

23 Apr '14

commit 9fb86c82da9afff11b05783777dc83f80b835178 Merge: 7b4b137 9e44df2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 23 11:04:10 2014 -0400 Merge remote-tracking branch 'origin/maint-0.2.4' This is an "ours" merge, to avoid taking the 0.2.4 version of the

1 0

[tor/master] Merge remote-tracking branch 'public/bug9229_024' into maint-0.2.4
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit 9e44df2c98208fc6d0c3e9f9b3834f54e8a37cd8 Merge: 3fc0f9e db72479 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 23 11:01:39 2014 -0400 Merge remote-tracking branch 'public/bug9229_024' into maint-0.2.4 changes/bug9229 | 5 +++++ src/or/entrynodes.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.4] Merge remote-tracking branch 'public/bug9229_024' into maint-0.2.4
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit 9e44df2c98208fc6d0c3e9f9b3834f54e8a37cd8 Merge: 3fc0f9e db72479 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 23 11:01:39 2014 -0400 Merge remote-tracking branch 'public/bug9229_024' into maint-0.2.4 changes/bug9229 | 5 +++++ src/or/entrynodes.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.2.4] Update ns downloads when we receive a bridge descriptor
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit db72479eea4b5bbd73d1fa33f4c9e4e4e2b99b04 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 10 15:01:27 2014 -0400 Update ns downloads when we receive a bridge descriptor This prevents long stalls when we're starting with a state file but with no bridge descriptors. Fixes bug 9229. I believe this bug has been present since 0.2.0.3-alpha. --- changes/bug9229 | 5 +++++ src/or/entrynodes.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/changes/bug9229 b/changes/bug9229 new file mode 100644 index 0000000..ad7fd22 --- /dev/null +++ b/changes/bug9229 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Avoid 60-second delays in the bootstrapping process when Tor + is launching for a second time while using bridges. Fixes bug 9229; + bugfix on 0.2.0.3-alpha. + diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 2aa063c..59770fa 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -2115,8 +2115,12 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) * our entry node list */ entry_guard_register_connect_status(ri->cache_info.identity_digest, 1, 0, now); - if (first) + if (first) { + /* XXXX apparently, this is never called. See bug #9229. */ routerlist_retry_directory_downloads(now); + } + + update_networkstatus_downloads(now); } } }

1 0

[tor/master] Make num_bridges_usable work properly.
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit 6ab10a546663b509d189ce16645b11af0e83d41c Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Apr 8 15:49:49 2014 -0400 Make num_bridges_usable work properly. My first implementation was broken, since it returned "whether there is one bridge" rather than "how many bridges." Also, the implementation for the n_options_out feature in choose_random_entry_impl was completely broken due to a missing *. --- src/or/entrynodes.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index a08fda4..da3521e 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -1013,7 +1013,7 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, const int num_needed = decide_num_guards(options, for_directory); if (n_options_out) - n_options_out = 0; + *n_options_out = 0; if (chosen_exit) { nodelist_add_node_and_family(exit_family, chosen_exit); @@ -2215,8 +2215,8 @@ any_bridge_descriptors_known(void) return choose_random_entry(NULL) != NULL; } -/** Return the number of bridges that have descriptors that - * are marked with purpose 'bridge' and are running. +/** Return the number of bridges that have descriptors that are marked with + * purpose 'bridge' and are running. */ static int num_bridges_usable(void) @@ -2224,7 +2224,7 @@ num_bridges_usable(void) int n_options = 0; tor_assert(get_options()->UseBridges); (void) choose_random_entry_impl(NULL, 0, 0, &n_options); - return n_options == 1; + return n_options; } /** Return 1 if there are any directory conns fetching bridge descriptors

1 0

[tor/master] Merge remote-tracking branch 'public/bug9229_025'
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit 7b4b137dc9b97c74b55a5835926513d7333fff67 Merge: 0cca8dc 6ab10a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Apr 23 10:57:46 2014 -0400 Merge remote-tracking branch 'public/bug9229_025' Conflicts: src/or/entrynodes.c changes/bug9229_025 | 5 +++++ src/or/entrynodes.c | 36 ++++++++++++++++++++++++++++-------- 2 files changed, 33 insertions(+), 8 deletions(-) diff --cc src/or/entrynodes.c index b374ac7,da3521e..70587bd --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@@ -2207,6 -2215,39 +2215,18 @@@ any_bridge_descriptors_known(void return choose_random_entry(NULL) != NULL; } + /** Return the number of bridges that have descriptors that are marked with + * purpose 'bridge' and are running. + */ + static int + num_bridges_usable(void) + { + int n_options = 0; + tor_assert(get_options()->UseBridges); + (void) choose_random_entry_impl(NULL, 0, 0, &n_options); + return n_options; + } + -/** Return 1 if there are any directory conns fetching bridge descriptors - * that aren't marked for close. We use this to guess if we should tell - * the controller that we have a problem. */ -int -any_pending_bridge_descriptor_fetches(void) -{ - smartlist_t *conns = get_connection_array(); - SMARTLIST_FOREACH_BEGIN(conns, connection_t *, conn) { - if (conn->type == CONN_TYPE_DIR && - conn->purpose == DIR_PURPOSE_FETCH_SERVERDESC && - TO_DIR_CONN(conn)->router_purpose == ROUTER_PURPOSE_BRIDGE && - !conn->marked_for_close && - conn->linked && - conn->linked_conn && !conn->linked_conn->marked_for_close) { - log_debug(LD_DIR, "found one: %s", conn->address); - return 1; - } - } SMARTLIST_FOREACH_END(conn); - return 0; -} - /** Return 1 if we have at least one descriptor for an entry guard * (bridge or member of EntryNodes) and all descriptors we know are * down. Else return 0. If act is 1, then mark the down guards

1 0

[tor/master] Fix our check for the "first" bridge descriptor.
by nickm＠torproject.org 23 Apr '14

23 Apr '14

commit 7aa21920481fc4f0bdb159aeedf11582aa95dd01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 10 15:11:21 2014 -0400 Fix our check for the "first" bridge descriptor. This is meant to be a better bug 9229 fix -- or at least, one more in tune with the intent of the original code, which calls router_retry_directory_downloads() only on the first bridge descriptor. --- changes/bug9229_025 | 5 +++++ src/or/entrynodes.c | 36 ++++++++++++++++++++++++++++-------- 2 files changed, 33 insertions(+), 8 deletions(-) diff --git a/changes/bug9229_025 b/changes/bug9229_025 new file mode 100644 index 0000000..ad7fd22 --- /dev/null +++ b/changes/bug9229_025 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Avoid 60-second delays in the bootstrapping process when Tor + is launching for a second time while using bridges. Fixes bug 9229; + bugfix on 0.2.0.3-alpha. + diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index 37d5fb9..a08fda4 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -70,7 +70,9 @@ static int entry_guards_dirty = 0; static void bridge_free(bridge_info_t *bridge); static const node_t *choose_random_entry_impl(cpath_build_state_t *state, int for_directory, - dirinfo_type_t dirtype); + dirinfo_type_t dirtype, + int *n_options_out); +static int num_bridges_usable(void); /** Return the list of entry guards, creating it if necessary. */ const smartlist_t * @@ -982,7 +984,7 @@ node_can_handle_dirinfo(const node_t *node, dirinfo_type_t dirinfo) const node_t * choose_random_entry(cpath_build_state_t *state) { - return choose_random_entry_impl(state, 0, 0); + return choose_random_entry_impl(state, 0, 0, NULL); } /** Pick a live (up and listed) directory guard from entry_guards for @@ -990,13 +992,13 @@ choose_random_entry(cpath_build_state_t *state) const node_t * choose_random_dirguard(dirinfo_type_t type) { - return choose_random_entry_impl(NULL, 1, type); + return choose_random_entry_impl(NULL, 1, type, NULL); } /** Helper for choose_random{entry,dirguard}. */ static const node_t * choose_random_entry_impl(cpath_build_state_t *state, int for_directory, - dirinfo_type_t dirinfo_type) + dirinfo_type_t dirinfo_type, int *n_options_out) { const or_options_t *options = get_options(); smartlist_t *live_entry_guards = smartlist_new(); @@ -1010,6 +1012,9 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, int need_descriptor = !for_directory; const int num_needed = decide_num_guards(options, for_directory); + if (n_options_out) + n_options_out = 0; + if (chosen_exit) { nodelist_add_node_and_family(exit_family, chosen_exit); consider_exit_family = 1; @@ -1136,6 +1141,8 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, * *double*-weight our guard selection. */ node = smartlist_choose(live_entry_guards); } + if (n_options_out) + *n_options_out = smartlist_len(live_entry_guards); smartlist_free(live_entry_guards); smartlist_free(exit_family); return node; @@ -2166,7 +2173,7 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) tor_assert(ri); tor_assert(ri->purpose == ROUTER_PURPOSE_BRIDGE); if (get_options()->UseBridges) { - int first = !any_bridge_descriptors_known(); + int first = num_bridges_usable() <= 1; bridge_info_t *bridge = get_configured_bridge_by_routerinfo(ri); time_t now = time(NULL); router_set_status(ri->cache_info.identity_digest, 1); @@ -2188,14 +2195,15 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) * our entry node list */ entry_guard_register_connect_status(ri->cache_info.identity_digest, 1, 0, now); - if (first) + if (first) { routerlist_retry_directory_downloads(now); + } } } } -/** Return 1 if any of our entry guards have descriptors that - * are marked with purpose 'bridge' and are running. Else return 0. +/** Return the number of bridges that have descriptors that + * are marked with purpose 'bridge' and are running. * * We use this function to decide if we're ready to start building * circuits through our bridges, or if we need to wait until the @@ -2207,6 +2215,18 @@ any_bridge_descriptors_known(void) return choose_random_entry(NULL) != NULL; } +/** Return the number of bridges that have descriptors that + * are marked with purpose 'bridge' and are running. + */ +static int +num_bridges_usable(void) +{ + int n_options = 0; + tor_assert(get_options()->UseBridges); + (void) choose_random_entry_impl(NULL, 0, 0, &n_options); + return n_options == 1; +} + /** Return 1 if there are any directory conns fetching bridge descriptors * that aren't marked for close. We use this to guess if we should tell * the controller that we have a problem. */

1 0