summaryrefslogtreecommitdiff
path: root/src/or/circuitbuild.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-08-22 05:46:02 +0000
committerRoger Dingledine <arma@torproject.org>2005-08-22 05:46:02 +0000
commit435d2d8fdef51bf3ce6456c2d22d7a10000918f4 (patch)
treefb5045e0fe03108e0e690b76d8dc03b8a84be254 /src/or/circuitbuild.c
parentd928411acd93a9d389b06d530dcae1e1d333d05f (diff)
downloadtor-435d2d8fdef51bf3ce6456c2d22d7a10000918f4.tar.gz
tor-435d2d8fdef51bf3ce6456c2d22d7a10000918f4.zip
when we begin reachability testing, log the address:port for each
port we're testing, so people are more likely to notice that they're using the wrong ip address. svn:r4808
Diffstat (limited to 'src/or/circuitbuild.c')
-rw-r--r--src/or/circuitbuild.c14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c
index c905e93567..180452f905 100644
--- a/src/or/circuitbuild.c
+++ b/src/or/circuitbuild.c
@@ -531,12 +531,18 @@ circuit_send_next_onion_skin(circuit_t *circ)
if (!has_completed_circuit) {
or_options_t *options = get_options();
has_completed_circuit=1;
- log(LOG_NOTICE,"Tor has successfully opened a circuit. Looks like it's working.");
/* XXX009 Log a count of known routers here */
- if (server_mode(options) && !check_whether_orport_reachable())
- log(LOG_NOTICE,"Now checking whether ORPort %s%s reachable... (this may take several minutes)",
- options->DirPort ? "and DirPort " : "",
+ 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");
+ }
}
circuit_rep_hist_note_result(circ);
circuit_has_opened(circ); /* do other actions as necessary */