diff options
| author | teor <teor@riseup.net> | 2020-05-11 17:31:20 +1000 |
|---|---|---|
| committer | teor <teor@riseup.net> | 2020-05-18 21:53:52 +1000 |
| commit | 1ec604f0f9dc7f642e5614de4741671105d6945f (patch) | |
| tree | 34237a00c1db66e77638900d0a3dc4d0e39a0ee7 /src/core/or/circuitbuild.c | |
| parent | 280195f41471862964f5c47446e5ccd01afdd96b (diff) | |
| download | tor-1ec604f0f9dc7f642e5614de4741671105d6945f.tar.gz tor-1ec604f0f9dc7f642e5614de4741671105d6945f.zip | |
nodelist: Move node flag checks
Move node flag checks to router_add_running_nodes_to_smartlist(), where
they are actually used.
Part of 34200.
Diffstat (limited to 'src/core/or/circuitbuild.c')
| -rw-r--r-- | src/core/or/circuitbuild.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/core/or/circuitbuild.c b/src/core/or/circuitbuild.c index d7b07c4903..b840ca7a7d 100644 --- a/src/core/or/circuitbuild.c +++ b/src/core/or/circuitbuild.c @@ -1795,15 +1795,7 @@ pick_restricted_middle_node(router_crn_flags_t flags, tor_assert(pick_from); /* Add all running nodes to all_live_nodes */ - router_add_running_nodes_to_smartlist(all_live_nodes, - (flags & CRN_NEED_UPTIME) != 0, - (flags & CRN_NEED_CAPACITY) != 0, - (flags & CRN_NEED_GUARD) != 0, - (flags & CRN_NEED_DESC) != 0, - (flags & CRN_PREF_ADDR) != 0, - (flags & CRN_DIRECT_CONN) != 0, - (flags & CRN_RENDEZVOUS_V3) != 0, - (flags & CRN_INITIATE_IPV6_EXTEND) != 0); + router_add_running_nodes_to_smartlist(all_live_nodes, flags); /* Filter all_live_nodes to only add live *and* whitelisted middles * to the list whitelisted_live_middles. */ |