June 2020 - tor-commits - lists.torproject.org

[tor/master] Bug 30992: Update tests
by asn＠torproject.org 10 Jun '20

10 Jun '20

commit 1300e6a5124831aaa9c6e6134e154f1ededeb3db Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Mon Jun 8 19:22:46 2020 -0500 Bug 30992: Update tests --- src/test/test_circuitpadding.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/test_circuitpadding.c b/src/test/test_circuitpadding.c index cfb24c032..3e3a59dc9 100644 --- a/src/test/test_circuitpadding.c +++ b/src/test/test_circuitpadding.c @@ -1361,7 +1361,7 @@ test_circuitpadding_wronghop(void *arg) /* 5. Test that asking to stop the wrong machine does nothing */ circpad_negotiate_padding(TO_ORIGIN_CIRCUIT(client_side), - 255, 2, CIRCPAD_COMMAND_STOP); + 255, 2, CIRCPAD_COMMAND_STOP, 0); tt_ptr_op(client_side->padding_machine[0], OP_NE, NULL); tt_ptr_op(client_side->padding_info[0], OP_NE, NULL); tt_ptr_op(relay_side->padding_machine[0], OP_NE, NULL); @@ -1409,7 +1409,7 @@ test_circuitpadding_wronghop(void *arg) circpad_padding_negotiated(relay_side, CIRCPAD_MACHINE_CIRC_SETUP, CIRCPAD_COMMAND_START, - CIRCPAD_RESPONSE_OK); + CIRCPAD_RESPONSE_OK, 0); /* verify no padding was negotiated */ tt_ptr_op(relay_side->padding_machine[0], OP_EQ, NULL); @@ -1418,7 +1418,7 @@ test_circuitpadding_wronghop(void *arg) circpad_padding_negotiated(relay_side, CIRCPAD_MACHINE_CIRC_SETUP, CIRCPAD_COMMAND_START, - CIRCPAD_RESPONSE_ERR); + CIRCPAD_RESPONSE_ERR, 0); /* verify no padding was negotiated */ tt_ptr_op(relay_side->padding_machine[0], OP_EQ, NULL); @@ -1521,7 +1521,7 @@ test_circuitpadding_negotiation(void *arg) /* Force negotiate padding. */ circpad_negotiate_padding(TO_ORIGIN_CIRCUIT(client_side), CIRCPAD_MACHINE_CIRC_SETUP, - 2, CIRCPAD_COMMAND_START); + 2, CIRCPAD_COMMAND_START, 0); /* verify no padding was negotiated */ tt_ptr_op(relay_side->padding_machine[0], OP_EQ, NULL);

1 0

[tor/maint-0.4.4] Remove "enable_practracker_in_hooks" for 0.4.4.
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit fc16dbf7aa1a45a04f801a6a3aaf89cc3b117607 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 9 15:47:25 2020 -0400 Remove "enable_practracker_in_hooks" for 0.4.4. --- scripts/maint/practracker/.enable_practracker_in_hooks | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/maint/practracker/.enable_practracker_in_hooks b/scripts/maint/practracker/.enable_practracker_in_hooks deleted file mode 100644 index a9e707f5d..000000000 --- a/scripts/maint/practracker/.enable_practracker_in_hooks +++ /dev/null @@ -1 +0,0 @@ -This file is present to tell our git hooks to run practracker on this branch.

1 0

[tor/master] Merge branch 'maint-0.4.4'
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit 1e230bd48835fd5587f3b45f1b5fe1891281a267 Merge: 354f085e5 fc16dbf7a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 9 15:47:44 2020 -0400 Merge branch 'maint-0.4.4' ("Ours" to avoid removal of .enable_practracker_in_hooks)

1 0

[tor/release-0.4.4] Remove "enable_practracker_in_hooks" for 0.4.4.
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit fc16dbf7aa1a45a04f801a6a3aaf89cc3b117607 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 9 15:47:25 2020 -0400 Remove "enable_practracker_in_hooks" for 0.4.4. --- scripts/maint/practracker/.enable_practracker_in_hooks | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/maint/practracker/.enable_practracker_in_hooks b/scripts/maint/practracker/.enable_practracker_in_hooks deleted file mode 100644 index a9e707f5d..000000000 --- a/scripts/maint/practracker/.enable_practracker_in_hooks +++ /dev/null @@ -1 +0,0 @@ -This file is present to tell our git hooks to run practracker on this branch.

1 0

[tor/master] Remove "enable_practracker_in_hooks" for 0.4.4.
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit fc16dbf7aa1a45a04f801a6a3aaf89cc3b117607 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 9 15:47:25 2020 -0400 Remove "enable_practracker_in_hooks" for 0.4.4. --- scripts/maint/practracker/.enable_practracker_in_hooks | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/maint/practracker/.enable_practracker_in_hooks b/scripts/maint/practracker/.enable_practracker_in_hooks deleted file mode 100644 index a9e707f5d..000000000 --- a/scripts/maint/practracker/.enable_practracker_in_hooks +++ /dev/null @@ -1 +0,0 @@ -This file is present to tell our git hooks to run practracker on this branch.

1 0

[tor/master] nodelist: Wrap long lines, and improve comments
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit c32a8243cbb22ce3d89cf083d043ca2d7da14d4a Author: teor <teor(a)torproject.org> Date: Thu Apr 30 14:22:59 2020 +1000 nodelist: Wrap long lines, and improve comments Part of 33222. --- src/feature/nodelist/node_select.c | 12 ++++++++---- src/feature/nodelist/routerlist.c | 21 ++++++++++++++++----- src/feature/nodelist/routerlist.h | 6 ++++-- 3 files changed, 28 insertions(+), 11 deletions(-) diff --git a/src/feature/nodelist/node_select.c b/src/feature/nodelist/node_select.c index f1b54b663..da10856f5 100644 --- a/src/feature/nodelist/node_select.c +++ b/src/feature/nodelist/node_select.c @@ -321,8 +321,10 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, overloaded_direct = smartlist_new(); overloaded_tunnel = smartlist_new(); - const int skip_or_fw = router_connect_assume_or_reachable(options, try_ip_pref); - const int skip_dir_fw = router_connect_assume_dir_reachable(options, try_ip_pref); + const int skip_or_fw = router_connect_assume_or_reachable(options, + try_ip_pref); + const int skip_dir_fw = router_connect_assume_dir_reachable(options, + try_ip_pref); const int must_have_or = dirclient_must_use_begindir(options); /* Find all the running dirservers we know about. */ @@ -1120,8 +1122,10 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, overloaded_direct = smartlist_new(); overloaded_tunnel = smartlist_new(); - const int skip_or_fw = router_connect_assume_or_reachable(options, try_ip_pref); - const int skip_dir_fw = router_connect_assume_dir_reachable(options, try_ip_pref); + const int skip_or_fw = router_connect_assume_or_reachable(options, + try_ip_pref); + const int skip_dir_fw = router_connect_assume_dir_reachable(options, + try_ip_pref); const int must_have_or = dirclient_must_use_begindir(options); SMARTLIST_FOREACH_BEGIN(sourcelist, const dir_server_t *, d) diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 1cc813f17..df94e1dce 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -465,11 +465,19 @@ router_reload_router_list(void) return 0; } -/* When iterating through the routerlist, can OR address/port preference - * and reachability checks be skipped? +/* When selecting a router for a direct connection, can OR address/port + * preference and reachability checks be skipped? + * + * Servers never check ReachableAddresses or ClientPreferIPv6. Returns + * true for servers. + * + * Otherwise, if <b>try_ip_pref</b> is true, returns false. Used to make + * clients check ClientPreferIPv6, even if ReachableAddresses is not set. + * Finally, return true if ReachableAddresses is set. */ int -router_connect_assume_or_reachable(const or_options_t *options, int try_ip_pref) +router_connect_assume_or_reachable(const or_options_t *options, + int try_ip_pref) { /* Servers always have and prefer IPv4. * And if clients are checking against the firewall for reachability only, @@ -477,11 +485,14 @@ router_connect_assume_or_reachable(const or_options_t *options, int try_ip_pref) return server_mode(options) || (!try_ip_pref && !firewall_is_fascist_or()); } -/* When iterating through the routerlist, can Dir address/port preference +/* When selecting a router for a direct connection, can Dir address/port * and reachability checks be skipped? + * + * This function is obsolete, because clients only use ORPorts. */ int -router_connect_assume_dir_reachable(const or_options_t *options, int try_ip_pref) +router_connect_assume_dir_reachable(const or_options_t *options, + int try_ip_pref) { /* Servers always have and prefer IPv4. * And if clients are checking against the firewall for reachability only, diff --git a/src/feature/nodelist/routerlist.h b/src/feature/nodelist/routerlist.h index 56109374f..78d8bfc64 100644 --- a/src/feature/nodelist/routerlist.h +++ b/src/feature/nodelist/routerlist.h @@ -50,8 +50,10 @@ typedef enum was_router_added_t { int router_reload_router_list(void); -int router_connect_assume_or_reachable(const or_options_t *options, int try_ip_pref); -int router_connect_assume_dir_reachable(const or_options_t *options, int try_ip_pref); +int router_connect_assume_or_reachable(const or_options_t *options, + int try_ip_pref); +int router_connect_assume_dir_reachable(const or_options_t *options, + int try_ip_pref); void router_reset_status_download_failures(void); int routers_have_same_or_addrs(const routerinfo_t *r1, const routerinfo_t *r2); void router_add_running_nodes_to_smartlist(smartlist_t *sl, int need_uptime,

1 0

[tor/master] relay: Clarify reachability status check functions
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit c5ee3d7eb8c337703498b8c41b0c286ddd3cf9b4 Author: teor <teor(a)torproject.org> Date: Thu Apr 30 15:11:50 2020 +1000 relay: Clarify reachability status check functions This is an automated commit, generated by this command: ./scripts/maint/rename_c_identifier.py \ check_whether_orport_reachable router_skip_orport_reachability_check \ check_whether_dirport_reachable router_skip_dirport_reachability_check It was generated with --no-verify, so it probably breaks some commit hooks. The commiter should be sure to fix them up in a subsequent commit. Part of 33222. --- src/core/or/circuitbuild.c | 2 +- src/core/or/circuituse.c | 4 ++-- src/feature/control/control_getinfo.c | 8 ++++---- src/feature/relay/relay_periodic.c | 4 ++-- src/feature/relay/router.c | 4 ++-- src/feature/relay/selftest.c | 12 ++++++------ src/feature/relay/selftest.h | 8 ++++---- src/feature/stats/predict_ports.c | 4 ++-- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index 0381a4dc3..0d51369e7 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -1050,7 +1050,7 @@ circuit_build_no_more_hops(origin_circuit_t *circ) control_event_bootstrap(BOOTSTRAP_STATUS_DONE, 0); control_event_client_status(LOG_NOTICE, "CIRCUIT_ESTABLISHED"); clear_broken_connection_map(1); - if (server_mode(options) && !check_whether_orport_reachable(options)) { + if (server_mode(options) && !router_skip_orport_reachability_check(options)) { inform_testing_reachability(); router_do_reachability_checks(1, 1); } diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 066d5d437..51e328133 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -1641,7 +1641,7 @@ static void circuit_testing_opened(origin_circuit_t *circ) { if (have_performed_bandwidth_test || - !check_whether_orport_reachable(get_options())) { + !router_skip_orport_reachability_check(get_options())) { /* either we've already done everything we want with testing circuits, * or this testing circuit became open due to a fluke, e.g. we picked * a last hop where we already had the connection open due to an @@ -1659,7 +1659,7 @@ static void circuit_testing_failed(origin_circuit_t *circ, int at_last_hop) { const or_options_t *options = get_options(); - if (server_mode(options) && check_whether_orport_reachable(options)) + if (server_mode(options) && router_skip_orport_reachability_check(options)) return; log_info(LD_GENERAL, diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c index 5dcc4b170..d80d5a73f 100644 --- a/src/feature/control/control_getinfo.c +++ b/src/feature/control/control_getinfo.c @@ -1276,15 +1276,15 @@ getinfo_helper_events(control_connection_t *control_conn, *answer = tor_strdup(directories_have_accepted_server_descriptor() ? "1" : "0"); } else if (!strcmp(question, "status/reachability-succeeded/or")) { - *answer = tor_strdup(check_whether_orport_reachable(options) ? + *answer = tor_strdup(router_skip_orport_reachability_check(options) ? "1" : "0"); } else if (!strcmp(question, "status/reachability-succeeded/dir")) { - *answer = tor_strdup(check_whether_dirport_reachable(options) ? + *answer = tor_strdup(router_skip_dirport_reachability_check(options) ? "1" : "0"); } else if (!strcmp(question, "status/reachability-succeeded")) { tor_asprintf(answer, "OR=%d DIR=%d", - check_whether_orport_reachable(options) ? 1 : 0, - check_whether_dirport_reachable(options) ? 1 : 0); + router_skip_orport_reachability_check(options) ? 1 : 0, + router_skip_dirport_reachability_check(options) ? 1 : 0); } else if (!strcmp(question, "status/bootstrap-phase")) { *answer = control_event_boot_last_msg(); } else if (!strcmpstart(question, "status/version/")) { diff --git a/src/feature/relay/relay_periodic.c b/src/feature/relay/relay_periodic.c index b751323e0..c8b6a7d80 100644 --- a/src/feature/relay/relay_periodic.c +++ b/src/feature/relay/relay_periodic.c @@ -201,7 +201,7 @@ reachability_warnings_callback(time_t now, const or_options_t *options) have_completed_a_circuit()) { /* every 20 minutes, check and complain if necessary */ const routerinfo_t *me = router_get_my_routerinfo(); - if (me && !check_whether_orport_reachable(options)) { + if (me && !router_skip_orport_reachability_check(options)) { char *address = tor_dup_ip(me->addr); log_warn(LD_CONFIG,"Your server (%s:%d) has not managed to confirm that " "its ORPort is reachable. Relays do not publish descriptors " @@ -214,7 +214,7 @@ reachability_warnings_callback(time_t now, const or_options_t *options) tor_free(address); } - if (me && !check_whether_dirport_reachable(options)) { + if (me && !router_skip_dirport_reachability_check(options)) { char *address = tor_dup_ip(me->addr); log_warn(LD_CONFIG, "Your server (%s:%d) has not managed to confirm that its " diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 2858371af..ebe656590 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -1361,14 +1361,14 @@ decide_if_publishable_server(void) return 1; if (!router_get_advertised_or_port(options)) return 0; - if (!check_whether_orport_reachable(options)) + if (!router_skip_orport_reachability_check(options)) return 0; if (router_have_consensus_path() == CONSENSUS_PATH_INTERNAL) { /* All set: there are no exits in the consensus (maybe this is a tiny * test network), so we can't check our DirPort reachability. */ return 1; } else { - return check_whether_dirport_reachable(options); + return router_skip_dirport_reachability_check(options); } } diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 0088ce019..3b938d750 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -70,7 +70,7 @@ router_reachability_checks_disabled(const or_options_t *options) * - the network is disabled. */ int -check_whether_orport_reachable(const or_options_t *options) +router_skip_orport_reachability_check(const or_options_t *options) { int reach_checks_disabled = router_reachability_checks_disabled(options); return reach_checks_disabled || @@ -87,7 +87,7 @@ check_whether_orport_reachable(const or_options_t *options) * - the network is disabled. */ int -check_whether_dirport_reachable(const or_options_t *options) +router_skip_dirport_reachability_check(const or_options_t *options) { int reach_checks_disabled = router_reachability_checks_disabled(options) || !options->DirPort_set; @@ -171,7 +171,7 @@ router_do_reachability_checks(int test_or, int test_dir) { const routerinfo_t *me = router_get_my_routerinfo(); const or_options_t *options = get_options(); - int orport_reachable = check_whether_orport_reachable(options); + int orport_reachable = router_skip_orport_reachability_check(options); tor_addr_t addr; if (router_should_check_reachability(test_or, test_dir)) { @@ -188,7 +188,7 @@ router_do_reachability_checks(int test_or, int test_dir) /* XXX IPv6 self testing */ tor_addr_from_ipv4h(&addr, me->addr); - if (test_dir && !check_whether_dirport_reachable(options) && + if (test_dir && !router_skip_dirport_reachability_check(options) && !connection_get_by_type_addr_port_purpose( CONN_TYPE_DIR, &addr, me->dir_port, DIR_PURPOSE_FETCH_SERVERDESC)) { @@ -258,7 +258,7 @@ router_orport_found_reachable(void) log_notice(LD_OR,"Self-testing indicates your ORPort is reachable from " "the outside. Excellent.%s", options->PublishServerDescriptor_ != NO_DIRINFO - && check_whether_dirport_reachable(options) ? + && router_skip_dirport_reachability_check(options) ? " Publishing server descriptor." : ""); can_reach_or_port = 1; mark_my_descriptor_dirty("ORPort found reachable"); @@ -285,7 +285,7 @@ router_dirport_found_reachable(void) log_notice(LD_DIRSERV,"Self-testing indicates your DirPort is reachable " "from the outside. Excellent.%s", options->PublishServerDescriptor_ != NO_DIRINFO - && check_whether_orport_reachable(options) ? + && router_skip_orport_reachability_check(options) ? " Publishing server descriptor." : ""); can_reach_dir_port = 1; if (router_should_advertise_dirport(options, me->dir_port)) { diff --git a/src/feature/relay/selftest.h b/src/feature/relay/selftest.h index f5babc95d..ce30d92a2 100644 --- a/src/feature/relay/selftest.h +++ b/src/feature/relay/selftest.h @@ -15,8 +15,8 @@ #ifdef HAVE_MODULE_RELAY struct or_options_t; -int check_whether_orport_reachable(const struct or_options_t *options); -int check_whether_dirport_reachable(const struct or_options_t *options); +int router_skip_orport_reachability_check(const struct or_options_t *options); +int router_skip_dirport_reachability_check(const struct or_options_t *options); void router_do_reachability_checks(int test_or, int test_dir); void router_perform_bandwidth_test(int num_circs, time_t now); @@ -29,9 +29,9 @@ void router_reset_reachability(void); #else /* !defined(HAVE_MODULE_RELAY) */ -#define check_whether_orport_reachable(opts) \ +#define router_skip_orport_reachability_check(opts) \ ((void)(opts), 0) -#define check_whether_dirport_reachable(opts) \ +#define router_skip_dirport_reachability_check(opts) \ ((void)(opts), 0) static inline void diff --git a/src/feature/stats/predict_ports.c b/src/feature/stats/predict_ports.c index d728f106a..4cb576c7c 100644 --- a/src/feature/stats/predict_ports.c +++ b/src/feature/stats/predict_ports.c @@ -270,10 +270,10 @@ rep_hist_circbuilding_dormant(time_t now) /* see if we'll still need to build testing circuits */ if (server_mode(options) && - (!check_whether_orport_reachable(options) || + (!router_skip_orport_reachability_check(options) || !circuit_enough_testing_circs())) return 0; - if (!check_whether_dirport_reachable(options)) + if (!router_skip_dirport_reachability_check(options)) return 0; return 1;

1 0

[tor/master] relay: Wrap long lines
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit d1c52e585b1d277b262303a6a73300ada18159ce Author: teor <teor(a)torproject.org> Date: Thu Apr 30 15:08:02 2020 +1000 relay: Wrap long lines Part of 33222. --- src/core/or/circuitbuild.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index 0d51369e7..75581abd3 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -1050,7 +1050,8 @@ circuit_build_no_more_hops(origin_circuit_t *circ) control_event_bootstrap(BOOTSTRAP_STATUS_DONE, 0); control_event_client_status(LOG_NOTICE, "CIRCUIT_ESTABLISHED"); clear_broken_connection_map(1); - if (server_mode(options) && !router_skip_orport_reachability_check(options)) { + if (server_mode(options) && + !router_skip_orport_reachability_check(options)) { inform_testing_reachability(); router_do_reachability_checks(1, 1); }

1 0

[tor/master] nodelist: Distinguish client and relay reachability
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit caab67d0c27ca44344fec05ec445015d9a6c6ff1 Author: teor <teor(a)torproject.org> Date: Thu Apr 30 14:08:04 2020 +1000 nodelist: Distinguish client and relay reachability Change some function names to distinguish between: * client first hop reachability (ReachableAddresses) * relay port reachability self-tests This is an automated commit, generated by this command: ./scripts/maint/rename_c_identifier.py \ router_skip_or_reachability router_connect_assume_or_reachable \ router_skip_dir_reachability router_connect_assume_dir_reachable It was generated with --no-verify, so it probably breaks some commit hooks. The commiter should be sure to fix them up in a subsequent commit. Part of 33222. --- src/feature/nodelist/node_select.c | 8 ++++---- src/feature/nodelist/routerlist.c | 6 +++--- src/feature/nodelist/routerlist.h | 4 ++-- src/feature/relay/selftest.c | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/feature/nodelist/node_select.c b/src/feature/nodelist/node_select.c index e83124841..f1b54b663 100644 --- a/src/feature/nodelist/node_select.c +++ b/src/feature/nodelist/node_select.c @@ -321,8 +321,8 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, overloaded_direct = smartlist_new(); overloaded_tunnel = smartlist_new(); - const int skip_or_fw = router_skip_or_reachability(options, try_ip_pref); - const int skip_dir_fw = router_skip_dir_reachability(options, try_ip_pref); + const int skip_or_fw = router_connect_assume_or_reachable(options, try_ip_pref); + const int skip_dir_fw = router_connect_assume_dir_reachable(options, try_ip_pref); const int must_have_or = dirclient_must_use_begindir(options); /* Find all the running dirservers we know about. */ @@ -1120,8 +1120,8 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, overloaded_direct = smartlist_new(); overloaded_tunnel = smartlist_new(); - const int skip_or_fw = router_skip_or_reachability(options, try_ip_pref); - const int skip_dir_fw = router_skip_dir_reachability(options, try_ip_pref); + const int skip_or_fw = router_connect_assume_or_reachable(options, try_ip_pref); + const int skip_dir_fw = router_connect_assume_dir_reachable(options, try_ip_pref); const int must_have_or = dirclient_must_use_begindir(options); SMARTLIST_FOREACH_BEGIN(sourcelist, const dir_server_t *, d) diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c index 80c1aa689..1cc813f17 100644 --- a/src/feature/nodelist/routerlist.c +++ b/src/feature/nodelist/routerlist.c @@ -469,7 +469,7 @@ router_reload_router_list(void) * and reachability checks be skipped? */ int -router_skip_or_reachability(const or_options_t *options, int try_ip_pref) +router_connect_assume_or_reachable(const or_options_t *options, int try_ip_pref) { /* Servers always have and prefer IPv4. * And if clients are checking against the firewall for reachability only, @@ -481,7 +481,7 @@ router_skip_or_reachability(const or_options_t *options, int try_ip_pref) * and reachability checks be skipped? */ int -router_skip_dir_reachability(const or_options_t *options, int try_ip_pref) +router_connect_assume_dir_reachable(const or_options_t *options, int try_ip_pref) { /* Servers always have and prefer IPv4. * And if clients are checking against the firewall for reachability only, @@ -507,7 +507,7 @@ router_add_running_nodes_to_smartlist(smartlist_t *sl, int need_uptime, int need_desc, int pref_addr, int direct_conn) { - const int check_reach = !router_skip_or_reachability(get_options(), + const int check_reach = !router_connect_assume_or_reachable(get_options(), pref_addr); /* XXXX MOVE */ SMARTLIST_FOREACH_BEGIN(nodelist_get_list(), const node_t *, node) { diff --git a/src/feature/nodelist/routerlist.h b/src/feature/nodelist/routerlist.h index 81a234354..56109374f 100644 --- a/src/feature/nodelist/routerlist.h +++ b/src/feature/nodelist/routerlist.h @@ -50,8 +50,8 @@ typedef enum was_router_added_t { int router_reload_router_list(void); -int router_skip_or_reachability(const or_options_t *options, int try_ip_pref); -int router_skip_dir_reachability(const or_options_t *options, int try_ip_pref); +int router_connect_assume_or_reachable(const or_options_t *options, int try_ip_pref); +int router_connect_assume_dir_reachable(const or_options_t *options, int try_ip_pref); void router_reset_status_download_failures(void); int routers_have_same_or_addrs(const routerinfo_t *r1, const routerinfo_t *r2); void router_add_running_nodes_to_smartlist(smartlist_t *sl, int need_uptime, diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 402ce0e3d..0088ce019 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -137,7 +137,7 @@ extend_info_from_router(const routerinfo_t *r) tor_assert(r); /* Make sure we don't need to check address reachability */ - tor_assert_nonfatal(router_skip_or_reachability(get_options(), 0)); + tor_assert_nonfatal(router_connect_assume_or_reachable(get_options(), 0)); const ed25519_public_key_t *ed_id_key; if (r->cache_info.signing_key_cert)

1 0

[tor/master] practracker: Accept some wrapped long lines
by nickm＠torproject.org 09 Jun '20

09 Jun '20

commit a202f03c64c7655fcc8d3fa72bc39deeac198687 Author: teor <teor(a)torproject.org> Date: Thu Apr 30 15:14:24 2020 +1000 practracker: Accept some wrapped long lines Part of 33222. --- scripts/maint/practracker/exceptions.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index 8f718deff..c0562bb87 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -255,11 +255,11 @@ problem function-size /src/feature/nodelist/microdesc.c:microdesc_cache_rebuild( problem include-count /src/feature/nodelist/networkstatus.c 65 problem function-size /src/feature/nodelist/networkstatus.c:networkstatus_check_consensus_signature() 175 problem function-size /src/feature/nodelist/networkstatus.c:networkstatus_set_current_consensus() 289 -problem function-size /src/feature/nodelist/node_select.c:router_pick_directory_server_impl() 122 +problem function-size /src/feature/nodelist/node_select.c:router_pick_directory_server_impl() 124 problem function-size /src/feature/nodelist/node_select.c:compute_weighted_bandwidths() 204 -problem function-size /src/feature/nodelist/node_select.c:router_pick_trusteddirserver_impl() 112 +problem function-size /src/feature/nodelist/node_select.c:router_pick_trusteddirserver_impl() 114 problem function-size /src/feature/nodelist/nodelist.c:compute_frac_paths_available() 190 -problem file-size /src/feature/nodelist/routerlist.c 3247 +problem file-size /src/feature/nodelist/routerlist.c 3300 problem function-size /src/feature/nodelist/routerlist.c:router_rebuild_store() 148 problem function-size /src/feature/nodelist/routerlist.c:router_add_to_routerlist() 168 problem function-size /src/feature/nodelist/routerlist.c:routerlist_remove_old_routers() 121

1 0