nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 04:13:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tor-gitlab/mr/646'

Browse Source
This commit is contained in:
David Goulet 2022-10-28 12:07:51 -04:00
commit 19b080f2aa
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug40523 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (relay):
- Remove a harmless "Bug" log message that can happen in
relay_addr_learn_from_dirauth() on relays during startup. Finishes
fixing bug 40231. Fixes bug 40523; bugfix on 0.4.5.4-rc.

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

@ -212,17 +212,19 @@ relay_addr_learn_from_dirauth(void)
return; return;
} }
const node_t *node = node_get_by_id(rs->identity_digest); const node_t *node = node_get_by_id(rs->identity_digest);
if (!node) { extend_info_t *ei = NULL;
if (node) {
ei = extend_info_from_node(node, 1, false);
}
if (!node || !ei) {
/* This can happen if we are still in the early starting stage where no /* This can happen if we are still in the early starting stage where no
* descriptors we actually fetched and thus we have the routerstatus_t * descriptors we actually fetched and thus we have the routerstatus_t
* for the authority but not its descriptor which is needed to build a * for the authority but not its descriptor which is needed to build a
* circuit and thus learn our address. */ * circuit and thus learn our address. */
log_info(LD_GENERAL, "Can't build a circuit to an authority. Unable to " log_info(LD_GENERAL,
"learn for now our address from them."); "Trying to learn our IP address by connecting to an "
return; "authority, but can't build a circuit to one yet. Will try "
} "again soon.");
extend_info_t *ei = extend_info_from_node(node, 1, false);
if (BUG(!ei)) {
return; return;
} }