diff options
| author | teor (Tim Wilson-Brown) <teor2345@gmail.com> | 2016-04-28 15:44:31 +1000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-05-05 08:24:17 -0400 |
| commit | 7ec273bd4a3c82d9bddc9aef373b4f99396198c9 (patch) | |
| tree | b64b8c42bb05d9d811b6b99d96fd76704c2d2a38 /src/or | |
| parent | 68d913c49c7aff441fc6671406aee5137f36f620 (diff) | |
| download | tor-7ec273bd4a3c82d9bddc9aef373b4f99396198c9.tar.gz tor-7ec273bd4a3c82d9bddc9aef373b4f99396198c9.zip | |
Rename skip_or and skip_dir to avoid confusion
Variable rename only
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/routerlist.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 97512d7969..13739a7c7c 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -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); |