[tor-commits] [tor/master] hs-v3: Don't apply DoS defenses if circuit has not been flagged

[nickm at torproject.org]

commit aee66c80bd9824650b26c4918fcfeed37ddb9b49
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Aug 13 11:25:26 2019 -0400

    hs-v3: Don't apply DoS defenses if circuit has not been flagged
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/feature/hs/hs_dos.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/feature/hs/hs_dos.c b/src/feature/hs/hs_dos.c
index 34af2b74e..d83c8ee10 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;
   }