tor

commit 0ceacb5482848a4029eaf26095619ad09ff22c52
parent d162b98548934f575123ca9bff45b85a9eb2bdf5
Author: Nick Mathewson <nickm@torproject.org>
Date:   Mon, 19 Apr 2021 11:40:44 -0400

Merge branch 'mr_347_squashed' into maint-0.4.6

Diffstat:
A
changes/ticket40290
 | 
3
+++
M
src/app/config/resolve_addr.c
 | 
12
++++++++++++

2 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/changes/ticket40290 b/changes/ticket40290
@@ -0,0 +1,3 @@
+  o Minor bugfix (logging, relay):
+    - Emit a warning if an Address is found to be internal and tor can't use it.
+      Fixes bug 40290; bugfix on 0.4.5.1-alpha.
diff --git a/src/app/config/resolve_addr.c b/src/app/config/resolve_addr.c
@@ -343,6 +343,18 @@ get_address_from_config(const or_options_t *options, int warn_severity,
      * used, custom authorities must be defined else it is a fatal error.
      * Furthermore, if the Address was resolved to an internal interface, we
      * stop immediately. */
+    if (ret == ERR_ADDRESS_IS_INTERNAL) {
+      static bool logged_once = false;
+      if (!logged_once) {
+        log_warn(LD_CONFIG, "Address set with an internal address. Tor will "
+                            "not work unless custom directory authorities "
+                            "are defined (AlternateDirAuthority). It is also "
+                            "possible to use an internal address if "
+                            "PublishServerDescriptor is set to 0 and "
+                            "AssumeReachable(IPv6) to 1.");
+        logged_once = true;
+      }
+    }
     tor_free(*hostname_out);
     return FN_RET_BAIL;
   }