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

Merge branch 'bug23817_031' into maint-0.3.2

Browse Source
This commit is contained in:
Nick Mathewson 2017-11-20 14:29:50 -05:00
commit da82e0b579
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/or/entrynodes.c
View File

@ -966,7 +966,7 @@ entry_guard_learned_bridge_identity(const tor_addr_port_t *addrport,
* violate it. * violate it.
*/ */
STATIC int STATIC int
num_reachable_filtered_guards(guard_selection_t *gs, num_reachable_filtered_guards(const guard_selection_t *gs,
const entry_guard_restriction_t *rst) const entry_guard_restriction_t *rst)
{ {
int n_reachable_filtered_guards = 0; int n_reachable_filtered_guards = 0;
@ -1472,30 +1472,28 @@ guard_create_exit_restriction(const uint8_t *exit_id)
return rst; return rst;
} }
/** If we have fewer than this many possible guards, don't set /** If we have fewer than this many possible usable guards, don't set
* MD-availability-based restrictions: we might blacklist all of * MD-availability-based restrictions: we might blacklist all of them. */
* them. */
#define MIN_GUARDS_FOR_MD_RESTRICTION 10 #define MIN_GUARDS_FOR_MD_RESTRICTION 10
/** Return true if we should set md dirserver restrictions. We might not want /** Return true if we should set md dirserver restrictions. We might not want
* to set those if our network is too restricted, since we don't want to * to set those if our guard options are too restricted, since we don't want
* blacklist all our nodes. */ * to blacklist all of them. */
static int static int
should_set_md_dirserver_restriction(void) should_set_md_dirserver_restriction(void)
{ {
const guard_selection_t *gs = get_guard_selection_info(); const guard_selection_t *gs = get_guard_selection_info();
int num_usable_guards = num_reachable_filtered_guards(gs, NULL);
/* Compute the number of filtered guards */ /* Don't set restriction if too few reachable filtered guards. */
int n_filtered_guards = 0; if (num_usable_guards < MIN_GUARDS_FOR_MD_RESTRICTION) {
SMARTLIST_FOREACH_BEGIN(gs->sampled_entry_guards, entry_guard_t *, guard) { log_info(LD_GUARD, "Not setting md restriction: only %d"
if (guard->is_filtered_guard) { " usable guards.", num_usable_guards);
++n_filtered_guards; return 0;
} }
} SMARTLIST_FOREACH_END(guard);
/* Do we have enough filtered guards that we feel okay about blacklisting /* We have enough usable guards: set MD restriction */
* some for MD restriction? */ return 1;
return (n_filtered_guards >= MIN_GUARDS_FOR_MD_RESTRICTION);
} }
/** Allocate and return an outdated md guard restriction. Return NULL if no /** Allocate and return an outdated md guard restriction. Return NULL if no

2
src/or/entrynodes.h
View File

@ -521,7 +521,7 @@ STATIC void entry_guard_consider_retry(entry_guard_t *guard);
STATIC void make_guard_confirmed(guard_selection_t *gs, entry_guard_t *guard); STATIC void make_guard_confirmed(guard_selection_t *gs, entry_guard_t *guard);
STATIC void entry_guards_update_confirmed(guard_selection_t *gs); STATIC void entry_guards_update_confirmed(guard_selection_t *gs);
STATIC void entry_guards_update_primary(guard_selection_t *gs); STATIC void entry_guards_update_primary(guard_selection_t *gs);
STATIC int num_reachable_filtered_guards(guard_selection_t *gs, STATIC int num_reachable_filtered_guards(const guard_selection_t *gs,
const entry_guard_restriction_t *rst); const entry_guard_restriction_t *rst);
STATIC void sampled_guards_update_from_consensus(guard_selection_t *gs); STATIC void sampled_guards_update_from_consensus(guard_selection_t *gs);
/** /**