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

the new entrynodes behavior is always strict

Browse Source
This commit is contained in:
Roger Dingledine 2011-03-11 04:21:25 -05:00 committed by Nick Mathewson
parent 719b5b87de
commit 5d12495d98
1 changed files with 11 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/or/circuitbuild.c
View File

@ -4006,14 +4006,10 @@ entry_guards_prepend_from_config(or_options_t *options)
SMARTLIST_FOREACH(entry_routers, routerinfo_t *, ri, { SMARTLIST_FOREACH(entry_routers, routerinfo_t *, ri, {
add_an_entry_guard(ri, 0); add_an_entry_guard(ri, 0);
}); });
/* Finally, the remaining previously configured guards that are not in /* Finally, free the remaining previously configured guards that are not in
* EntryNodes, unless we're strict in which case we drop them */ * EntryNodes. */
if (options->StrictNodes) { SMARTLIST_FOREACH(old_entry_guards_not_on_list, entry_guard_t *, e,
SMARTLIST_FOREACH(old_entry_guards_not_on_list, entry_guard_t *, e, entry_guard_free(e));
entry_guard_free(e));
} else {
smartlist_add_all(entry_guards, old_entry_guards_not_on_list);
}
smartlist_free(entry_routers); smartlist_free(entry_routers);
smartlist_free(entry_fps); smartlist_free(entry_fps);
@ -4024,7 +4020,7 @@ entry_guards_prepend_from_config(or_options_t *options)
/** Return 0 if we're fine adding arbitrary routers out of the /** Return 0 if we're fine adding arbitrary routers out of the
* directory to our entry guard list, or return 1 if we have a * directory to our entry guard list, or return 1 if we have a
* list already and we'd prefer to stick to it. * list already and we must stick to it.
*/ */
int int
entry_list_is_constrained(or_options_t *options) entry_list_is_constrained(or_options_t *options)
@ -4036,18 +4032,6 @@ entry_list_is_constrained(or_options_t *options)
return 0; return 0;
} }
/* Are we dead set against changing our entry guard list, or would we
* change it if it means keeping Tor usable? */
static int
entry_list_is_totally_static(or_options_t *options)
{
if (options->EntryNodes && options->StrictNodes)
return 1;
if (options->UseBridges)
return 1;
return 0;
}
/** Pick a live (up and listed) entry guard from entry_guards. If /** Pick a live (up and listed) entry guard from entry_guards. If
* <b>state</b> is non-NULL, this is for a specific circuit -- * <b>state</b> is non-NULL, this is for a specific circuit --
* make sure not to pick this circuit's exit or any node in the * make sure not to pick this circuit's exit or any node in the
@ -4092,6 +4076,7 @@ choose_random_entry(cpath_build_state_t *state)
continue; /* don't pick the same node for entry and exit */ continue; /* don't pick the same node for entry and exit */
if (consider_exit_family && smartlist_isin(exit_family, r)) if (consider_exit_family && smartlist_isin(exit_family, r))
continue; /* avoid relays that are family members of our exit */ continue; /* avoid relays that are family members of our exit */
#if 0 /* since EntryNodes is always strict now, this clause is moot */
if (options->EntryNodes && if (options->EntryNodes &&
!routerset_contains_router(options->EntryNodes, r)) { !routerset_contains_router(options->EntryNodes, r)) {
/* We've come to the end of our preferred entry nodes. */ /* We've come to the end of our preferred entry nodes. */
@ -4106,6 +4091,7 @@ choose_random_entry(cpath_build_state_t *state)
"No relays from EntryNodes available. Using others."); "No relays from EntryNodes available. Using others.");
} }
} }
#endif
smartlist_add(live_entry_guards, r); smartlist_add(live_entry_guards, r);
if (!entry->made_contact) { if (!entry->made_contact) {
/* Always start with the first not-yet-contacted entry /* Always start with the first not-yet-contacted entry
@ -4131,7 +4117,7 @@ choose_random_entry(cpath_build_state_t *state)
} }
if (smartlist_len(live_entry_guards) < preferred_min) { if (smartlist_len(live_entry_guards) < preferred_min) {
if (!entry_list_is_totally_static(options)) { if (!entry_list_is_constrained(options)) {
/* still no? try adding a new entry then */ /* still no? try adding a new entry then */
/* XXX if guard doesn't imply fast and stable, then we need /* XXX if guard doesn't imply fast and stable, then we need
* to tell add_an_entry_guard below what we want, or it might * to tell add_an_entry_guard below what we want, or it might
@ -4157,9 +4143,9 @@ choose_random_entry(cpath_build_state_t *state)
goto retry; goto retry;
} }
if (!r && entry_list_is_constrained(options) && consider_exit_family) { if (!r && entry_list_is_constrained(options) && consider_exit_family) {
/* still no? if we're using bridges or have StrictNodes /* still no? if we're using bridges,
* set, and our chosen exit is in the same family as all our * and our chosen exit is in the same family as all our
* bridges/entry guards, then be flexible about families. */ * bridges, then be flexible about families. */
consider_exit_family = 0; consider_exit_family = 0;
goto retry; goto retry;
} }