[tor-commits] [tor/master] hs-v3: Missing intro circuit INTRO2 DoS enabled flag

[nickm at torproject.org]

commit a98f5099c4c58c25826835fbfc3ce708e5d378fd
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Aug 20 08:55:26 2019 -0400

    hs-v3: Missing intro circuit INTRO2 DoS enabled flag
    
    When consensus changes, we also need to update the circuit INTRO2 defenses
    enabled flag and not only the token bucket.
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/feature/hs/hs_dos.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/feature/hs/hs_dos.c b/src/feature/hs/hs_dos.c
index a7a43b9bc..c7d420195 100644
--- a/src/feature/hs/hs_dos.c
+++ b/src/feature/hs/hs_dos.c
@@ -88,6 +88,9 @@ update_intro_circuits(void)
   smartlist_t *intro_circs = hs_circuitmap_get_all_intro_circ_relay_side();
 
   SMARTLIST_FOREACH_BEGIN(intro_circs, circuit_t *, circ) {
+    /* Defenses might have been enabled or disabled. */
+    TO_OR_CIRCUIT(circ)->introduce2_dos_defense_enabled =
+      consensus_param_introduce_defense_enabled;
     /* Adjust the rate/burst value that might have changed. */
     token_bucket_ctr_adjust(&TO_OR_CIRCUIT(circ)->introduce2_bucket,
                             consensus_param_introduce_rate_per_sec,