tor

commit 4b74d45d641683c2b3e2ed8467668ef2a568800d
parent eca9973e9ee62d16aa971d3a524070f6c237a9ff
Author: David Goulet <dgoulet@torproject.org>
Date:   Mon, 30 Oct 2023 16:52:22 +0000

Merge branch 'fix-token-bucket-on-new-stream' into 'main'

Fix token bucket on new stream

Closes #40875

See merge request tpo/core/tor!779
Diffstat:
M
src/core/or/connection_edge.c
 | 
2
++
M
src/core/or/dos.c
 | 
6
+++---

2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/core/or/connection_edge.c b/src/core/or/connection_edge.c
@@ -4234,8 +4234,10 @@ connection_exit_begin_resolve(cell_t *cell, or_circuit_t *circ)
       break;
     case DOS_STREAM_DEFENSE_REFUSE_STREAM:
       dns_send_resolved_error_cell(dummy_conn, RESOLVED_TYPE_ERROR_TRANSIENT);
+      connection_free_(TO_CONN(dummy_conn));
       return 0;
     case DOS_STREAM_DEFENSE_CLOSE_CIRCUIT:
+      connection_free_(TO_CONN(dummy_conn));
       return -END_CIRC_REASON_RESOURCELIMIT;
   }
 
diff --git a/src/core/or/dos.c b/src/core/or/dos.c
@@ -357,9 +357,9 @@ set_dos_parameters(const networkstatus_t *ns)
 
   /* Stream. */
   dos_stream_enabled = get_param_stream_enabled(ns);
-  dos_stream_defense_type = get_param_stream_rate(ns);
-  dos_stream_rate = get_param_stream_burst(ns);
-  dos_stream_burst = get_param_stream_defense_type(ns);
+  dos_stream_defense_type = get_param_stream_defense_type(ns);
+  dos_stream_rate = get_param_stream_rate(ns);
+  dos_stream_burst = get_param_stream_burst(ns);
 }
 
 /* Free everything for the circuit creation DoS mitigation subsystem. */