diff options
author | Nick Mathewson <nickm@torproject.org> | 2020-06-24 13:25:49 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2020-06-24 13:25:49 -0400 |
commit | 636cf9763a7a0406c15ff9fc7f068aa574d22e5f (patch) | |
tree | 7f504f7abd6a50735161f90303a98df683fd1979 /src/feature/relay/selftest.c | |
parent | bc50f082bd3a84156dd12db9e2186fd083b216c1 (diff) | |
download | tor-636cf9763a7a0406c15ff9fc7f068aa574d22e5f.tar.gz tor-636cf9763a7a0406c15ff9fc7f068aa574d22e5f.zip |
Replace router_should_skip_*() identifiers.
These identifiers are confusing and unreadable. I think these
replacements should be better. Closes ticket #40012.
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
router_should_skip_orport_reachability_check_family router_orport_seems_reachable \
router_should_skip_dirport_reachability_check router_dirport_seems_reachable \
router_should_skip_dirport_reachability_check router_all_orports_seem_reachable
Diffstat (limited to 'src/feature/relay/selftest.c')
-rw-r--r-- | src/feature/relay/selftest.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 12ce8e8bfd..71054e6e87 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -86,7 +86,7 @@ router_reachability_checks_disabled(const or_options_t *options) * orport checks. */ int -router_should_skip_orport_reachability_check_family( +router_orport_seems_reachable( const or_options_t *options, int family) { @@ -124,7 +124,7 @@ router_should_skip_orport_reachability_check_family( * - the network is disabled. */ int -router_should_skip_dirport_reachability_check(const or_options_t *options) +router_dirport_seems_reachable(const or_options_t *options) { int reach_checks_disabled = router_reachability_checks_disabled(options) || !options->DirPort_set; @@ -308,9 +308,9 @@ 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_v4 = - router_should_skip_orport_reachability_check_family(options, AF_INET); + router_orport_seems_reachable(options, AF_INET); int orport_reachable_v6 = - router_should_skip_orport_reachability_check_family(options, AF_INET6); + router_orport_seems_reachable(options, AF_INET6); if (router_should_check_reachability(test_or, test_dir)) { bool need_testing = !circuit_enough_testing_circs(); @@ -325,7 +325,7 @@ router_do_reachability_checks(int test_or, int test_dir) router_do_orport_reachability_checks(me, AF_INET6, orport_reachable_v6); } - if (test_dir && !router_should_skip_dirport_reachability_check(options)) { + if (test_dir && !router_dirport_seems_reachable(options)) { router_do_dirport_reachability_checks(me); } } @@ -407,7 +407,7 @@ static bool ready_to_publish(const or_options_t *options) { return options->PublishServerDescriptor_ != NO_DIRINFO && - router_should_skip_dirport_reachability_check(options) && + router_dirport_seems_reachable(options) && router_should_skip_orport_reachability_check(options); } |