Commit 0ceacb54 authored by Nick Mathewson's avatar Nick Mathewson 🎡
Browse files

Merge branch 'mr_347_squashed' into maint-0.4.6

parents d162b985 6281c908
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.
......@@ -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;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment