|
@@ -1685,8 +1685,8 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags,
|
|
|
overloaded_direct = smartlist_new();
|
|
|
overloaded_tunnel = smartlist_new();
|
|
|
|
|
|
- const int skip_or = router_skip_or_reachability(options, try_ip_pref);
|
|
|
- const int skip_dir = router_skip_dir_reachability(options, try_ip_pref);
|
|
|
+ const int skip_or_fw = router_skip_or_reachability(options, try_ip_pref);
|
|
|
+ const int skip_dir_fw = router_skip_dir_reachability(options, try_ip_pref);
|
|
|
const int must_have_or = directory_must_use_begindir(options);
|
|
|
|
|
|
/* Find all the running dirservers we know about. */
|
|
@@ -1739,12 +1739,12 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags,
|
|
|
* address for each router (if any). (To ensure correct load-balancing
|
|
|
* we try routers that only have one address both times.)
|
|
|
*/
|
|
|
- if (!fascistfirewall || skip_or ||
|
|
|
+ if (!fascistfirewall || skip_or_fw ||
|
|
|
fascist_firewall_allows_rs(status, 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 ||
|
|
|
+ else if (!must_have_or && (skip_dir_fw ||
|
|
|
fascist_firewall_allows_rs(status, FIREWALL_DIR_CONNECTION,
|
|
|
try_ip_pref)))
|
|
|
smartlist_add(is_trusted ? trusted_direct :
|
|
@@ -1848,8 +1848,8 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist,
|
|
|
overloaded_direct = smartlist_new();
|
|
|
overloaded_tunnel = smartlist_new();
|
|
|
|
|
|
- const int skip_or = router_skip_or_reachability(options, try_ip_pref);
|
|
|
- const int skip_dir = router_skip_dir_reachability(options, try_ip_pref);
|
|
|
+ const int skip_or_fw = router_skip_or_reachability(options, try_ip_pref);
|
|
|
+ const int skip_dir_fw = router_skip_dir_reachability(options, try_ip_pref);
|
|
|
const int must_have_or = directory_must_use_begindir(options);
|
|
|
|
|
|
SMARTLIST_FOREACH_BEGIN(sourcelist, const dir_server_t *, d)
|
|
@@ -1886,11 +1886,11 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist,
|
|
|
* address for each router (if any). (To ensure correct load-balancing
|
|
|
* we try routers that only have one address both times.)
|
|
|
*/
|
|
|
- if (!fascistfirewall || skip_or ||
|
|
|
+ if (!fascistfirewall || skip_or_fw ||
|
|
|
fascist_firewall_allows_dir_server(d, FIREWALL_OR_CONNECTION,
|
|
|
try_ip_pref))
|
|
|
smartlist_add(is_overloaded ? overloaded_tunnel : tunnel, (void*)d);
|
|
|
- else if (!must_have_or && (skip_dir ||
|
|
|
+ else if (!must_have_or && (skip_dir_fw ||
|
|
|
fascist_firewall_allows_dir_server(d, FIREWALL_DIR_CONNECTION,
|
|
|
try_ip_pref)))
|
|
|
smartlist_add(is_overloaded ? overloaded_direct : direct, (void*)d);
|