[tor-commits] [tor/maint-0.2.8] Refactor router_pick_directory_server_impl to use node functions

[nickm at torproject.org]

commit 03fc4cf04caf240fa4e285c3b483c60587456e9b
Author: teor (Tim Wilson-Brown) <teor2345 at gmail.com>
Date:   Sat Apr 30 11:00:50 2016 +1000

    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.
---
 src/or/routerlist.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 13739a7..1c275a6 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);