nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 13:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Fix token bucket on new stream

Closes #40875

See merge request tpo/core/tor!779
This commit is contained in:
David Goulet 2023-10-30 16:52:22 +00:00
commit 4b74d45d64
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/or/connection_edge.c
View File

@ -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;
}

6
src/core/or/dos.c
View File

@ -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. */