- tor-commits - lists.torproject.org

[tor/maint-0.2.8] stop looping once we know what the answer will be
by nickm＠torproject.org 19 May '16

19 May '16

commit aa6341d4b9159e02825a03f1490ce6b731c2a90e Author: Roger Dingledine <arma(a)torproject.org> Date: Fri May 6 09:55:06 2016 -0400 stop looping once we know what the answer will be suggested during code review by dgoulet --- src/or/networkstatus.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 3d8bb55..074922b 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1347,8 +1347,10 @@ networkstatus_consensus_is_already_downloading(const char *resource) connection_t *base = TO_CONN(dirconn); if (base->linked_conn && base->linked_conn->type == CONN_TYPE_AP && - !AP_CONN_STATE_IS_UNATTACHED(base->linked_conn->state)) + !AP_CONN_STATE_IS_UNATTACHED(base->linked_conn->state)) { answer = 1; + break; /* stop looping, because we know the answer will be yes */ + } } SMARTLIST_FOREACH_END(dirconn); smartlist_free(fetching_conns);

1 0

[tor/maint-0.2.8] Remove consensus_max_download_tries by refactoring
by nickm＠torproject.org 19 May '16

19 May '16

commit ab0a7e2961378ff0fb7f5061d6b1cdeebe7afa98 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 18 18:07:40 2016 -0400 Remove consensus_max_download_tries by refactoring No behaviour change This function is used twice. The code is simpler if we split it up and inline it where it is used. --- src/or/networkstatus.c | 30 ++++++++---------------------- 1 file changed, 8 insertions(+), 22 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 5e32003..5c92830 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -791,26 +791,6 @@ check_consensus_waiting_for_certs(int flavor, time_t now, return 0; } -/* Return the maximum download tries for a consensus, based on options and - * whether we_are_bootstrapping. */ -static int -consensus_max_download_tries(const or_options_t *options, - int we_are_bootstrapping) -{ - int use_fallbacks = networkstatus_consensus_can_use_extra_fallbacks(options); - - if (we_are_bootstrapping) { - if (use_fallbacks) { - return options->ClientBootstrapConsensusMaxDownloadTries; - } else { - return - options->ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries; - } - } - - return options->TestingConsensusMaxDownloadTries; -} - /** If we want to download a fresh consensus, launch a new download as * appropriate. */ static void @@ -871,7 +851,7 @@ update_consensus_networkstatus_downloads(time_t now) update_consensus_bootstrap_multiple_downloads(now, options); } else { /* Check if we failed downloading a consensus too recently */ - int max_dl_tries = consensus_max_download_tries(options, 0); + int max_dl_tries = options->TestingConsensusMaxDownloadTries; /* Let's make sure we remembered to update consensus_dl_status */ tor_assert(consensus_dl_status[i].schedule == DL_SCHED_CONSENSUS); @@ -909,7 +889,13 @@ update_consensus_bootstrap_attempt_downloads( download_status_t *dls, download_want_authority_t want_authority) { - int max_dl_tries = consensus_max_download_tries(options, 1); + int use_fallbacks = networkstatus_consensus_can_use_extra_fallbacks(options); + int max_dl_tries = options->ClientBootstrapConsensusMaxDownloadTries; + if (!use_fallbacks) { + max_dl_tries = + options->ClientBootstrapConsensusAuthorityOnlyMaxDownloadTries; + } + const char *resource = networkstatus_get_flavor_name( usable_consensus_flavor());

1 0

[tor/maint-0.2.8] Restore and improve download schedule unit tests
by nickm＠torproject.org 19 May '16

19 May '16

commit d5c70d71027644efb31d16d17b46d43484b46b18 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 18 21:31:03 2016 -0400 Restore and improve download schedule unit tests --- src/or/networkstatus.c | 8 +-- src/or/networkstatus.h | 6 +- src/test/test_dir.c | 153 ++++++++++++++++++++++++++++++++++++++++++++----- 3 files changed, 146 insertions(+), 21 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 5c92830..5fa7a85 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1237,8 +1237,8 @@ networkstatus_get_reasonably_live_consensus(time_t now, int flavor) * If we have no consensus, or our consensus is unusably old, return 1. * As soon as we have received a consensus, return 0, even if we don't have * enough certificates to validate it. */ -int -networkstatus_consensus_is_bootstrapping(time_t now) +MOCK_IMPL(int, +networkstatus_consensus_is_bootstrapping,(time_t now)) { /* If we have a validated, reasonably live consensus, we're not * bootstrapping a consensus at all. */ @@ -1273,8 +1273,8 @@ networkstatus_consensus_can_use_multiple_directories( /** Check if we can use fallback directory mirrors for a consensus download. * If we have fallbacks and don't want to fetch from the authorities, * we can use them. */ -int -networkstatus_consensus_can_use_extra_fallbacks(const or_options_t *options) +MOCK_IMPL(int, +networkstatus_consensus_can_use_extra_fallbacks,(const or_options_t *options)) { /* The list length comparisons are a quick way to check if we have any * non-authority fallback directories. If we ever have any authorities that diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 609fb85..ac93e5d 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -70,11 +70,11 @@ MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus_by_flavor, networkstatus_t *networkstatus_get_live_consensus(time_t now); networkstatus_t *networkstatus_get_reasonably_live_consensus(time_t now, int flavor); -int networkstatus_consensus_is_bootstrapping(time_t now); +MOCK_DECL(int, networkstatus_consensus_is_bootstrapping,(time_t now)); int networkstatus_consensus_can_use_multiple_directories( const or_options_t *options); -int networkstatus_consensus_can_use_extra_fallbacks( - const or_options_t *options); +MOCK_DECL(int, networkstatus_consensus_can_use_extra_fallbacks,( + const or_options_t *options)); int networkstatus_consensus_is_already_downloading(const char *resource); #define NSSET_FROM_CACHE 1 diff --git a/src/test/test_dir.c b/src/test/test_dir.c index ea179fb..d9aff52 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -3995,12 +3995,56 @@ test_dir_choose_compression_level(void* data) done: ; } +static int mock_networkstatus_consensus_is_bootstrapping_value = 0; +static int +mock_networkstatus_consensus_is_bootstrapping(time_t now) +{ + (void)now; + return mock_networkstatus_consensus_is_bootstrapping_value; +} + +static int mock_networkstatus_consensus_can_use_extra_fallbacks_value = 0; +static int +mock_networkstatus_consensus_can_use_extra_fallbacks( + const or_options_t *options) +{ + (void)options; + return mock_networkstatus_consensus_can_use_extra_fallbacks_value; +} + +/* data is a 2 character nul-terminated string. + * If data[0] is 'b', set bootstrapping, anything else means not bootstrapping + * If data[1] is 'f', set extra fallbacks, anything else means no extra + * fallbacks. + */ static void test_dir_find_dl_schedule(void* data) { + const char *str = (const char *)data; + + tt_assert(strlen(data) == 2); + + if (str[0] == 'b') { + mock_networkstatus_consensus_is_bootstrapping_value = 1; + } else { + mock_networkstatus_consensus_is_bootstrapping_value = 0; + } + + if (str[1] == 'f') { + mock_networkstatus_consensus_can_use_extra_fallbacks_value = 1; + } else { + mock_networkstatus_consensus_can_use_extra_fallbacks_value = 0; + } + + MOCK(networkstatus_consensus_is_bootstrapping, + mock_networkstatus_consensus_is_bootstrapping); + MOCK(networkstatus_consensus_can_use_extra_fallbacks, + mock_networkstatus_consensus_can_use_extra_fallbacks); + download_status_t dls; - smartlist_t server, client, server_cons, client_cons, bridge; - (void)data; + smartlist_t server, client, server_cons, client_cons; + smartlist_t client_boot_auth_only_cons, client_boot_auth_cons; + smartlist_t client_boot_fallback_cons, bridge; mock_options = malloc(sizeof(or_options_t)); reset_options(mock_options, &mock_get_options_calls); @@ -4010,43 +4054,121 @@ test_dir_find_dl_schedule(void* data) mock_options->TestingClientDownloadSchedule = &client; mock_options->TestingServerConsensusDownloadSchedule = &server_cons; mock_options->TestingClientConsensusDownloadSchedule = &client_cons; + mock_options->ClientBootstrapConsensusAuthorityOnlyDownloadSchedule = + &client_boot_auth_only_cons; + mock_options->ClientBootstrapConsensusAuthorityDownloadSchedule = + &client_boot_auth_cons; + mock_options->ClientBootstrapConsensusFallbackDownloadSchedule = + &client_boot_fallback_cons; mock_options->TestingBridgeDownloadSchedule = &bridge; dls.schedule = DL_SCHED_GENERIC; + /* client */ mock_options->ClientOnly = 1; tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, &client); mock_options->ClientOnly = 0; + + /* dir mode */ mock_options->DirPort_set = 1; - mock_options->ORPort_set = 1; mock_options->DirCache = 1; tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, &server); + mock_options->DirPort_set = 0; + mock_options->DirCache = 0; -#if 0 dls.schedule = DL_SCHED_CONSENSUS; - mock_options->ClientOnly = 1; - mock_options->DirCache = 0; - tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, &client_cons); - mock_options->ClientOnly = 0; - mock_options->DirCache = 1; + /* public server mode */ + mock_options->ORPort_set = 1; tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, &server_cons); -#endif + mock_options->ORPort_set = 0; + + /* client and bridge modes */ + if (networkstatus_consensus_is_bootstrapping(time(NULL))) { + if (networkstatus_consensus_can_use_extra_fallbacks(mock_options)) { + dls.want_authority = 1; + /* client */ + mock_options->ClientOnly = 1; + tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, + &client_boot_auth_cons); + mock_options->ClientOnly = 0; + + /* bridge relay */ + mock_options->ORPort_set = 1; + mock_options->BridgeRelay = 1; + tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, + &client_boot_auth_cons); + mock_options->ORPort_set = 0; + mock_options->BridgeRelay = 0; + + dls.want_authority = 0; + /* client */ + mock_options->ClientOnly = 1; + tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, + &client_boot_fallback_cons); + mock_options->ClientOnly = 0; + + /* bridge relay */ + mock_options->ORPort_set = 1; + mock_options->BridgeRelay = 1; + tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, + &client_boot_fallback_cons); + mock_options->ORPort_set = 0; + mock_options->BridgeRelay = 0; + + } else { + /* dls.want_authority is ignored */ + /* client */ + mock_options->ClientOnly = 1; + tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, + &client_boot_auth_only_cons); + mock_options->ClientOnly = 0; + + /* bridge relay */ + mock_options->ORPort_set = 1; + mock_options->BridgeRelay = 1; + tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, + &client_boot_auth_only_cons); + mock_options->ORPort_set = 0; + mock_options->BridgeRelay = 0; + } + } else { + /* client */ + mock_options->ClientOnly = 1; + tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, + &client_cons); + mock_options->ClientOnly = 0; + + /* bridge relay */ + mock_options->ORPort_set = 1; + mock_options->BridgeRelay = 1; + tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, + &client_cons); + mock_options->ORPort_set = 0; + mock_options->BridgeRelay = 0; + } dls.schedule = DL_SCHED_BRIDGE; + /* client */ mock_options->ClientOnly = 1; tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, &bridge); - mock_options->ClientOnly = 0; - tt_ptr_op(find_dl_schedule(&dls, mock_options), OP_EQ, &bridge); done: + UNMOCK(networkstatus_consensus_is_bootstrapping); + UNMOCK(networkstatus_consensus_can_use_extra_fallbacks); UNMOCK(get_options); + free(mock_options); + mock_options = NULL; } -#define DIR_LEGACY(name) \ +#define DIR_LEGACY(name) \ { #name, test_dir_ ## name , TT_FORK, NULL, NULL } #define DIR(name,flags) \ { #name, test_dir_##name, (flags), NULL, NULL } +/* where arg is a string constant */ +#define DIR_ARG(name,flags,arg) \ + { #name "_" arg, test_dir_##name, (flags), &passthrough_setup, arg } + struct testcase_t dir_tests[] = { DIR_LEGACY(nicknames), DIR_LEGACY(formats), @@ -4081,7 +4203,10 @@ struct testcase_t dir_tests[] = { DIR(should_not_init_request_to_dir_auths_without_v3_info, 0), DIR(should_init_request_to_dir_auths, 0), DIR(choose_compression_level, 0), - DIR(find_dl_schedule, 0), + DIR_ARG(find_dl_schedule, TT_FORK, "bf"), + DIR_ARG(find_dl_schedule, TT_FORK, "ba"), + DIR_ARG(find_dl_schedule, TT_FORK, "cf"), + DIR_ARG(find_dl_schedule, TT_FORK, "ca"), END_OF_TESTCASES };

1 0

[tor/maint-0.2.8] Changes file for bug 18809
by nickm＠torproject.org 19 May '16

19 May '16

commit 8dc8d712260a16eb9811b57abd4928081316f495 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 18 18:04:02 2016 -0400 Changes file for bug 18809 --- changes/bug18809 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/changes/bug18809 b/changes/bug18809 new file mode 100644 index 0000000..6ee5088 --- /dev/null +++ b/changes/bug18809 @@ -0,0 +1,14 @@ + o Major bugfixes (bootstrap): + - Check if bootstrap consensus downloads are still needed + when the linked connection attaches. This prevents tor + making unnecessary begindir-style connections, which are + the only directory connections tor clients make since + #18483 was merged. + - Fix some edge cases where consensus download connections + may not have been closed, even though they were not needed. + - Make relays retry consensus downloads the correct number of + times, rather than the more aggresive client retry count. + - Stop downloading consensuses when we have a consensus, + even if we don't have all the certificates for it yet. + Closes ticket 18943, bugfix on #4483 in 0.2.8.1-alpha, + patches by arma and teor.

1 0

[tor/maint-0.2.8] Fix a compilation error in test_dir.c
by nickm＠torproject.org 19 May '16

19 May '16

commit 06803c317f3865b2a365c4485618828f60bd5de9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 08:27:11 2016 -0400 Fix a compilation error in test_dir.c --- src/test/test_dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index c806527..eca3082 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -4213,7 +4213,7 @@ test_dir_find_dl_schedule(void* data) /* where arg is a string constant */ #define DIR_ARG(name,flags,arg) \ - { #name "_" arg, test_dir_##name, (flags), &passthrough_setup, arg } + { #name "_" arg, test_dir_##name, (flags), &passthrough_setup, (void*) arg } struct testcase_t dir_tests[] = { DIR_LEGACY(nicknames),

1 0

[tor/maint-0.2.8] changelog typo fix
by nickm＠torproject.org 19 May '16

19 May '16

commit 7c7d990704219ff1033dc9dc257378757ad7cecf Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 08:29:45 2016 -0400 changelog typo fix --- changes/bug18809 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changes/bug18809 b/changes/bug18809 index 6ee5088..94e6369 100644 --- a/changes/bug18809 +++ b/changes/bug18809 @@ -7,7 +7,7 @@ - Fix some edge cases where consensus download connections may not have been closed, even though they were not needed. - Make relays retry consensus downloads the correct number of - times, rather than the more aggresive client retry count. + times, rather than the more aggressive client retry count. - Stop downloading consensuses when we have a consensus, even if we don't have all the certificates for it yet. Closes ticket 18943, bugfix on #4483 in 0.2.8.1-alpha,

1 0

[tor/master] fix typos/etc before i go nuts on #18809
by nickm＠torproject.org 19 May '16

19 May '16

commit ce8266d52d296333eb1a735225e620760aab8802 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 13 00:06:30 2016 -0400 fix typos/etc before i go nuts on #18809 --- src/or/directory.c | 12 ++++++------ src/or/main.c | 2 +- src/or/networkstatus.c | 17 +++++++++-------- src/or/networkstatus.h | 2 +- src/test/test_connection.c | 2 +- 5 files changed, 18 insertions(+), 17 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 8dc018a..8486c8c 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3703,7 +3703,7 @@ connection_dir_would_close_consensus_conn_helper(void) * consensus, and we are still bootstrapping (that is, we have no usable * consensus), we don't want to close any until one starts downloading. */ if (!networkstatus_consensus_is_downloading_usable_flavor() - && networkstatus_consensus_is_boostrapping(time(NULL))) { + && networkstatus_consensus_is_bootstrapping(time(NULL))) { return 0; } @@ -3737,7 +3737,7 @@ connection_dir_avoid_extra_connection_for_purpose(unsigned int purpose) * bootstrapping (that is, we have no usable consensus), we can be sure that * any further connections would be excess. */ if (networkstatus_consensus_is_downloading_usable_flavor() - && networkstatus_consensus_is_boostrapping(time(NULL))) { + && networkstatus_consensus_is_bootstrapping(time(NULL))) { return 1; } @@ -3778,12 +3778,12 @@ connection_dir_close_consensus_conn_if_extra(dir_connection_t *conn) return 0; } - const int we_are_bootstrapping = networkstatus_consensus_is_boostrapping( + const int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( time(NULL)); /* We don't want to check other connections to see if they are downloading, * as this is prone to race-conditions. So leave it for - * connection_dir_consider_close_extra_consensus_conns() to clean up. + * connection_dir_close_extra_consensus_conns(() to clean up. * * But if conn has just started connecting, or we have a consensus already, * we can be sure it's not needed any more. */ @@ -3823,7 +3823,7 @@ connection_dir_close_extra_consensus_conns(void) return; } - int we_are_bootstrapping = networkstatus_consensus_is_boostrapping( + int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( time(NULL)); const char *usable_resource = networkstatus_get_flavor_name( @@ -3932,7 +3932,7 @@ find_dl_schedule(download_status_t *dls, const or_options_t *options) const int dir_server = dir_server_mode(options); const int multi_d = networkstatus_consensus_can_use_multiple_directories( options); - const int we_are_bootstrapping = networkstatus_consensus_is_boostrapping( + const int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( time(NULL)); const int use_fallbacks = networkstatus_consensus_can_use_extra_fallbacks( options); diff --git a/src/or/main.c b/src/or/main.c index a2cf5b1..bf5b2b8 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1917,7 +1917,7 @@ fetch_networkstatus_callback(time_t now, const or_options_t *options) /* How often do we check whether we should download network status * documents? */ - const int we_are_bootstrapping = networkstatus_consensus_is_boostrapping( + const int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( now); const int prefer_mirrors = !directory_fetches_from_authorities( get_options()); diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 3967f56..51c985e 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -819,7 +819,7 @@ update_consensus_networkstatus_downloads(time_t now) { int i; const or_options_t *options = get_options(); - const int we_are_bootstrapping = networkstatus_consensus_is_boostrapping( + const int we_are_bootstrapping = networkstatus_consensus_is_bootstrapping( now); const int use_multi_conn = networkstatus_consensus_can_use_multiple_directories(options); @@ -875,12 +875,13 @@ update_consensus_networkstatus_downloads(time_t now) resource, DIR_CONN_STATE_CONNECTING); - if (i == usable_consensus_flavor() - && connect_consens_conn_count < consens_conn_count) { + /* If not all connections are "connecting", then some are + * downloading. We want to have at most one downloading at a time. */ + if (connect_consens_conn_count < consens_conn_count) { continue; } - /* Make multiple connections for a bootstrap consensus download */ + /* Make multiple connections for a bootstrap consensus download. */ update_consensus_bootstrap_multiple_downloads(now, options, we_are_bootstrapping); } else { @@ -954,7 +955,7 @@ update_consensus_bootstrap_attempt_downloads( * connections. * Only call when bootstrapping, and when we want to make additional * connections. Only nodes that satisfy - * networkstatus_consensus_can_use_multiple_directories make additonal + * networkstatus_consensus_can_use_multiple_directories make additional * connections. */ static void @@ -969,7 +970,7 @@ update_consensus_bootstrap_multiple_downloads(time_t now, return; } - /* If we've managed to validate a usable consensus, don't make additonal + /* If we've managed to validate a usable consensus, don't make additional * connections. */ if (!we_are_bootstrapping) { return; @@ -1277,7 +1278,7 @@ networkstatus_get_reasonably_live_consensus(time_t now, int flavor) * only using the authorities and fallback directory mirrors to download the * consensus flavour we'll use. */ int -networkstatus_consensus_is_boostrapping(time_t now) +networkstatus_consensus_is_bootstrapping(time_t now) { /* If we don't have a consensus, we must still be bootstrapping */ return !networkstatus_get_reasonably_live_consensus( @@ -1327,7 +1328,7 @@ networkstatus_consensus_can_use_extra_fallbacks(const or_options_t *options) * return value of this function to see if a client could make multiple * bootstrap connections. Use * networkstatus_consensus_can_use_multiple_directories() - * and networkstatus_consensus_is_boostrapping(). */ + * and networkstatus_consensus_is_bootstrapping(). */ int networkstatus_consensus_has_excess_connections(void) { diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 9bbb9a3..f2f8af5 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -70,7 +70,7 @@ MOCK_DECL(networkstatus_t *,networkstatus_get_latest_consensus_by_flavor, networkstatus_t *networkstatus_get_live_consensus(time_t now); networkstatus_t *networkstatus_get_reasonably_live_consensus(time_t now, int flavor); -int networkstatus_consensus_is_boostrapping(time_t now); +int networkstatus_consensus_is_bootstrapping(time_t now); int networkstatus_consensus_can_use_multiple_directories( const or_options_t *options); int networkstatus_consensus_can_use_extra_fallbacks( diff --git a/src/test/test_connection.c b/src/test/test_connection.c index 15ae973..6f7aef8 100644 --- a/src/test/test_connection.c +++ b/src/test/test_connection.c @@ -705,7 +705,7 @@ test_conn_download_status(void *arg) /* now try closing the one that isn't downloading: * these tests won't work unless tor thinks it is bootstrapping */ - tt_assert(networkstatus_consensus_is_boostrapping(time(NULL))); + tt_assert(networkstatus_consensus_is_bootstrapping(time(NULL))); tt_assert(connection_dir_count_by_purpose_and_resource( TEST_CONN_RSRC_PURPOSE,

1 0

[tor/master] avoid following through on a consensus fetch if we have one already arriving
by nickm＠torproject.org 19 May '16

19 May '16

commit 91c58013be735584acc674a60bb18d1efb38f25a Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 13 01:08:17 2016 -0400 avoid following through on a consensus fetch if we have one already arriving --- src/or/circuituse.c | 19 ++++++++++++++++++ src/or/networkstatus.c | 53 ++++++++++++++++++++++++++++++++++---------------- src/or/networkstatus.h | 1 + 3 files changed, 56 insertions(+), 17 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 31003ea..f32763a 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -2355,6 +2355,25 @@ connection_ap_handshake_attach_circuit(entry_connection_t *conn) /* we're a general conn */ origin_circuit_t *circ=NULL; + /* Are we linked to a dir conn that aims to fetch a consensus? + * We check here because this conn might no longer be needed. */ + if (base_conn->linked_conn && + base_conn->linked_conn->type == CONN_TYPE_DIR && + base_conn->linked_conn->purpose == DIR_PURPOSE_FETCH_CONSENSUS) { + + /* Yes we are. Is there a consensus fetch farther along than us? */ + if (networkstatus_consensus_is_already_downloading( + TO_DIR_CONN(base_conn->linked_conn)->requested_resource)) { + /* We're doing the "multiple consensus fetch attempts" game from + * proposal 210, and we're late to the party. Just close this conn. + * The circuit and TLS conn that we made will time out after a while + * if nothing else wants to use them. */ + log_info(LD_DIR, "Closing extra consensus fetch (to %s) since one " + "is already downloading.", base_conn->linked_conn->address); + return -1; + } + } + if (conn->chosen_exit_name) { const node_t *node = node_get_by_nickname(conn->chosen_exit_name, 1); int opt = conn->chosen_exit_optional; diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 51c985e..e90603e 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1349,27 +1349,46 @@ networkstatus_consensus_has_excess_connections(void) return 0; } +/* Is there a consensus fetch for flavor <b>resource</b> that's far + * enough along to be attached to a circuit? */ +int +networkstatus_consensus_is_already_downloading(const char *resource) +{ + int answer = 0; + + /* First, get a list of all the dir conns that are fetching a consensus, + * fetching *this* consensus, and are in state "reading" (meaning they + * have already flushed their request onto the socks connection). */ + smartlist_t *fetching_conns = + connection_dir_list_by_purpose_resource_and_state( + DIR_PURPOSE_FETCH_CONSENSUS, resource, DIR_CONN_STATE_CLIENT_READING); + + /* Then, walk through each conn, to see if its linked socks connection + * is in an attached state. We have to check this separately, since with + * the optimistic data feature, fetches can send their request to the + * socks connection and go into state 'reading', even before they're + * attached to any circuit. */ + SMARTLIST_FOREACH_BEGIN(fetching_conns, dir_connection_t *, dirconn) { + /* Do any of these other dir conns have a linked socks conn that is + * attached to a circuit already? */ + connection_t *base = TO_CONN(dirconn); + if (base->linked_conn && + base->linked_conn->type == CONN_TYPE_AP && + !AP_CONN_STATE_IS_UNATTACHED(base->linked_conn->state)) + answer = 1; + } SMARTLIST_FOREACH_END(dirconn); + smartlist_free(fetching_conns); + + return answer; +} + /* Is tor currently downloading a consensus of the usable flavor? */ int networkstatus_consensus_is_downloading_usable_flavor(void) { - const char *usable_resource = networkstatus_get_flavor_name( - usable_consensus_flavor()); - const int consens_conn_usable_count = - connection_dir_count_by_purpose_and_resource( - DIR_PURPOSE_FETCH_CONSENSUS, - usable_resource); - - const int connect_consens_conn_usable_count = - connection_dir_count_by_purpose_resource_and_state( - DIR_PURPOSE_FETCH_CONSENSUS, - usable_resource, - DIR_CONN_STATE_CONNECTING); - if (connect_consens_conn_usable_count < consens_conn_usable_count) { - return 1; - } - - return 0; + const char *resource = + networkstatus_get_flavor_name(usable_consensus_flavor()); + return networkstatus_consensus_is_already_downloading(resource); } /** Given two router status entries for the same router identity, return 1 if diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index f2f8af5..e1cd10b 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -76,6 +76,7 @@ int networkstatus_consensus_can_use_multiple_directories( int networkstatus_consensus_can_use_extra_fallbacks( const or_options_t *options); int networkstatus_consensus_has_excess_connections(void); +int networkstatus_consensus_is_already_downloading(const char *resource); int networkstatus_consensus_is_downloading_usable_flavor(void); #define NSSET_FROM_CACHE 1

1 0

[tor/master] use the new function here too
by nickm＠torproject.org 19 May '16

19 May '16

commit 59da060f10e6abd1681ad00dddd4410d52ce1781 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 13 01:30:29 2016 -0400 use the new function here too --- src/or/networkstatus.c | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index e90603e..4a9b367 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -865,21 +865,8 @@ update_consensus_networkstatus_downloads(time_t now) && i == usable_consensus_flavor()) { /* Check if we're already downloading a usable consensus */ - int consens_conn_count = - connection_dir_count_by_purpose_and_resource( - DIR_PURPOSE_FETCH_CONSENSUS, - resource); - int connect_consens_conn_count = - connection_dir_count_by_purpose_resource_and_state( - DIR_PURPOSE_FETCH_CONSENSUS, - resource, - DIR_CONN_STATE_CONNECTING); - - /* If not all connections are "connecting", then some are - * downloading. We want to have at most one downloading at a time. */ - if (connect_consens_conn_count < consens_conn_count) { + if (networkstatus_consensus_is_already_downloading(resource)) continue; - } /* Make multiple connections for a bootstrap consensus download. */ update_consensus_bootstrap_multiple_downloads(now, options,

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 19 May '16

19 May '16

commit fbe6536d4a7f682a976f60ad16300623d4fd7b50 Author: Translation commit bot <translation(a)torproject.org> Date: Thu May 19 12:15:07 2016 +0000 Update translations for bridgedb_completed --- hr_HR/LC_MESSAGES/bridgedb.po | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po index 3f1e28a..af850dc 100644 --- a/hr_HR/LC_MESSAGES/bridgedb.po +++ b/hr_HR/LC_MESSAGES/bridgedb.po @@ -14,7 +14,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2016-05-19 10:11+0000\n" +"PO-Revision-Date: 2016-05-19 12:08+0000\n" "Last-Translator: Igor <lyricaltumor(a)gmail.com>\n" "Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n" "MIME-Version: 1.0\n" @@ -229,7 +229,7 @@ msgid "" "difficult for anyone watching your internet traffic to determine that you are\n" "using Tor.\n" "\n" -msgstr "BridgeDB nudi mostove s različitim %stipovima Pluggable Transports%s\nkoji mogu pomoći prikriti Vaše veze s Tor mrežom, otežavajući onome tko\nprati Vaš internet promet da vidi da koristite Tor.\n" +msgstr "BridgeDB nudi mostove s različitim %stipovima Pluggable Transport-a%s\nkoji mogu pomoći prikriti Vaše veze s Tor mrežom, otežavajući onome tko\nprati Vaš Internet promet da vidi da koristite Tor.\n" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #: bridgedb/strings.py:79 @@ -237,7 +237,7 @@ msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" "\n" -msgstr "Neki mostovi s IPv6 adresama su također dostupni, no neki Pluggable \nTransports nisu kompatibilni s IPv6.\n\n" +msgstr "Također su dostupni neki mostovi s IPv6 adresama, no neki Pluggable \nTransport-i nisu kompatibilni s IPv6.\n" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring, @@ -251,7 +251,7 @@ msgid "" "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n" "help to circumvent internet censorship in many cases.\n" "\n" -msgstr "Nadalje, BridgeDB ima mnoštvo dobrih, starih mostova %s bez ikakvih\nPluggable Transports %s koji možda ne zvuče prezanimljivo, ali mogu\npomoći zaobići internet cenzuru u mnogo slučajeva.\n" +msgstr "Nadalje, BridgeDB ima mnoštvo dobrih, starih mostova %s bez ikakvih\nPluggable Transport-a %s koji možda ne zvuče prezanimljivo, ali mogu\npomoći zaobići Internet cenzuru u mnogo slučajeva.\n" #: bridgedb/strings.py:101 msgid "What are bridges?" @@ -264,7 +264,7 @@ msgstr "%s Mostovi %s su Tor releji koji vam pomažu zaobići cenzuru." #: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" -msgstr "Trebam alternativni način dobivanja mostova!" +msgstr "Trebam alternativni način preuzimanja mostova!" #: bridgedb/strings.py:108 #, python-format @@ -272,7 +272,7 @@ msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" "send the email using an address from one of the following email providers:\n" "%s, %s or %s." -msgstr "Još jedan način za dobiti mostove je da pošaljete email na %s. Imajte na umu da morate\nposlati email koristeći adresu jednog od sljedećih davatelja email usluge: %s %s ili %s." +msgstr "Još jedan način za preuzimanje mostova je da pošaljete email na %s. Imajte na umu da morate\nposlati email koristeći adresu jednog od sljedećih davatelja email usluge: %s, %s ili %s." #: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" @@ -282,7 +282,7 @@ msgstr "Moji mostovi ne rade! Treba mi pomoć!" #: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "Ako vaš Tor ne radi, pošaljite email na %s." +msgstr "Ako Vaš Tor ne radi, pošaljite email na %s." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". @@ -292,15 +292,15 @@ msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." -msgstr "Pokušajte naznačiti što više informacija o vašem slučaju, uključujući popis\nmostova i Pluggable Transports koje ste pokušali koristiti, verziju vašeg Tor Browsera,\ni bilo kakve poruke koje je Tor izbacio, itd." +msgstr "Pokušajte uključiti što više informacija o svom slučaju, uključujući popis\nmostova i Pluggable Transport-a koje ste pokušali koristiti, verziju svog Tor Browser-a,\ni bilo kakve poruke koje je Tor izbacio, itd." #: bridgedb/strings.py:128 msgid "Here are your bridge lines:" -msgstr "Ovdje su linije vaših mostova:" +msgstr "Ovo su linije vaših mostova:" #: bridgedb/strings.py:129 msgid "Get Bridges!" -msgstr "Dobijte Mostove!" +msgstr "Preuzmite mostove!" #: bridgedb/strings.py:133 msgid "Please select options for bridge type:" @@ -308,7 +308,7 @@ msgstr "Molimo odaberite opcije za tip mosta:" #: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" -msgstr "Trebaju li vam IPv6 adrese?" +msgstr "Trebaju li Vam IPv6 adrese?" #: bridgedb/strings.py:135 #, python-format @@ -325,7 +325,7 @@ msgstr "Unesite znakove sa slike iznad..." #: bridgedb/strings.py:144 msgid "How to start using your bridges" -msgstr "Kako početi koristite Vaše mostove" +msgstr "Kako početi koristite mostove" #. TRANSLATORS: Please DO NOT translate "Tor Browser". #: bridgedb/strings.py:146 @@ -334,21 +334,21 @@ msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" "page %s and then follow the instructions there for downloading and starting\n" "Tor Browser." -msgstr "Kako bi unijeli mostove u Tor Preglednik, prvo odite na %s Tor Preglednik stranicu\nza preuzimanje %s te zatim slijedite upute za preuzimanje i pokretanje\nTor Preglednika." +msgstr "Kako bi unijeli mostove u Tor Preglednik, prvo posjetite %s Tor Browser stranicu\nza preuzimanje %s, a zatim slijedite upute za preuzimanje i pokretanje\nTor Preglednika." #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" -msgstr "Kad iskoči prozorčić 'Tor Mrežne Postavke', kliknite 'Konfiguriraj' i slijedite\nčarobnjaka dok ne upita:" +msgstr "Kad se pojavi dijaloški okvir 'Tor mrežne postavke', kliknite 'Konfiguriraj' i slijedite\nčarobnjaka dok ne upita:" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" -msgstr "Blokira li vaš Internet Service Provider (ISP - pružatelj internet usluge) ili ikako drugačije cenzurira veze\ns Tor mrežom?" +msgstr "Blokira li Vaš Internet Service Provider (ISP - pružatelj internet usluge) ili ikako drugačije cenzurira veze\ns Tor mrežom?" #. TRANSLATORS: Please DO NOT translate "Tor". #: bridgedb/strings.py:159 @@ -357,7 +357,7 @@ msgid "" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" "you should be good to go! If you experience trouble, try clicking the 'Help'\n" "button in the 'Tor Network Settings' wizard for further assistance." -msgstr "Odaberite 'Da', a zatim 'Sljedeće'. Da bi konfigurirali vaše nove mostove, kopirajte i \nzalijepite linije mostova u kućicu za unos teksta. Na kraju, kliknite 'Spoji se', i \nsve bi trebalo biti u redu! Ako naiđete na probleme, probajte kliknuti dugme 'Pomoć'\nu 'Tor Mrežne Postavke' čarobnjaku za daljnju pomoć." +msgstr "Odaberite 'Da', a zatim 'Sljedeće'. Da bi konfigurirali svoje nove mostove, kopirajte i \nzalijepite linije mostova u kućicu za unos teksta. Na kraju, kliknite 'Spoji se', i \nsve bi trebalo biti u redu! Ako naiđete na probleme, probajte kliknuti 'Pomoć'\nu čarobnjaku 'Tor mrežne postavke' za daljnju pomoć." #: bridgedb/strings.py:167 msgid "Displays this message." @@ -383,4 +383,4 @@ msgstr "Zatraži Pluggable Transport po TYPE." #. TRANSLATORS: Please DO NOT translate "GnuPG". #: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." -msgstr "Dobij kopiju BridgeDB javnog GnuPG ključa." +msgstr "Preuzmi kopiju BridgeDB-ovog javnog GnuPG ključa."

1 0