diff options
| author | Roger Dingledine <arma@torproject.org> | 2013-02-09 21:10:07 -0500 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2013-02-09 21:10:07 -0500 |
| commit | e1ec03f819b83dc229484fc9a97ea0817ce0926a (patch) | |
| tree | 543e3c3653ca5795e16f5436be259acfe6481c77 /src/or/circuitbuild.c | |
| parent | ccaefd65a4b8a991e81cb4720343000dbc931eb3 (diff) | |
| download | tor-e1ec03f819b83dc229484fc9a97ea0817ce0926a.tar tor-e1ec03f819b83dc229484fc9a97ea0817ce0926a.tar.gz | |
use router->addr for log messages and controller events
(rather than router->address)
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index b9a4f8903..747e7f9c7 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -564,27 +564,30 @@ int inform_testing_reachability(void) { char dirbuf[128]; + char *address; const routerinfo_t *me = router_get_my_routerinfo(); if (!me) return 0; + address = tor_dup_ip(me->addr); control_event_server_status(LOG_NOTICE, "CHECKING_REACHABILITY ORADDRESS=%s:%d", - me->address, me->or_port); + address, me->or_port); if (me->dir_port) { tor_snprintf(dirbuf, sizeof(dirbuf), " and DirPort %s:%d", - me->address, me->dir_port); + address, me->dir_port); control_event_server_status(LOG_NOTICE, "CHECKING_REACHABILITY DIRADDRESS=%s:%d", - me->address, me->dir_port); + address, me->dir_port); } log_notice(LD_OR, "Now checking whether ORPort %s:%d%s %s reachable... " "(this may take up to %d minutes -- look for log " "messages indicating success)", - me->address, me->or_port, + address, me->or_port, me->dir_port ? dirbuf : "", me->dir_port ? "are" : "is", TIMEOUT_UNTIL_UNREACHABILITY_COMPLAINT/60); + tor_free(address); return 1; } |