commit 6e3a7c410f2c0cfd2f705862cc4d32acd0a88096
parent a4df1e8ea47842a76e4fc3ebc750e68b728f222e
Author: Nick Mathewson <nickm@torproject.org>
Date: Mon, 22 Feb 2021 15:37:39 -0500
Merge branch 'maint-0.4.5'
Diffstat:
2 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/changes/ticket40300 b/changes/ticket40300
@@ -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.
+
diff --git a/src/feature/relay/relay_find_addr.c b/src/feature/relay/relay_find_addr.c
@@ -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:
