torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

r8976@Kushana: nickm | 2006-09-28 17:18:57 -0400

Browse Source 
Another tweak to guard logic: ignore check for the Guard flag if a server is listed on EntryNodes.  (Also remove redundant checks for always-set variables.)


svn:r8522
This commit is contained in:
Nick Mathewson
2006-09-28 23:57:56 +00:00
parent d174cccd0b
commit 1a444e089a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/circuitbuild.c
+5 -3
View File
@@ -1732,15 +1732,17 @@ entry_guard_set_status(entry_guard_t *e, routerinfo_t *ri,
char buf[HEX_DIGEST_LEN+1];
int changed = 0;
tor_assert(options);
/* Do we want to mark this guard as bad? */
if (!ri)
reason = "unlisted";
else if (!ri->is_running)
reason = "down";
else if (!ri->is_possible_guard)
else if (!ri->is_possible_guard &&
!router_nickname_is_in_list(ri, options->EntryNodes))
reason = "not recommended as a guard";
else if (options && ri &&
router_nickname_is_in_list(ri, options->ExcludeNodes))
else if (router_nickname_is_in_list(ri, options->ExcludeNodes))
reason = "excluded";
if (reason && ! e->bad_since) {