nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'maint-0.4.5'

Browse Source
This commit is contained in:
Nick Mathewson 2021-02-22 15:37:39 -05:00
commit 6e3a7c410f
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket40300 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (relay):
- Remove a spammy log notice that should not have been indicating the
operator that its IPv4/v6 was missing but it was not. Fixes bug 40300;
bugfix on 0.4.5.1-alpha.

25
src/feature/relay/relay_find_addr.c
View File

@ -144,17 +144,6 @@ relay_find_addr_to_publish, (const or_options_t *options, int family,
if (find_my_address(options, family, LOG_INFO, addr_out, NULL, NULL)) {
goto found;
}
/* No publishable address was found even though we have an ORPort thus
* print a notice log so operator can notice. We'll do that every hour so
* it is not too spammy but enough so operators address the issue. */
static ratelim_t rlim = RATELIM_INIT(3600);
log_fn_ratelim(&rlim, LOG_NOTICE, LD_CONFIG,
"Unable to find %s address for ORPort %u. "
"You might want to specify %sOnly to it or set an "
"explicit address or set Address.",
fmt_af_family(family),
routerconf_find_or_port(options, family),
fmt_af_family(family));
}
/* Third, consider address from our suggestion cache. */
@ -163,7 +152,19 @@ relay_find_addr_to_publish, (const or_options_t *options, int family,
goto found;
}
/* No publishable address was found. */
/* No publishable address was found even though we have an ORPort thus
* print a notice log so operator can notice. We'll do that every hour so
* it is not too spammy but enough so operators address the issue. */
static ratelim_t rlim = RATELIM_INIT(3600);
log_fn_ratelim(&rlim, LOG_NOTICE, LD_CONFIG,
"Unable to find %s address for ORPort %u. "
"You might want to specify %sOnly to it or set an "
"explicit address or set Address.",
fmt_af_family(family),
routerconf_find_or_port(options, family),
fmt_af_family(family));
/* Not found. */
return false;
found: