From e23947716e227a9888690b9fca7a5069038d4c0f Mon Sep 17 00:00:00 2001 From: George Kadianakis Date: Thu, 1 Jul 2021 17:49:27 +0300 Subject: Use L2 vanguards during path selection Co-authored-by: Mike Perry --- src/core/or/circuituse.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/core/or/circuituse.c') diff --git a/src/core/or/circuituse.c b/src/core/or/circuituse.c index 044b30b8b3..98ff4c252f 100644 --- a/src/core/or/circuituse.c +++ b/src/core/or/circuituse.c @@ -2022,16 +2022,12 @@ circuit_is_hs_v3(const circuit_t *circ) int circuit_should_use_vanguards(uint8_t purpose) { - const or_options_t *options = get_options(); - - /* Only hidden service circuits use vanguards */ - if (!circuit_purpose_is_hidden_service(purpose)) - return 0; - - /* Pinned middles are effectively vanguards */ - if (options->HSLayer2Nodes || options->HSLayer3Nodes) + /* All hidden service circuits use either vanguards or + * vanguards-lite. */ + if (circuit_purpose_is_hidden_service(purpose)) return 1; + /* Everything else is a normal circuit */ return 0; } -- cgit v1.2.3-54-g00ecf