diff options
| author | Nick Mathewson <nickm@torproject.org> | 2020-06-24 14:39:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2020-06-24 15:25:17 -0400 |
| commit | f9de0affd3f50d411e04bc1229525af2a14927fd (patch) | |
| tree | 4e91733870b862aa6081d7de4530b3db5908ed2a /src/feature/relay | |
| parent | 5c5fb0fcca504d319276a697fec43287e242765d (diff) | |
| download | tor-f9de0affd3f50d411e04bc1229525af2a14927fd.tar.gz tor-f9de0affd3f50d411e04bc1229525af2a14927fd.zip | |
Rename router_should_skip_orport_reachability_check.
This was supposed to happen in #40012, but the command line was wrong.
This is an automated commit, generated by this command:
./scripts/maint/rename_c_identifier.py \
router_should_skip_orport_reachability_check router_all_orports_seem_reachable
Diffstat (limited to 'src/feature/relay')
| -rw-r--r-- | src/feature/relay/router.c | 2 | ||||
| -rw-r--r-- | src/feature/relay/selftest.c | 2 | ||||
| -rw-r--r-- | src/feature/relay/selftest.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 1691ac5f48..1933f61edb 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -1363,7 +1363,7 @@ decide_if_publishable_server(void) return 1; if (!router_get_advertised_or_port(options)) return 0; - if (!router_should_skip_orport_reachability_check(options)) + if (!router_all_orports_seem_reachable(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 diff --git a/src/feature/relay/selftest.c b/src/feature/relay/selftest.c index 71054e6e87..64b8578bac 100644 --- a/src/feature/relay/selftest.c +++ b/src/feature/relay/selftest.c @@ -408,7 +408,7 @@ ready_to_publish(const or_options_t *options) { return options->PublishServerDescriptor_ != NO_DIRINFO && router_dirport_seems_reachable(options) && - router_should_skip_orport_reachability_check(options); + router_all_orports_seem_reachable(options); } /** Annotate that we found our ORPort reachable with a given address diff --git a/src/feature/relay/selftest.h b/src/feature/relay/selftest.h index 9b7005db39..911d8bdc3f 100644 --- a/src/feature/relay/selftest.h +++ b/src/feature/relay/selftest.h @@ -15,7 +15,7 @@ #ifdef HAVE_MODULE_RELAY struct or_options_t; -#define router_should_skip_orport_reachability_check(opts) \ +#define router_all_orports_seem_reachable(opts) \ router_orport_seems_reachable((opts),0) int router_orport_seems_reachable( const struct or_options_t *options, @@ -34,7 +34,7 @@ void router_reset_reachability(void); #else /* !defined(HAVE_MODULE_RELAY) */ -#define router_should_skip_orport_reachability_check(opts) \ +#define router_all_orports_seem_reachable(opts) \ ((void)(opts), 0) #define router_orport_seems_reachable(opts, fam) \ ((void)(opts), (void)(fam), 0) |