aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2016-05-16 17:43:47 -0400
committerRoger Dingledine <arma@torproject.org>2016-05-16 17:43:47 -0400
commit06031b441eb92f575f0a1c2ac264dc0daee4fbf4 (patch)
tree0cac1a1b5e9aa6039674c077ddf51e59be799abd /src/or/main.c
parentb6ba6afa3727693b18ce3b698f59494aa81fe1cb (diff)
downloadtor-06031b441eb92f575f0a1c2ac264dc0daee4fbf4.tar.gz
tor-06031b441eb92f575f0a1c2ac264dc0daee4fbf4.zip
touchups and refactorings on bug 18616 branch
no behavior changes
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/main.c b/src/or/main.c
index a2cf5b1101..86fb2bd46d 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -2094,7 +2094,7 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg)
TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) {
/* every 20 minutes, check and complain if necessary */
const routerinfo_t *me = router_get_my_routerinfo();
- if (me && !check_whether_orport_reachable()) {
+ if (me && !check_whether_orport_reachable(options)) {
char *address = tor_dup_ip(me->addr);
log_warn(LD_CONFIG,"Your server (%s:%d) has not managed to confirm that "
"its ORPort is reachable. Relays do not publish descriptors "
@@ -2107,7 +2107,7 @@ second_elapsed_callback(periodic_timer_t *timer, void *arg)
tor_free(address);
}
- if (me && !check_whether_dirport_reachable()) {
+ if (me && !check_whether_dirport_reachable(options)) {
char *address = tor_dup_ip(me->addr);
log_warn(LD_CONFIG,
"Your server (%s:%d) has not managed to confirm that its "