May 2016 - tor-commits - lists.torproject.org

[tor/master] avoid another redundant check
by nickm＠torproject.org 19 May '16

19 May '16

commit bcae392e0edc682990da71524a0802cf79e3e698 Author: Roger Dingledine <arma(a)torproject.org> Date: Wed Apr 13 03:13:12 2016 -0400 avoid another redundant check we should avoid launching a consensus fetch if we don't want one, but if we do end up with an extra one, we should let the other checks take care of it. --- src/or/directory.c | 39 +-------------------------------------- src/or/directory.h | 1 - src/or/networkstatus.c | 9 --------- src/or/networkstatus.h | 1 - 4 files changed, 1 insertion(+), 49 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 2008d07..89b0822 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1173,12 +1173,6 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port, return; } - /* ensure we don't make excess connections when we're already downloading - * a consensus during bootstrap */ - if (connection_dir_avoid_extra_connection_for_purpose(dir_purpose)) { - return; - } - conn = dir_connection_new(tor_addr_family(&addr)); /* set up conn so it's got all the data we need to remember */ @@ -3676,36 +3670,6 @@ connection_dir_finished_flushing(dir_connection_t *conn) return 0; } -/* Check if we would close excess consensus connections. If we would, any - * new consensus connection would become excess immediately, so return 1. - * Otherwise, return 0. */ -int -connection_dir_avoid_extra_connection_for_purpose(unsigned int purpose) -{ - const or_options_t *options = get_options(); - - /* We're not interested in connections that aren't fetching a consensus. */ - if (purpose != DIR_PURPOSE_FETCH_CONSENSUS) { - return 0; - } - - /* we're only interested in avoiding excess connections if we could - * have created any in the first place */ - if (!networkstatus_consensus_can_use_multiple_directories(options)) { - return 0; - } - - /* If there are connections downloading a consensus, and we are still - * 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_bootstrapping(time(NULL))) { - return 1; - } - - return 0; -} - /* We just got a new consensus! If there are other in-progress requests * for this consensus flavor (for example because we launched several in * parallel), cancel them. @@ -3736,8 +3700,7 @@ connection_dir_close_consensus_fetches(dir_connection_t *except_this_one, } /** Connected handler for directory connections: begin sending data to the - * server, and return 0, or, if the connection is an excess bootstrap - * connection, close all excess bootstrap connections. + * server, and return 0. * Only used when connections don't immediately connect. */ int connection_dir_finished_connecting(dir_connection_t *conn) diff --git a/src/or/directory.h b/src/or/directory.h index 3254e07..7646cac 100644 --- a/src/or/directory.h +++ b/src/or/directory.h @@ -78,7 +78,6 @@ void directory_initiate_command(const tor_addr_t *or_addr, uint16_t or_port, const char *resource, const char *payload, size_t payload_len, time_t if_modified_since); -int connection_dir_avoid_extra_connection_for_purpose(unsigned int purpose); #define DSR_HEX (1<<0) #define DSR_BASE64 (1<<1) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 4a9b367..3b38c07 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1369,15 +1369,6 @@ networkstatus_consensus_is_already_downloading(const char *resource) return answer; } -/* Is tor currently downloading a consensus of the usable flavor? */ -int -networkstatus_consensus_is_downloading_usable_flavor(void) -{ - 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 * if the contents have changed between them. Otherwise, return 0. */ static int diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index e1cd10b..667bc1f 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -77,7 +77,6 @@ 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 #define NSSET_WAS_WAITING_FOR_CERTS 2

1 0

[tor/master] 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/master] get rid of another no-longer-used function
by nickm＠torproject.org 19 May '16

19 May '16

commit 53aaed81dd34f227366b0a0c9b143c4c43a5529e Author: Roger Dingledine <arma(a)torproject.org> Date: Tue May 10 11:16:30 2016 -0400 get rid of another no-longer-used function --- src/or/networkstatus.c | 34 ---------------------------------- src/or/networkstatus.h | 1 - 2 files changed, 35 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 074922b..a9c8037 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1288,40 +1288,6 @@ networkstatus_consensus_can_use_extra_fallbacks(const or_options_t *options) > smartlist_len(router_get_trusted_dir_servers()))); } -/* Check if there is more than 1 consensus connection retrieving the usable - * consensus flavor. If so, return 1, if not, return 0. - * - * During normal operation, Tor only makes one consensus download - * connection. But clients can make multiple simultaneous consensus - * connections to improve bootstrap speed and reliability. - * - * If there is more than one connection, we must have connections left - * over from bootstrapping. However, some of the connections may have - * completed and been cleaned up, so it is not sufficient to check the - * 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_bootstrapping(). */ -int -networkstatus_consensus_has_excess_connections(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); - /* The maximum number of connections we want downloading a usable consensus - * Always 1, whether bootstrapping or not. */ - const int max_expected_consens_conn_usable_count = 1; - - if (consens_conn_usable_count > max_expected_consens_conn_usable_count) { - return 1; - } - - return 0; -} - /* Is there a consensus fetch for flavor <b>resource</b> that's far * enough along to be attached to a circuit? */ int diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 667bc1f..609fb85 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -75,7 +75,6 @@ int networkstatus_consensus_can_use_multiple_directories( const or_options_t *options); 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); #define NSSET_FROM_CACHE 1

1 0

[tor/master] Stop downloading consensuses when a consensus has been downloaded
by nickm＠torproject.org 19 May '16

19 May '16

commit 84ab26c320151bde1fc52906266126aa8d7780a3 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 18 17:50:46 2016 -0400 Stop downloading consensuses when a consensus has been downloaded Previosuly, during bootstrap, we would continue to download consensuses if we had a consensus, but didn't have the certificates to validate it. --- src/or/networkstatus.c | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index a9c8037..5e32003 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1247,16 +1247,30 @@ networkstatus_get_reasonably_live_consensus(time_t now, int flavor) return NULL; } -/** Check if we're bootstrapping a consensus download. This means that we are - * only using the authorities and fallback directory mirrors to download the - * consensus flavour we'll use. */ +/** Check if we need to download a consensus during tor's bootstrap phase. + * 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) { - /* If we don't have a consensus, we must still be bootstrapping */ - return !networkstatus_get_reasonably_live_consensus( - now, - usable_consensus_flavor()); + /* If we have a validated, reasonably live consensus, we're not + * bootstrapping a consensus at all. */ + if (networkstatus_get_reasonably_live_consensus( + now, + usable_consensus_flavor())) { + return 0; + } + + /* If we have a consensus, but we're waiting for certificates, + * we're not waiting for a consensus download while bootstrapping. */ + if (consensus_is_waiting_for_certs()) { + return 0; + } + + /* If we have no consensus, or our consensus is very old, we are + * bootstrapping, and we need to download a consensus. */ + return 1; } /** Check if we can use multiple directories for a consensus download.

1 0

[tor/master] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 19 May '16

19 May '16

commit d718c717a67051cb1da2a1f80c70401d0d10b374 Merge: 159ea7a 9f217c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 08:25:12 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18809 | 14 ++ src/or/circuituse.c | 19 +++ src/or/connection.c | 45 ----- src/or/connection.h | 7 - src/or/directory.c | 262 ++++------------------------- src/or/directory.h | 4 - src/or/main.c | 11 -- src/or/microdesc.c | 4 +- src/or/microdesc.h | 2 +- src/or/networkstatus.c | 189 ++++++++------------- src/or/networkstatus.h | 9 +- src/test/test_connection.c | 405 ++++++++++++++++++++++++++++----------------- src/test/test_dir.c | 153 +++++++++++++++-- src/test/test_routerlist.c | 48 ++++++ 14 files changed, 578 insertions(+), 594 deletions(-)

1 0

[tor/master] 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] Merge branch 'maint-0.2.8'
by nickm＠torproject.org 19 May '16

19 May '16

commit a7a44f2db0b6732ed53a24186dc09eea50296a20 Merge: d718c71 7c7d990 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 08:29:58 2016 -0400 Merge branch 'maint-0.2.8' changes/bug18809 | 2 +- src/test/test_dir.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'bug18809_028_squashed' into maint-0.2.8
by nickm＠torproject.org 19 May '16

19 May '16

commit 9f217c83b0d91508af0d63f04216fa78cdbfbe1b Merge: 3f49474 f698b50 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu May 19 08:17:02 2016 -0400 Merge branch 'bug18809_028_squashed' into maint-0.2.8 changes/bug18809 | 14 ++ src/or/circuituse.c | 19 +++ src/or/connection.c | 45 ----- src/or/connection.h | 7 - src/or/directory.c | 264 ++++------------------------- src/or/directory.h | 4 - src/or/main.c | 13 +- src/or/microdesc.c | 4 +- src/or/microdesc.h | 2 +- src/or/networkstatus.c | 194 ++++++++-------------- src/or/networkstatus.h | 9 +- src/test/test_connection.c | 405 ++++++++++++++++++++++++++++----------------- src/test/test_dir.c | 153 +++++++++++++++-- src/test/test_routerlist.c | 48 ++++++ 14 files changed, 583 insertions(+), 598 deletions(-)

1 0

[tor/master] Add unit tests for networkstatus_consensus_is_bootstrapping
by nickm＠torproject.org 19 May '16

19 May '16

commit f698b509d8efdc055cfc05c6feaf0aecee41b9d0 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Wed May 18 22:05:35 2016 -0400 Add unit tests for networkstatus_consensus_is_bootstrapping --- src/or/microdesc.c | 4 ++-- src/or/microdesc.h | 2 +- src/test/test_routerlist.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 51 insertions(+), 3 deletions(-) diff --git a/src/or/microdesc.c b/src/or/microdesc.c index 2990429..5b5c29a 100644 --- a/src/or/microdesc.c +++ b/src/or/microdesc.c @@ -955,8 +955,8 @@ we_fetch_router_descriptors(const or_options_t *options) } /** Return the consensus flavor we actually want to use to build circuits. */ -int -usable_consensus_flavor(void) +MOCK_IMPL(int, +usable_consensus_flavor,(void)) { if (we_use_microdescriptors_for_circuits(get_options())) { return FLAV_MICRODESC; diff --git a/src/or/microdesc.h b/src/or/microdesc.h index 0675e23..40c8313 100644 --- a/src/or/microdesc.h +++ b/src/or/microdesc.h @@ -47,7 +47,7 @@ void microdesc_free_all(void); void update_microdesc_downloads(time_t now); void update_microdescs_from_networkstatus(time_t now); -int usable_consensus_flavor(void); +MOCK_DECL(int, usable_consensus_flavor,(void)); int we_fetch_microdescriptors(const or_options_t *options); int we_fetch_router_descriptors(const or_options_t *options); int we_use_microdescriptors_for_circuits(const or_options_t *options); diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index 4976069..2cffa6e 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -15,6 +15,7 @@ #include "container.h" #include "directory.h" #include "dirvote.h" +#include "microdesc.h" #include "networkstatus.h" #include "nodelist.h" #include "policies.h" @@ -190,6 +191,14 @@ construct_consensus(char **consensus_text_md) crypto_pk_free(sign_skey_leg); } +static int mock_usable_consensus_flavor_value = FLAV_NS; + +static int +mock_usable_consensus_flavor(void) +{ + return mock_usable_consensus_flavor_value; +} + static void test_router_pick_directory_server_impl(void *arg) { @@ -209,6 +218,22 @@ test_router_pick_directory_server_impl(void *arg) (void)arg; + MOCK(usable_consensus_flavor, mock_usable_consensus_flavor); + + /* With no consensus, we must be bootstrapping, regardless of time or flavor + */ + mock_usable_consensus_flavor_value = FLAV_NS; + tt_assert(networkstatus_consensus_is_bootstrapping(now)); + tt_assert(networkstatus_consensus_is_bootstrapping(now + 2000)); + tt_assert(networkstatus_consensus_is_bootstrapping(now + 2*24*60*60)); + tt_assert(networkstatus_consensus_is_bootstrapping(now - 2*24*60*60)); + + mock_usable_consensus_flavor_value = FLAV_MICRODESC; + tt_assert(networkstatus_consensus_is_bootstrapping(now)); + tt_assert(networkstatus_consensus_is_bootstrapping(now + 2000)); + tt_assert(networkstatus_consensus_is_bootstrapping(now + 2*24*60*60)); + tt_assert(networkstatus_consensus_is_bootstrapping(now - 2*24*60*60)); + /* No consensus available, fail early */ rs = router_pick_directory_server_impl(V3_DIRINFO, (const int) 0, NULL); tt_assert(rs == NULL); @@ -223,6 +248,28 @@ test_router_pick_directory_server_impl(void *arg) tt_int_op(smartlist_len(con_md->routerstatus_list), ==, 3); tt_assert(!networkstatus_set_current_consensus_from_ns(con_md, "microdesc")); + + /* If the consensus time or flavor doesn't match, we are still + * bootstrapping */ + mock_usable_consensus_flavor_value = FLAV_NS; + tt_assert(networkstatus_consensus_is_bootstrapping(now)); + tt_assert(networkstatus_consensus_is_bootstrapping(now + 2000)); + tt_assert(networkstatus_consensus_is_bootstrapping(now + 2*24*60*60)); + tt_assert(networkstatus_consensus_is_bootstrapping(now - 2*24*60*60)); + + /* With a valid consensus for the current time and flavor, we stop + * bootstrapping, even if we have no certificates */ + mock_usable_consensus_flavor_value = FLAV_MICRODESC; + tt_assert(!networkstatus_consensus_is_bootstrapping(now + 2000)); + tt_assert(!networkstatus_consensus_is_bootstrapping(con_md->valid_after)); + tt_assert(!networkstatus_consensus_is_bootstrapping(con_md->valid_until)); + tt_assert(!networkstatus_consensus_is_bootstrapping(con_md->valid_until + + 24*60*60)); + /* These times are outside the test validity period */ + tt_assert(networkstatus_consensus_is_bootstrapping(now)); + tt_assert(networkstatus_consensus_is_bootstrapping(now + 2*24*60*60)); + tt_assert(networkstatus_consensus_is_bootstrapping(now - 2*24*60*60)); + nodelist_set_consensus(con_md); nodelist_assert_ok(); @@ -362,6 +409,7 @@ test_router_pick_directory_server_impl(void *arg) node_router1->rs->last_dir_503_at = 0; done: + UNMOCK(usable_consensus_flavor); if (router1_id) tor_free(router1_id); if (router2_id)

1 0

[tor/master] 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