aboutsummaryrefslogtreecommitdiff
path: root/src/core/or/circuituse.c
diff options
context:
space:
mode:
authorGeorge Kadianakis <desnacked@riseup.net>2021-07-01 17:49:27 +0300
committerGeorge Kadianakis <desnacked@riseup.net>2021-07-01 18:15:55 +0300
commite23947716e227a9888690b9fca7a5069038d4c0f (patch)
tree8e374e7a8ba6a8127d2b75c999b1d6ad1798277b /src/core/or/circuituse.c
parent314a6b42c59c7d9ea240b758ccffd796963efd0f (diff)
downloadtor-e23947716e227a9888690b9fca7a5069038d4c0f.tar.gz
tor-e23947716e227a9888690b9fca7a5069038d4c0f.zip
Use L2 vanguards during path selection
Co-authored-by: Mike Perry <mikeperry-git@torproject.org>
Diffstat (limited to 'src/core/or/circuituse.c')
-rw-r--r--src/core/or/circuituse.c12
1 files changed, 4 insertions, 8 deletions
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;
}