Clarify the message logged when a remote relay is unexpectedly missing a port

(Users were confusing this with a local port.)

Fixes bug 20711; bugfix on 0.2.8.2-alpha.

diff --git a/changes/bug20711 b/changes/bug20711
index 01a1ad7087042f9ab4212dd4263d3db16dcc85d6..0bc0d94fb1aa66afe4ad28dda21d51d273b879cd 100644 (file)
--- a/changes/bug20711
+++ b/changes/bug20711
@@ -2,4 +2,6 @@
     - Allow relays to use directory mirrors without a DirPort: these relays
       need to be contacted over their ORPorts using a begindir connection.
       Fixes bug 20711; bugfix on 0.2.8.2-alpha.
-
+    - Clarify the message logged when a remote relay is unexpectedly missing
+      an ORPort or DirPort: users were confusing this with a local port.
+      Fixes bug 20711; bugfix on 0.2.8.2-alpha.

diff --git a/src/or/directory.c b/src/or/directory.c
index a39fc3b643992613972feb6eeefc6a6870ca7a44..38bd5f9fa4cb2b3e0a8beee01cd08f65c4cfdc6c 100644 (file)
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -1245,9 +1245,9 @@ directory_initiate_command_rend(const tor_addr_port_t *or_addr_port,
   if (!port || tor_addr_is_null(&addr)) {
     static int logged_backtrace = 0;
     log_warn(LD_DIR,
-             "Cannot make an outgoing %sconnection without %sPort.",
+             "Cannot make an outgoing %sconnection without a remote %sPort.",
              use_begindir ? "begindir " : "",
-             use_begindir ? "an OR" : "a Dir");
+             use_begindir ? "OR" : "Dir");
     if (!logged_backtrace) {
       log_backtrace(LOG_INFO, LD_BUG, "Address came from");
       logged_backtrace = 1;