[or-cvs] when we begin reachability testing, log the address:port fo...

[arma at seul.org]

Update of /home2/or/cvsroot/tor/src/or
In directory moria:/home/arma/work/onion/cvs/tor/src/or

Modified Files:
	circuitbuild.c 
Log Message:
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.


Index: circuitbuild.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/circuitbuild.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -d -r1.135 -r1.136
--- circuitbuild.c	15 Aug 2005 03:25:39 -0000	1.135
+++ circuitbuild.c	22 Aug 2005 05:46:02 -0000	1.136
@@ -531,12 +531,18 @@
       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 */