aboutsummaryrefslogtreecommitdiff
path: root/src/feature/control
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-06-26 08:34:56 -0400
committerNick Mathewson <nickm@torproject.org>2020-06-26 08:34:56 -0400
commitdbc2b75009a781f2664b871a6033d47b04946299 (patch)
tree0f9e01d158bb54534233dd2e0792175a057592df /src/feature/control
parent40922629fe92a947ef3d84e71826a5030884cf08 (diff)
parentcb25f5772441e6caed4ae8b84300f32de078fe62 (diff)
downloadtor-dbc2b75009a781f2664b871a6033d47b04946299.tar.gz
tor-dbc2b75009a781f2664b871a6033d47b04946299.zip
Merge branch 'assume_reachable_revamp'
Diffstat (limited to 'src/feature/control')
-rw-r--r--src/feature/control/control_getinfo.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/control/control_getinfo.c b/src/feature/control/control_getinfo.c
index 8d6c314b43..47e0224a90 100644
--- a/src/feature/control/control_getinfo.c
+++ b/src/feature/control/control_getinfo.c
@@ -1279,7 +1279,7 @@ getinfo_helper_events(control_connection_t *control_conn,
? "1" : "0");
} else if (!strcmp(question, "status/reachability-succeeded/or")) {
*answer = tor_strdup(
- router_should_skip_orport_reachability_check(options) ?
+ router_all_orports_seem_reachable(options) ?
"1" : "0");
} else if (!strcmp(question, "status/reachability-succeeded/dir")) {
*answer = tor_strdup(
@@ -1288,7 +1288,7 @@ getinfo_helper_events(control_connection_t *control_conn,
} else if (!strcmp(question, "status/reachability-succeeded")) {
tor_asprintf(
answer, "OR=%d DIR=%d",
- router_should_skip_orport_reachability_check(options) ? 1 : 0,
+ router_all_orports_seem_reachable(options) ? 1 : 0,
router_dirport_seems_reachable(options) ? 1 : 0);
} else if (!strcmp(question, "status/bootstrap-phase")) {
*answer = control_event_boot_last_msg();