From 5138f5ca6957166febe98d5b6841936d7c20d0ad Mon Sep 17 00:00:00 2001 From: Arlo Breault Date: Mon, 7 Dec 2015 20:28:26 -0800 Subject: Ensure node is a guard candidate when picking a directory guard --- src/or/routerlist.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'src') diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 8fe496b51e..9ad763c4d1 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1537,8 +1537,14 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags) if ((type & MICRODESC_DIRINFO) && !is_trusted && !node->rs->version_supports_microdesc_cache) continue; - if (for_guard && node->using_as_guard) - continue; /* Don't make the same node a guard twice. */ + /* Don't make the same node a guard twice */ + if (for_guard && node->using_as_guard) { + continue; + } + /* 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)) { -- cgit v1.2.3-54-g00ecf