summaryrefslogtreecommitdiff
path: root/src/feature/hs/hs_dos.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2019-08-13 11:25:26 -0400
committerGeorge Kadianakis <desnacked@riseup.net>2019-08-26 15:53:46 +0300
commitaee66c80bd9824650b26c4918fcfeed37ddb9b49 (patch)
tree75252b2918e0bdc74b98722f7725c47099dcba67 /src/feature/hs/hs_dos.c
parent724d9eb84be4c9a8b6cd34f08dc7b5d00f69f09e (diff)
downloadtor-aee66c80bd9824650b26c4918fcfeed37ddb9b49.tar.gz
tor-aee66c80bd9824650b26c4918fcfeed37ddb9b49.zip
hs-v3: Don't apply DoS defenses if circuit has not been flagged
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/feature/hs/hs_dos.c')
-rw-r--r--src/feature/hs/hs_dos.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/feature/hs/hs_dos.c b/src/feature/hs/hs_dos.c
index 34af2b74e9..d83c8ee108 100644
--- a/src/feature/hs/hs_dos.c
+++ b/src/feature/hs/hs_dos.c
@@ -156,8 +156,10 @@ hs_dos_can_send_intro2(or_circuit_t *s_intro_circ)
{
tor_assert(s_intro_circ);
- /* Always allowed if the defense is disabled. */
- if (!param_introduce_defense_enabled) {
+ /* Allow to send the cell if the DoS defenses are disabled on the circuit.
+ * This can be set by the consensus, the ESTABLISH_INTRO cell extension or
+ * the hardcoded values in tor code. */
+ if (!s_intro_circ->introduce2_dos_defense_enabled) {
return true;
}