diff options
| author | Roger Dingledine <arma@torproject.org> | 2005-08-22 22:59:54 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2005-08-22 22:59:54 +0000 |
| commit | ab112ca6ad3fe03e67c007220665d29904944c90 (patch) | |
| tree | d2cb950fb0763d62bd62b96d41cd24b1d8d29125 /src/or/main.c | |
| parent | 23ed3c97862e405002ff5a672e33386fbb59a3ae (diff) | |
| download | tor-ab112ca6ad3fe03e67c007220665d29904944c90.tar.gz tor-ab112ca6ad3fe03e67c007220665d29904944c90.zip | |
and don't print the null string here either
svn:r4816
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/or/main.c b/src/or/main.c index 8a0182541f..51142c3581 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -847,12 +847,12 @@ second_elapsed_callback(int fd, short event, void *args) TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT) { /* every 20 minutes, check and complain if necessary */ routerinfo_t *me = router_get_my_routerinfo(); - if (!check_whether_orport_reachable()) + if (me && !check_whether_orport_reachable()) log(LOG_WARN,"Your server (%s:%d) has not managed to confirm that its ORPort is reachable. Please check your firewalls, ports, address, /etc/hosts file, etc.", - me ? me->address : options->Address, options->ORPort); - if (!check_whether_dirport_reachable()) + me->address, me->or_port); + if (me && !check_whether_dirport_reachable()) log(LOG_WARN,"Your server (%s:%d) has not managed to confirm that its DirPort is reachable. Please check your firewalls, ports, address, /etc/hosts file, etc.", - me ? me->address : options->Address, options->DirPort); + me->address me->dir_port); } /* if more than 100s have elapsed, probably the clock jumped: doesn't count. */ |