mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-25 23:21:38 +01:00
Code Issues Projects Releases Wiki Activity

nodelist: Remove the unused CRN_WEIGHT_FOR_EXIT flag

Browse source 
Part of 34200.
This commit is contained in:
teor 2020-05-11 17:35:41 +10:00
parent 1ec604f0f9
commit 48413dc65f
1 changed files with 1 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/feature/nodelist/node_select.c
View file

@ -947,7 +947,6 @@ router_choose_random_node(smartlist_t *excludedsmartlist,
const int need_uptime = (flags & CRN_NEED_UPTIME) != 0; const int need_uptime = (flags & CRN_NEED_UPTIME) != 0;
const int need_capacity = (flags & CRN_NEED_CAPACITY) != 0; const int need_capacity = (flags & CRN_NEED_CAPACITY) != 0;
const int need_guard = (flags & CRN_NEED_GUARD) != 0; const int need_guard = (flags & CRN_NEED_GUARD) != 0;
const int weight_for_exit = (flags & CRN_WEIGHT_AS_EXIT) != 0;
const int pref_addr = (flags & CRN_PREF_ADDR) != 0; const int pref_addr = (flags & CRN_PREF_ADDR) != 0;
smartlist_t *sl=smartlist_new(), smartlist_t *sl=smartlist_new(),
@ -956,9 +955,7 @@ router_choose_random_node(smartlist_t *excludedsmartlist,
const routerinfo_t *r; const routerinfo_t *r;
bandwidth_weight_rule_t rule; bandwidth_weight_rule_t rule;
tor_assert(!(weight_for_exit && need_guard)); rule = (need_guard ? WEIGHT_FOR_GUARD : WEIGHT_FOR_MID);
rule = weight_for_exit ? WEIGHT_FOR_EXIT :
(need_guard ? WEIGHT_FOR_GUARD : WEIGHT_FOR_MID);
/* If the node_t is not found we won't be to exclude ourself but we /* If the node_t is not found we won't be to exclude ourself but we
* won't be able to pick ourself in router_choose_random_node() so * won't be able to pick ourself in router_choose_random_node() so