diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-02-23 09:37:17 -0500 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-02-23 09:49:45 -0500 |
| commit | 39d0f69dfee86c4f8703094990d3169fb20614f3 (patch) | |
| tree | 5b01dbd2a73e5a0f43586eeaa861f6263c893458 /src/feature/dirclient | |
| parent | bc21ed32903459c53599ee03605e8d23bf42ffe9 (diff) | |
| download | tor-39d0f69dfee86c4f8703094990d3169fb20614f3.tar.gz tor-39d0f69dfee86c4f8703094990d3169fb20614f3.zip | |
relay: Avoid a directory early fetch
The directory_fetches_from_authorities() is used to know if a client or relay
should fetch data from an authority early in the boot process.
We had a condition in that function that made a relay trigger that fetch if it
didn't know its address (so we can learn it). However, when this is called,
the address discovery has not been done yet so it would always return true for
a relay.
Furthermore, it would always trigger a log notice that the IPv4 couldn't be
found which was inevitable because the address discovery process has not been
done yet (done when building our first descriptor).
It is also important to point out that starting in 0.4.5.1-alpha, asking an
authority for an address is done during address discovery time using a one-hop
circuit thus independent from the relay deciding to fetch or not documents
from an authority.
Small fix also is to reverse the "IPv(4|6)Only" flag in the notice so that if
we can't find IPv6 it would output to use IPv4Only.
Fixes #40300
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/feature/dirclient')
| -rw-r--r-- | src/feature/dirclient/dirclient_modes.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/feature/dirclient/dirclient_modes.c b/src/feature/dirclient/dirclient_modes.c index 62cdad6c36..db25196213 100644 --- a/src/feature/dirclient/dirclient_modes.c +++ b/src/feature/dirclient/dirclient_modes.c @@ -45,14 +45,6 @@ dirclient_fetches_from_authorities(const or_options_t *options) return 1; if (options->BridgeRelay == 1) return 0; - /* We don't know our IP address; ask an authority. IPv4 is still mandatory - * to have thus if we don't have it, we ought to learn it from an authority - * through the NETINFO cell or the HTTP header it sends us back. - * - * Note that at the moment, relay do a direct connection so no NETINFO cell - * for now. */ - if (server_mode(options) && !relay_has_address_set(AF_INET)) - return 1; refuseunknown = ! router_my_exit_policy_is_reject_star() && should_refuse_unknown_exits(options); if (!dir_server_mode(options) && !refuseunknown) |