From: teor (Tim Wilson-Brown) Date: Sat, 30 Apr 2016 01:00:50 +0000 (+1000) Subject: Refactor router_pick_directory_server_impl to use node functions X-Git-Tag: tor-0.2.8.3-alpha~38 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03fc4cf04caf240fa4e285c3b483c60587456e9b;p=thirdparty%2Ftor.git Refactor router_pick_directory_server_impl to use node functions 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. --- diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 13739a7c7c..1c275a68c3 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -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.) */ if (!fascistfirewall || skip_or_fw || - fascist_firewall_allows_rs(status, FIREWALL_OR_CONNECTION, - try_ip_pref)) + fascist_firewall_allows_node(node, FIREWALL_OR_CONNECTION, + try_ip_pref)) smartlist_add(is_trusted ? trusted_tunnel : is_overloaded ? overloaded_tunnel : tunnel, (void*)node); else if (!must_have_or && (skip_dir_fw || - fascist_firewall_allows_rs(status, FIREWALL_DIR_CONNECTION, - try_ip_pref))) + fascist_firewall_allows_node(node, FIREWALL_DIR_CONNECTION, + try_ip_pref))) smartlist_add(is_trusted ? trusted_direct : is_overloaded ? overloaded_direct : direct, (void*)node); } SMARTLIST_FOREACH_END(node);