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

nodelist: Fix a comment and a log message

Browse Source
This commit is contained in:
teor 2020-05-11 17:01:49 +10:00
parent 1c1faf586a
commit 8829d2d644
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/feature/nodelist/node_select.c
View File

@ -992,7 +992,7 @@ router_choose_random_node(smartlist_t *excludedsmartlist,
smartlist_add(excludednodes, (node_t*)node); smartlist_add(excludednodes, (node_t*)node);
} else if (rendezvous_v3 && } else if (rendezvous_v3 &&
!node_supports_v3_rendezvous_point(node)) { !node_supports_v3_rendezvous_point(node)) {
/* Exclude relays that do not support to rendezvous for a hidden service /* Exclude relays that can not become a rendezvous for a hidden service
* version 3. */ * version 3. */
smartlist_add(excludednodes, (node_t*)node); smartlist_add(excludednodes, (node_t*)node);
} }
@ -1030,11 +1030,12 @@ router_choose_random_node(smartlist_t *excludedsmartlist,
if (!choice && (need_uptime || need_capacity || need_guard || pref_addr)) { if (!choice && (need_uptime || need_capacity || need_guard || pref_addr)) {
/* try once more -- recurse but with fewer restrictions. */ /* try once more -- recurse but with fewer restrictions. */
log_info(LD_CIRC, log_info(LD_CIRC,
"We couldn't find any live%s%s%s routers; falling back " "We couldn't find any live%s%s%s%s routers; falling back "
"to list of all routers.", "to list of all routers.",
need_capacity?", fast":"", need_capacity?", fast":"",
need_uptime?", stable":"", need_uptime?", stable":"",
need_guard?", guard":""); need_guard?", guard":"",
pref_addr?", preferred address":"");
flags &= ~ (CRN_NEED_UPTIME|CRN_NEED_CAPACITY|CRN_NEED_GUARD| flags &= ~ (CRN_NEED_UPTIME|CRN_NEED_CAPACITY|CRN_NEED_GUARD|
CRN_PREF_ADDR); CRN_PREF_ADDR);
choice = router_choose_random_node( choice = router_choose_random_node(