nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

whoops, avoid printing a null string sometimes

Browse Source 
svn:r4815
This commit is contained in:
Roger Dingledine 2005-08-22 22:58:38 +00:00
parent 676b330eb2
commit 23ed3c9786
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/or/circuitbuild.c
View File

@ -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."); log(LOG_NOTICE,"Tor has successfully opened a circuit. Looks like it's working.");
if (server_mode(options) && !check_whether_orport_reachable()) { if (server_mode(options) && !check_whether_orport_reachable()) {
char dirbuf[128]; char dirbuf[128];
if (options->DirPort) routerinfo_t *me = router_get_my_routerinfo();
tor_snprintf(dirbuf, sizeof(dirbuf), " and DirPort %s:%d ", if (me) {
options->Address, options->DirPort); if (me->dir_port)
log(LOG_NOTICE,"Now checking whether ORPort %s:%d%s%s reachable... (this may take several minutes)", tor_snprintf(dirbuf, sizeof(dirbuf), " and DirPort %s:%d",
options->Address, options->ORPort, me->address, me->dir_port);
options->DirPort ? dirbuf : "", log(LOG_NOTICE,"Now checking whether ORPort %s:%d%s %s reachable... (this may take several minutes)",
options->DirPort ? "are" : "is"); me->address, me->or_port,
me->dir_port ? dirbuf : "",
me->dir_port ? "are" : "is");
}
} }
} }
circuit_rep_hist_note_result(circ); circuit_rep_hist_note_result(circ);