nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 21:16:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bug 24769: Reduce and parameterize the max number of cbt circs.

Browse Source 
Setting the default for this at 10 and the learning timeout to 3 minutes means
we will complete our cbt learning in 30 minutes, which is under the reduced
padding connection timeout window.
This commit is contained in:
Mike Perry 2018-01-31 17:07:07 +00:00
parent 148c2410af
commit ac1a78b977
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/or/circuituse.c
View File

@ -1179,15 +1179,11 @@ needs_hs_client_circuits(time_t now, int *needs_uptime, int *needs_capacity,
router_have_consensus_path() != CONSENSUS_PATH_UNKNOWN);
}
/* The minimum number of open slots we should keep in order to preemptively
* build circuits. */
#define CBT_MIN_REMAINING_PREEMPTIVE_CIRCUITS 2
/* Check to see if we need more circuits to have a good build timeout. However,
* leave a couple slots open so that we can still build circuits preemptively
* as needed. */
#define CBT_MAX_UNUSED_OPEN_CIRCUITS (MAX_UNUSED_OPEN_CIRCUITS - \
CBT_MIN_REMAINING_PREEMPTIVE_CIRCUITS)
/* This is how many circuits can be opened concurrently during the cbt learning
* phase. This number cannot exceed the tor-wide MAX_UNUSED_OPEN_CIRCUITS. */
#define DFLT_CBT_UNUSED_OPEN_CIRCS (10)
#define MIN_CBT_UNUSED_OPEN_CIRCS 0
#define MAX_CBT_UNUSED_OPEN_CIRCS MAX_UNUSED_OPEN_CIRCUITS
/* Return true if we need more circuits for a good build timeout.
* XXXX make the assumption that build timeout streams should be
@ -1196,7 +1192,10 @@ STATIC int
needs_circuits_for_build(int num)
{
if (router_have_consensus_path() != CONSENSUS_PATH_UNKNOWN) {
if (num < CBT_MAX_UNUSED_OPEN_CIRCUITS &&
if (num < networkstatus_get_param(NULL, "cbtmaxopencircs",
DFLT_CBT_UNUSED_OPEN_CIRCS,
MIN_CBT_UNUSED_OPEN_CIRCS,
MAX_CBT_UNUSED_OPEN_CIRCS) &&
!circuit_build_times_disabled(get_options()) &&
circuit_build_times_needs_circuits_now(get_circuit_build_times())) {
return 1;