diff options
| author | teor <teor@torproject.org> | 2020-04-30 15:11:50 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2020-04-30 15:58:37 +1000 |
| commit | c5ee3d7eb8c337703498b8c41b0c286ddd3cf9b4 (patch) | |
| tree | ce7c835c3b1a26dc272f709896eba92e4288722f /src/feature/control | |
| parent | a202f03c64c7655fcc8d3fa72bc39deeac198687 (diff) | |
| download | tor-c5ee3d7eb8c337703498b8c41b0c286ddd3cf9b4.tar.gz tor-c5ee3d7eb8c337703498b8c41b0c286ddd3cf9b4.zip | |
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.
Diffstat (limited to 'src/feature/control')
| -rw-r--r-- | src/feature/control/control_getinfo.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c index 5dcc4b170d..d80d5a73f9 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/")) { |