nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-11 13:43:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Remove PDS_FOR_GUARD

Browse Source
This commit is contained in:
Nick Mathewson 2017-01-18 15:42:28 -05:00
parent 6d03e36fd0
commit 5b97d7e110
2 changed files with 0 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/or/or.h
View File

@ -5328,10 +5328,6 @@ typedef struct dir_server_t {
*/
#define PDS_NO_EXISTING_MICRODESC_FETCH (1<<4)
/** This node is to be chosen as a directory guard, so don't choose any
* node that's currently a guard. */
#define PDS_FOR_GUARD (1<<5)
/** Possible ways to weight routers when choosing one randomly. See
* routerlist_sl_choose_by_bandwidth() for more information.*/
typedef enum bandwidth_weight_rule_t {

6
src/or/routerlist.c
View File

@ -1996,10 +1996,8 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags,
const int fascistfirewall = ! (flags & PDS_IGNORE_FASCISTFIREWALL);
const int no_serverdesc_fetching =(flags & PDS_NO_EXISTING_SERVERDESC_FETCH);
const int no_microdesc_fetching = (flags & PDS_NO_EXISTING_MICRODESC_FETCH);
const int for_guard = (flags & PDS_FOR_GUARD);
int try_excluding = 1, n_excluded = 0, n_busy = 0;
int try_ip_pref = 1;
tor_assert_nonfatal(! for_guard); // XXXX prop271
if (!consensus)
return NULL;
@ -2033,10 +2031,6 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags,
SKIP_MISSING_TRUSTED_EXTRAINFO(type, node->identity);
/* Ensure that a directory guard is actually a guard node. */
if (for_guard && !node->is_possible_guard) {
continue;
}
if (try_excluding &&
routerset_contains_routerstatus(options->ExcludeNodes, status,
country)) {