nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 13:34:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

Refactor router_pick_directory_server_impl to use node functions

Browse Source 
No behavioural change

This makes the use of the node explicit in the function, rather
than hiding the node lookup in fascist_firewall_allows_rs.
This commit is contained in:
teor (Tim Wilson-Brown) 2016-04-30 11:00:50 +10:00 committed by Nick Mathewson
parent 225448ad34
commit 03fc4cf04c
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/or/routerlist.c
View File

@ -1740,13 +1740,13 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags,
* we try routers that only have one address both times.) * we try routers that only have one address both times.)
*/ */
if (!fascistfirewall || skip_or_fw || if (!fascistfirewall || skip_or_fw ||
fascist_firewall_allows_rs(status, FIREWALL_OR_CONNECTION, fascist_firewall_allows_node(node, FIREWALL_OR_CONNECTION,
try_ip_pref)) try_ip_pref))
smartlist_add(is_trusted ? trusted_tunnel : smartlist_add(is_trusted ? trusted_tunnel :
is_overloaded ? overloaded_tunnel : tunnel, (void*)node); is_overloaded ? overloaded_tunnel : tunnel, (void*)node);
else if (!must_have_or && (skip_dir_fw || else if (!must_have_or && (skip_dir_fw ||
fascist_firewall_allows_rs(status, FIREWALL_DIR_CONNECTION, fascist_firewall_allows_node(node, FIREWALL_DIR_CONNECTION,
try_ip_pref))) try_ip_pref)))
smartlist_add(is_trusted ? trusted_direct : smartlist_add(is_trusted ? trusted_direct :
is_overloaded ? overloaded_direct : direct, (void*)node); is_overloaded ? overloaded_direct : direct, (void*)node);
} SMARTLIST_FOREACH_END(node); } SMARTLIST_FOREACH_END(node);