aboutsummaryrefslogtreecommitdiff
path: root/src/feature/relay/relay_periodic.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2020-06-09 15:44:58 -0400
committerNick Mathewson <nickm@torproject.org>2020-06-09 15:44:58 -0400
commit354f085e5f14c2bb4918b015e36cdc72748e0ea6 (patch)
tree0467dc89507ca7e7cc6a5f109332d693ed6a139a /src/feature/relay/relay_periodic.c
parenteaae5625cb1c5fdd26c766157742725aa4b7ad9e (diff)
parent1df451aba116f77a5a24e4e54cf343ec46d55f9a (diff)
downloadtor-354f085e5f14c2bb4918b015e36cdc72748e0ea6.tar.gz
tor-354f085e5f14c2bb4918b015e36cdc72748e0ea6.zip
Merge remote-tracking branch 'tor-github/pr/1888/head'
Diffstat (limited to 'src/feature/relay/relay_periodic.c')
-rw-r--r--src/feature/relay/relay_periodic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/feature/relay/relay_periodic.c b/src/feature/relay/relay_periodic.c
index 08ad110cf6..6a92f49d2e 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_should_skip_orport_reachability_check(options)) {
char *address = tor_dup_ip(me->addr);
if (address) {
log_warn(LD_CONFIG,
@@ -217,7 +217,7 @@ reachability_warnings_callback(time_t now, const or_options_t *options)
}
}
- if (me && !check_whether_dirport_reachable(options)) {
+ if (me && !router_should_skip_dirport_reachability_check(options)) {
char *address = tor_dup_ip(me->addr);
if (address) {
log_warn(LD_CONFIG,