From 23ed3c97862e405002ff5a672e33386fbb59a3ae Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Mon, 22 Aug 2005 22:58:38 +0000 Subject: [PATCH] whoops, avoid printing a null string sometimes svn:r4815 --- src/or/circuitbuild.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 180452f905..900870ccb9 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -535,13 +535,16 @@ circuit_send_next_onion_skin(circuit_t *circ) log(LOG_NOTICE,"Tor has successfully opened a circuit. Looks like it's working."); if (server_mode(options) && !check_whether_orport_reachable()) { char dirbuf[128]; - if (options->DirPort) - tor_snprintf(dirbuf, sizeof(dirbuf), " and DirPort %s:%d ", - options->Address, options->DirPort); - log(LOG_NOTICE,"Now checking whether ORPort %s:%d%s%s reachable... (this may take several minutes)", - options->Address, options->ORPort, - options->DirPort ? dirbuf : "", - options->DirPort ? "are" : "is"); + routerinfo_t *me = router_get_my_routerinfo(); + if (me) { + if (me->dir_port) + tor_snprintf(dirbuf, sizeof(dirbuf), " and DirPort %s:%d", + me->address, me->dir_port); + log(LOG_NOTICE,"Now checking whether ORPort %s:%d%s %s reachable... (this may take several minutes)", + me->address, me->or_port, + me->dir_port ? dirbuf : "", + me->dir_port ? "are" : "is"); + } } } circuit_rep_hist_note_result(circ);