- tor-commits - lists.torproject.org

[tor/master] Let make_consensus_method_list be used in tests
by nickm＠torproject.org 21 Dec '15

21 Dec '15

commit 21654ca7bd4ef7c7343af03670271e2b02535614 Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed May 27 08:28:33 2015 +0000 Let make_consensus_method_list be used in tests --- src/or/dirvote.c | 3 +-- src/or/dirvote.h | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 0449e9d..b61b33a 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -54,7 +54,6 @@ static int dirvote_perform_vote(void); static void dirvote_clear_votes(int all_votes); static int dirvote_compute_consensuses(void); static int dirvote_publish_consensus(void); -static char *make_consensus_method_list(int low, int high, const char *sep); /* ===== * Voting @@ -564,7 +563,7 @@ consensus_method_is_supported(int method) /** Return a newly allocated string holding the numbers between low and high * (inclusive) that are supported consensus methods. */ -static char * +STATIC char * make_consensus_method_list(int low, int high, const char *separator) { char *list; diff --git a/src/or/dirvote.h b/src/or/dirvote.h index 966d163..cc526ea 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -177,6 +177,7 @@ STATIC char *format_networkstatus_vote(crypto_pk_t *private_key, STATIC char *dirvote_compute_params(smartlist_t *votes, int method, int total_authorities); STATIC char *compute_consensus_package_lines(smartlist_t *votes); +STATIC char *make_consensus_method_list(int low, int high, const char *sep); #endif #endif

1 0

[tor/master] Change dataflow on generating 'dir-cache' flag.
by nickm＠torproject.org 21 Dec '15

21 Dec '15

commit 54406f78b84103ed7fd4610a89dda9d37f0f033e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Nov 3 09:29:31 2015 -0500 Change dataflow on generating 'dir-cache' flag. Convention is that router_dump_router_to_string() should look at its input "router", which should be generated by router_build_fresh_descirptor(). --- src/or/router.c | 3 ++- src/test/test_dir.c | 8 ++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 5e4f855..5c680ce 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1899,6 +1899,7 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) ri->addr = addr; ri->or_port = router_get_advertised_or_port(options); ri->dir_port = router_get_advertised_dir_port(options, 0); + ri->supports_tunnelled_dir_requests = dir_server_mode(options); ri->cache_info.published_on = time(NULL); ri->onion_pkey = crypto_pk_dup_key(get_onion_key()); /* must invoke from * main thread */ @@ -2675,7 +2676,7 @@ router_dump_router_to_string(routerinfo_t *router, tor_free(p6); } - if (dir_server_mode(options)) { + if (router->supports_tunnelled_dir_requests) { smartlist_add(chunks, tor_strdup("tunnelled-dir-server\n")); } diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 97a9200..cf95df5 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -111,6 +111,7 @@ test_dir_formats(void *arg) r1->cache_info.published_on = 0; r1->or_port = 9000; r1->dir_port = 9003; + r1->supports_tunnelled_dir_requests = 1; tor_addr_parse(&r1->ipv6_addr, "1:2:3:4::"); r1->ipv6_orport = 9999; r1->onion_pkey = crypto_pk_dup_key(pk1); @@ -155,6 +156,7 @@ test_dir_formats(void *arg) r2->cache_info.published_on = 5; r2->or_port = 9005; r2->dir_port = 0; + r2->supports_tunnelled_dir_requests = 1; r2->onion_pkey = crypto_pk_dup_key(pk2); curve25519_keypair_t r2_onion_keypair; curve25519_keypair_generate(&r2_onion_keypair, 0); @@ -176,12 +178,9 @@ test_dir_formats(void *arg) options->ContactInfo = tor_strdup("Magri White " "<magri(a)elsewhere.example.com>"); - options->ORPort_set = options->DirPort_set = options->AssumeReachable = 1; buf = router_dump_router_to_string(r1, pk2, NULL, NULL, NULL); tor_free(options->ContactInfo); - /* Reset for later */ - options->ORPort_set = options->DirPort_set = options->AssumeReachable = 0; tt_assert(buf); strlcpy(buf2, "router Magri 192.168.0.1 9000 0 9003\n" @@ -301,8 +300,6 @@ test_dir_formats(void *arg) strlcat(buf2, "tunnelled-dir-server\n", sizeof(buf2)); strlcat(buf2, "router-sig-ed25519 ", sizeof(buf2)); - options->ORPort_set = 1; - buf = router_dump_router_to_string(r2, pk1, pk2, &r2_onion_keypair, &kp2); tt_assert(buf); buf[strlen(buf2)] = '\0'; /* Don't compare the sig; it's never the same @@ -314,7 +311,6 @@ test_dir_formats(void *arg) buf = router_dump_router_to_string(r2, pk1, NULL, NULL, NULL); /* Reset for later */ - options->ORPort_set = 0; cp = buf; rp2 = router_parse_entry_from_string((const char*)cp,NULL,1,0,NULL,NULL); tt_assert(rp2);

1 0

[tor/master] Assert rs are added in con and con_md tests
by nickm＠torproject.org 21 Dec '15

21 Dec '15

commit 6a5528356f41cd71a8cad2c7b66dcd24d177d07b Author: Matthew Finkel <Matthew.Finkel(a)gmail.com> Date: Wed May 27 16:37:10 2015 +0000 Assert rs are added in con and con_md tests --- src/test/test_dir.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index c18b5e8..97a9200 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -1920,12 +1920,20 @@ test_a_networkstatus( /* Check the routerstatuses. */ n_rs = smartlist_len(con->routerstatus_list); + tt_assert(n_rs); for (idx = 0; idx < n_rs; ++idx) { rs = smartlist_get(con->routerstatus_list, idx); tt_assert(rs); rs_test(rs, now); } + n_rs = smartlist_len(con_md->routerstatus_list); + tt_assert(n_rs); + for (idx = 0; idx < n_rs; ++idx) { + rs = smartlist_get(con_md->routerstatus_list, idx); + tt_assert(rs); + } + /* Check signatures. the first voter is a pseudo-entry with a legacy key. * The second one hasn't signed. The fourth one has signed: validate it. */ voter = smartlist_get(con->voters, 1);

1 0

[tor/master] Merge branch 'feature12538_028_01_squashed'
by nickm＠torproject.org 21 Dec '15

21 Dec '15

1 0

[tor/master] Use dir_server_mode() in find_dl_schedule()
by nickm＠torproject.org 21 Dec '15

21 Dec '15

commit ea6f88478cec6b3151a992cf2fd99539997ebb94 Author: David Goulet <dgoulet(a)ev0ke.net> Date: Wed Dec 16 16:32:07 2015 +0100 Use dir_server_mode() in find_dl_schedule() Signed-off-by: David Goulet <dgoulet(a)ev0ke.net> --- src/or/directory.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/or/directory.c b/src/or/directory.c index 31a7860..21abfb1 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -3673,8 +3673,7 @@ connection_dir_finished_connecting(dir_connection_t *conn) static const smartlist_t * find_dl_schedule(download_status_t *dls, const or_options_t *options) { - /* XX/teor Replace with dir_server_mode from #12538 */ - const int dir_server = options->DirPort_set; + 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(

1 0

[tor/master] Restore semantics of advertise vs serve on directory cacheing
by nickm＠torproject.org 21 Dec '15

21 Dec '15

commit 0c8e042c30946faa564f03251bb3663e6204df9a Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Nov 11 13:34:05 2015 -0500 Restore semantics of advertise vs serve on directory cacheing When we are low on accounted bandwidth, we stop advertising that we're a directory, but we will continue to answer directory requests, just as before. --- src/or/router.c | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/src/or/router.c b/src/or/router.c index 5c680ce..c1d970d 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -1099,11 +1099,26 @@ check_whether_dirport_reachable(void) can_reach_dir_port; } -/** The lower threshold of remaining bandwidth required to advertise directory - * services */ +/** The lower threshold of remaining bandwidth required to advertise (or + * automatically provide) directory services */ /* XXX Should this be increased? */ #define MIN_BW_TO_ADVERTISE_DIRSERVER 51200 +/** Return true iff we have enough configured bandwidth to cache directory + * information. */ +static int +router_has_bandwidth_to_be_dirserver(const or_options_t *options) +{ + if (options->BandwidthRate < MIN_BW_TO_ADVERTISE_DIRSERVER) { + return 0; + } + if (options->RelayBandwidthRate > 0 && + options->RelayBandwidthRate < MIN_BW_TO_ADVERTISE_DIRSERVER) { + return 0; + } + return 1; +} + /** Helper: Return 1 if we have sufficient resources for serving directory * requests, return 0 otherwise. * dir_port is either 0 or the configured DirPort number. @@ -1144,9 +1159,7 @@ router_should_be_directory_server(const or_options_t *options, int dir_port) new_choice = 0; reason = "AccountingMax enabled"; } - } else if (options->BandwidthRate < MIN_BW_TO_ADVERTISE_DIRSERVER || - (options->RelayBandwidthRate > 0 && - options->RelayBandwidthRate < MIN_BW_TO_ADVERTISE_DIRSERVER)) { + } else if (! router_has_bandwidth_to_be_dirserver(options)) { /* if we're advertising a small amount */ new_choice = 0; reason = "BandwidthRate under 50KB"; @@ -1178,8 +1191,8 @@ dir_server_mode(const or_options_t *options) { if (!options->DirCache) return 0; - return (server_mode(options) || options->DirPort_set) && - router_should_be_directory_server(options, 0); + return options->DirPort_set || + (server_mode(options) && router_has_bandwidth_to_be_dirserver(options)); } /** Look at a variety of factors, and return 0 if we don't want to @@ -1899,7 +1912,8 @@ router_build_fresh_descriptor(routerinfo_t **r, extrainfo_t **e) ri->addr = addr; ri->or_port = router_get_advertised_or_port(options); ri->dir_port = router_get_advertised_dir_port(options, 0); - ri->supports_tunnelled_dir_requests = dir_server_mode(options); + ri->supports_tunnelled_dir_requests = dir_server_mode(options) && + router_should_be_directory_server(options, ri->dir_port); ri->cache_info.published_on = time(NULL); ri->onion_pkey = crypto_pk_dup_key(get_onion_key()); /* must invoke from * main thread */

1 0

[tor/master] Fix nodelist/node_is_dir test wrt 12538.
by nickm＠torproject.org 21 Dec '15

21 Dec '15

commit a6c9fcc486f3a635b711ab0bea21e0a7494621de Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 18 13:24:23 2015 -0500 Fix nodelist/node_is_dir test wrt 12538. --- src/test/test_nodelist.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_nodelist.c b/src/test/test_nodelist.c index 0a4151a..b0cb87d 100644 --- a/src/test/test_nodelist.c +++ b/src/test/test_nodelist.c @@ -85,7 +85,7 @@ test_nodelist_node_is_dir(void *arg) rs.is_v2_dir = 0; rs.dir_port = 1; - tt_assert(node_is_dir(&node)); + tt_assert(! node_is_dir(&node)); node.rs = NULL; tt_assert(!node_is_dir(&node)); @@ -94,10 +94,10 @@ test_nodelist_node_is_dir(void *arg) tt_assert(node_is_dir(&node)); ri.supports_tunnelled_dir_requests = 0; ri.dir_port = 1; - tt_assert(node_is_dir(&node)); + tt_assert(! node_is_dir(&node)); - done: - return; + done: + return; } #define NODE(name, flags) \

1 0

[tor/master] Fix config/directory_fetch after 12538 merge
by nickm＠torproject.org 21 Dec '15

21 Dec '15

commit f5f35e900987bab063f4f0aea99bf82e03267dc4 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 18 13:36:41 2015 -0500 Fix config/directory_fetch after 12538 merge --- src/test/test_config.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/test/test_config.c b/src/test/test_config.c index 098b0a8..1b9e84d 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -3575,6 +3575,8 @@ test_config_directory_fetch(void *arg) mock_advertised_server_mode_result = 1; mock_router_get_my_routerinfo_result = &routerinfo; + routerinfo.supports_tunnelled_dir_requests = 1; + options->RefuseUnknownExits = 1; tt_assert(server_mode(options) == 1); tt_assert(public_server_mode(options) == 1); @@ -3598,6 +3600,7 @@ test_config_directory_fetch(void *arg) memset(options, 0, sizeof(or_options_t)); options->DirPort_set = 1; options->ORPort_set = 1; + options->DirCache = 1; mock_router_pick_published_address_result = 0; mock_router_my_exit_policy_is_reject_star_result = 1; @@ -3629,6 +3632,7 @@ test_config_directory_fetch(void *arg) mock_advertised_server_mode_result = 1; routerinfo.dir_port = 0; + routerinfo.supports_tunnelled_dir_requests = 0; mock_router_get_my_routerinfo_result = &routerinfo; tt_assert(server_mode(options) == 1); tt_assert(public_server_mode(options) == 1); @@ -3638,6 +3642,7 @@ test_config_directory_fetch(void *arg) mock_advertised_server_mode_result = 1; routerinfo.dir_port = 1; + routerinfo.supports_tunnelled_dir_requests = 1; mock_router_get_my_routerinfo_result = &routerinfo; tt_assert(server_mode(options) == 1); tt_assert(public_server_mode(options) == 1);

1 0

[tor/master] fix routerlist/pick_directory_server_impl in light of 12538
by nickm＠torproject.org 21 Dec '15

21 Dec '15

commit f0a4282e9af25e6c77e6b8a0e59c4aa34e75b9bc Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 18 14:10:03 2015 -0500 fix routerlist/pick_directory_server_impl in light of 12538 --- src/test/test_dir_common.c | 1 + src/test/test_routerlist.c | 2 ++ 2 files changed, 3 insertions(+) diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c index 5c899a9..44ea93b 100644 --- a/src/test/test_dir_common.c +++ b/src/test/test_dir_common.c @@ -143,6 +143,7 @@ dir_common_gen_routerstatus_for_v3ns(int idx, time_t now) rs->addr = 0xC0000203; rs->or_port = 500; rs->dir_port = 1999; + rs->is_v2_dir = 1; /* Running flag (and others) cleared */ break; case 4: diff --git a/src/test/test_routerlist.c b/src/test/test_routerlist.c index d86fe9c..090a607 100644 --- a/src/test/test_routerlist.c +++ b/src/test/test_routerlist.c @@ -241,6 +241,8 @@ test_router_pick_directory_server_impl(void *arg) node_router2 = node_get_mutable_by_id(router2_id); node_router3 = node_get_mutable_by_id(router3_id); + node_router1->is_possible_guard = 1; + node_router1->is_running = 0; node_router3->is_running = 0; rs = router_pick_directory_server_impl(V3_DIRINFO, flags, NULL);

1 0

[tor/master] Merge remote-tracking branch 'public/bug12538_merged'
by nickm＠torproject.org 21 Dec '15

21 Dec '15

1 0