소스 검색

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.
teor 8 년 전
부모
커밋
518ef61975
2개의 변경된 파일5개의 추가작업 그리고 3개의 파일을 삭제
  1. 3 1
      changes/bug20711
  2. 2 2
      src/or/directory.c

+ 3 - 1
changes/bug20711

@@ -2,4 +2,6 @@
     - Allow relays to use directory mirrors without a DirPort: these relays
     - Allow relays to use directory mirrors without a DirPort: these relays
       need to be contacted over their ORPorts using a begindir connection.
       need to be contacted over their ORPorts using a begindir connection.
       Fixes bug 20711; bugfix on 0.2.8.2-alpha.
       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.

+ 2 - 2
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)) {
   if (!port || tor_addr_is_null(&addr)) {
     static int logged_backtrace = 0;
     static int logged_backtrace = 0;
     log_warn(LD_DIR,
     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 ? "begindir " : "",
-             use_begindir ? "an OR" : "a Dir");
+             use_begindir ? "OR" : "Dir");
     if (!logged_backtrace) {
     if (!logged_backtrace) {
       log_backtrace(LOG_INFO, LD_BUG, "Address came from");
       log_backtrace(LOG_INFO, LD_BUG, "Address came from");
       logged_backtrace = 1;
       logged_backtrace = 1;