diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-02-22 15:37:31 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-02-22 15:37:31 -0500 |
| commit | bc21ed32903459c53599ee03605e8d23bf42ffe9 (patch) | |
| tree | e80a73ded217aace358df6679f345a3c704ec842 | |
| parent | 26c2e843f958c5451c836bbf9a4979aecac177c4 (diff) | |
| parent | 4d7f31b9645d360e7074844711f10565e5d25b7b (diff) | |
| download | tor-bc21ed32903459c53599ee03605e8d23bf42ffe9.tar.gz tor-bc21ed32903459c53599ee03605e8d23bf42ffe9.zip | |
Merge remote-tracking branch 'tor-gitlab/mr/316' into maint-0.4.5
| -rw-r--r-- | changes/ticket40300 | 5 | ||||
| -rw-r--r-- | src/feature/relay/relay_find_addr.c | 25 |
2 files changed, 18 insertions, 12 deletions
diff --git a/changes/ticket40300 b/changes/ticket40300 new file mode 100644 index 0000000000..aef01b4c64 --- /dev/null +++ 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 index 39e1cc6a19..2a3f602438 100644 --- 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: |